Attachment 347275 Details for Bug 188663 – Patch

[patch] Patch

bug-188663-20180816111158.patch (text/plain), 6.61 KB, created by Alex Christensen on 2018-08-16 11:11:59 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2018-08-16 11:11:59 PDT

Size: 6.61 KB

patch

obsolete

>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 234941)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,22 @@
>+2018-08-16  Alex Christensen  <achristensen@webkit.org>
>+
>+        Transition more WKWebViewConfiguration ivars to API::PageConfiguration values
>+        https://bugs.webkit.org/show_bug.cgi?id=188663
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UIProcess/API/Cocoa/WKWebView.mm:
>+        (-[WKWebView _initializeWithConfiguration:]):
>+        * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
>+        (-[WKWebViewConfiguration init]):
>+        (-[WKWebViewConfiguration copyWithZone:]):
>+        (-[WKWebViewConfiguration _drawsBackground]):
>+        (-[WKWebViewConfiguration _setDrawsBackground:]):
>+        (-[WKWebViewConfiguration _waitsForPaintAfterViewDidMoveToWindow]):
>+        (-[WKWebViewConfiguration _setWaitsForPaintAfterViewDidMoveToWindow:]):
>+        (-[WKWebViewConfiguration _isControlledByAutomation]):
>+        (-[WKWebViewConfiguration _setControlledByAutomation:]):
>+
> 2018-08-16  Alex Christensen  <achristensen@webkit.org>
> 
>         Stop using canAuthenticateAgainstProtectionSpace in modern WebKit
>Index: Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
>===================================================================
>--- Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm	(revision 234939)
>+++ Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm	(working copy)
>@@ -538,9 +538,6 @@ - (void)_initializeWithConfiguration:(WK
>     pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::shouldConvertPositionStyleOnCopyKey(), WebKit::WebPreferencesStore::Value(!![_configuration _convertsPositionStyleOnCopy]));
>     pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::httpEquivEnabledKey(), WebKit::WebPreferencesStore::Value(!![_configuration _allowsMetaRefresh]));
>     pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::allowUniversalAccessFromFileURLsKey(), WebKit::WebPreferencesStore::Value(!![_configuration _allowUniversalAccessFromFileURLs]));
>-    pageConfiguration->setWaitsForPaintAfterViewDidMoveToWindow([_configuration _waitsForPaintAfterViewDidMoveToWindow]);
>-    pageConfiguration->setDrawsBackground([_configuration _drawsBackground]);
>-    pageConfiguration->setControlledByAutomation([_configuration _isControlledByAutomation]);
>     pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::incompleteImageBorderEnabledKey(), WebKit::WebPreferencesStore::Value(!![_configuration _incompleteImageBorderEnabled]));
>     pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::shouldDeferAsynchronousScriptsUntilAfterDocumentLoadKey(), WebKit::WebPreferencesStore::Value(!![_configuration _shouldDeferAsynchronousScriptsUntilAfterDocumentLoad]));
> 
>Index: Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm
>===================================================================
>--- Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm	(revision 234939)
>+++ Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm	(working copy)
>@@ -147,8 +147,6 @@ static _WKDragLiftDelay toDragLiftDelay(
>     BOOL _imageControlsEnabled;
>     BOOL _requiresUserActionForEditingControlsManager;
> #endif
>-    BOOL _waitsForPaintAfterViewDidMoveToWindow;
>-    BOOL _controlledByAutomation;
> 
> #if ENABLE(APPLICATION_MANIFEST)
>     RetainPtr<_WKApplicationManifest> _applicationManifest;
>@@ -163,7 +161,6 @@ static _WKDragLiftDelay toDragLiftDelay(
>     BOOL _colorFilterEnabled;
>     BOOL _incompleteImageBorderEnabled;
>     BOOL _shouldDeferAsynchronousScriptsUntilAfterDocumentLoad;
>-    BOOL _drawsBackground;
> 
>     RetainPtr<NSString> _mediaContentTypesRequiringHardwareSupport;
> }
>@@ -217,7 +214,6 @@ - (instancetype)init
>     _imageControlsEnabled = NO;
>     _requiresUserActionForEditingControlsManager = NO;
> #endif
>-    _waitsForPaintAfterViewDidMoveToWindow = YES;
> 
> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
>     _allowsAirPlayForMediaPlayback = YES;
>@@ -249,7 +245,6 @@ - (instancetype)init
>     _colorFilterEnabled = NO;
>     _incompleteImageBorderEnabled = NO;
>     _shouldDeferAsynchronousScriptsUntilAfterDocumentLoad = NO;
>-    _drawsBackground = YES;
> 
>     return self;
> }
>@@ -364,8 +359,6 @@ - (id)copyWithZone:(NSZone *)zone
>     configuration->_attachmentElementEnabled = self->_attachmentElementEnabled;
>     configuration->_mediaTypesRequiringUserActionForPlayback = self->_mediaTypesRequiringUserActionForPlayback;
>     configuration->_mainContentUserGestureOverrideEnabled = self->_mainContentUserGestureOverrideEnabled;
>-    configuration->_waitsForPaintAfterViewDidMoveToWindow = self->_waitsForPaintAfterViewDidMoveToWindow;
>-    configuration->_controlledByAutomation = self->_controlledByAutomation;
> 
> #if PLATFORM(IOS)
>     configuration->_allowsInlineMediaPlayback = self->_allowsInlineMediaPlayback;
>@@ -410,7 +403,6 @@ - (id)copyWithZone:(NSZone *)zone
>     configuration->_colorFilterEnabled = self->_colorFilterEnabled;
>     configuration->_incompleteImageBorderEnabled = self->_incompleteImageBorderEnabled;
>     configuration->_shouldDeferAsynchronousScriptsUntilAfterDocumentLoad = self->_shouldDeferAsynchronousScriptsUntilAfterDocumentLoad;
>-    configuration->_drawsBackground = self->_drawsBackground;
> 
>     return configuration;
> }
>@@ -790,12 +782,12 @@ - (void)_setShouldDeferAsynchronousScrip
> 
> - (BOOL)_drawsBackground
> {
>-    return _drawsBackground;
>+    return _pageConfiguration->drawsBackground();
> }
> 
> - (void)_setDrawsBackground:(BOOL)drawsBackground
> {
>-    _drawsBackground = drawsBackground;
>+    _pageConfiguration->setDrawsBackground(drawsBackground);
> }
> 
> - (BOOL)_requiresUserActionForVideoPlayback
>@@ -846,22 +838,22 @@ - (void)_setInitialCapitalizationEnabled
> 
> - (BOOL)_waitsForPaintAfterViewDidMoveToWindow
> {
>-    return _waitsForPaintAfterViewDidMoveToWindow;
>+    return _pageConfiguration->waitsForPaintAfterViewDidMoveToWindow();
> }
> 
>-- (void)_setWaitsForPaintAfterViewDidMoveToWindow:(BOOL)shouldSynchronize
>+- (void)_setWaitsForPaintAfterViewDidMoveToWindow:(BOOL)waitsForPaintAfterViewDidMoveToWindow
> {
>-    _waitsForPaintAfterViewDidMoveToWindow = shouldSynchronize;
>+    _pageConfiguration->setWaitsForPaintAfterViewDidMoveToWindow(waitsForPaintAfterViewDidMoveToWindow);
> }
> 
> - (BOOL)_isControlledByAutomation
> {
>-    return _controlledByAutomation;
>+    return _pageConfiguration->isControlledByAutomation();
> }
> 
> - (void)_setControlledByAutomation:(BOOL)controlledByAutomation
> {
>-    _controlledByAutomation = controlledByAutomation;
>+    _pageConfiguration->setControlledByAutomation(controlledByAutomation);
> }
> 
> - (_WKApplicationManifest *)_applicationManifest

Flags:

thorton: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 188663: 347275