Changeset 234942 in webkit

Timestamp:

Aug 16, 2018 11:19:19 AM (6 years ago)

Author:

achristensen@apple.com

Message:

Transition more WKWebViewConfiguration ivars to API::PageConfiguration values
​https://bugs.webkit.org/show_bug.cgi?id=188663

Reviewed by Tim Horton.

• 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:]):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebView.mm (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebViewConfiguration.mm (modified) (8 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+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 Tim Horton.
+
+        * 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>
 

trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm

@@ -539 +539 @@
     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]));

trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm

@@ -148 +148 @@
     BOOL _requiresUserActionForEditingControlsManager;
 #endif
-    BOOL _waitsForPaintAfterViewDidMoveToWindow;
-    BOOL _controlledByAutomation;
 
 #if ENABLE(APPLICATION_MANIFEST)
@@ -164 +162 @@
     BOOL _incompleteImageBorderEnabled;
     BOOL _shouldDeferAsynchronousScriptsUntilAfterDocumentLoad;
-    BOOL _drawsBackground;
 
     RetainPtr<NSString> _mediaContentTypesRequiringHardwareSupport;
@@ -218 +215 @@
     _requiresUserActionForEditingControlsManager = NO;
 #endif
-    _waitsForPaintAfterViewDidMoveToWindow = YES;
 
 #if ENABLE(WIRELESS_PLAYBACK_TARGET)
@@ -250 +246 @@
     _incompleteImageBorderEnabled = NO;
     _shouldDeferAsynchronousScriptsUntilAfterDocumentLoad = NO;
-    _drawsBackground = YES;
 
     return self;
@@ -365 +360 @@
     configuration->_mediaTypesRequiringUserActionForPlayback = self->_mediaTypesRequiringUserActionForPlayback;
     configuration->_mainContentUserGestureOverrideEnabled = self->_mainContentUserGestureOverrideEnabled;
-    configuration->_waitsForPaintAfterViewDidMoveToWindow = self->_waitsForPaintAfterViewDidMoveToWindow;
-    configuration->_controlledByAutomation = self->_controlledByAutomation;
 
 #if PLATFORM(IOS)
@@ -411 +404 @@
     configuration->_incompleteImageBorderEnabled = self->_incompleteImageBorderEnabled;
     configuration->_shouldDeferAsynchronousScriptsUntilAfterDocumentLoad = self->_shouldDeferAsynchronousScriptsUntilAfterDocumentLoad;
-    configuration->_drawsBackground = self->_drawsBackground;
 
     return configuration;
@@ -791 +783 @@
 - (BOOL)_drawsBackground
 {
-    return _drawsBackground;
+    return _pageConfiguration->drawsBackground();
 }
 
 - (void)_setDrawsBackground:(BOOL)drawsBackground
 {
-    _drawsBackground = drawsBackground;
+    _pageConfiguration->setDrawsBackground(drawsBackground);
 }
 
@@ -847 +839 @@
 - (BOOL)_waitsForPaintAfterViewDidMoveToWindow
 {
-    return _waitsForPaintAfterViewDidMoveToWindow;
-}
-
-- (void)_setWaitsForPaintAfterViewDidMoveToWindow:(BOOL)shouldSynchronize
-{
-    _waitsForPaintAfterViewDidMoveToWindow = shouldSynchronize;
+    return _pageConfiguration->waitsForPaintAfterViewDidMoveToWindow();
+}
+
+- (void)_setWaitsForPaintAfterViewDidMoveToWindow:(BOOL)waitsForPaintAfterViewDidMoveToWindow
+{
+    _pageConfiguration->setWaitsForPaintAfterViewDidMoveToWindow(waitsForPaintAfterViewDidMoveToWindow);
 }
 
 - (BOOL)_isControlledByAutomation
 {
-    return _controlledByAutomation;
+    return _pageConfiguration->isControlledByAutomation();
 }
 
 - (void)_setControlledByAutomation:(BOOL)controlledByAutomation
 {
-    _controlledByAutomation = controlledByAutomation;
+    _pageConfiguration->setControlledByAutomation(controlledByAutomation);
 }