Unreviewed, rolling out r234942.
authorryanhaddad@apple.com <ryanhaddad@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 23 Aug 2018 21:31:22 +0000 (21:31 +0000)
committerryanhaddad@apple.com <ryanhaddad@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 23 Aug 2018 21:31:22 +0000 (21:31 +0000)
Caused page loading issues in iTunes

Reverted changeset:

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

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@235247 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/ChangeLog
Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm

index f43ccfb..3eca1c9 100644 (file)
@@ -1,3 +1,16 @@
+2018-08-23  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Unreviewed, rolling out r234942.
+
+        Caused page loading issues in iTunes
+
+        Reverted changeset:
+
+        "Transition more WKWebViewConfiguration ivars to
+        API::PageConfiguration values"
+        https://bugs.webkit.org/show_bug.cgi?id=188663
+        https://trac.webkit.org/changeset/234942
+
 2018-08-23  Aditya Keerthi  <akeerthi@apple.com>
 
         [iOS] Support the inputmode attribute on contenteditable elements
index 53ddf90..825a98a 100644 (file)
@@ -546,6 +546,9 @@ static void validate(WKWebViewConfiguration *configuration)
     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 bf187ff..a918c06 100644 (file)
@@ -147,6 +147,8 @@ static _WKDragLiftDelay toDragLiftDelay(NSUInteger value)
     BOOL _imageControlsEnabled;
     BOOL _requiresUserActionForEditingControlsManager;
 #endif
+    BOOL _waitsForPaintAfterViewDidMoveToWindow;
+    BOOL _controlledByAutomation;
 
 #if ENABLE(APPLE_PAY)
     BOOL _applePayEnabled;
@@ -157,6 +159,7 @@ static _WKDragLiftDelay toDragLiftDelay(NSUInteger value)
     BOOL _colorFilterEnabled;
     BOOL _incompleteImageBorderEnabled;
     BOOL _shouldDeferAsynchronousScriptsUntilAfterDocumentLoad;
+    BOOL _drawsBackground;
 
     RetainPtr<NSString> _mediaContentTypesRequiringHardwareSupport;
 }
@@ -209,6 +212,7 @@ static _WKDragLiftDelay toDragLiftDelay(NSUInteger value)
     _imageControlsEnabled = NO;
     _requiresUserActionForEditingControlsManager = NO;
 #endif
+    _waitsForPaintAfterViewDidMoveToWindow = YES;
 
 #if ENABLE(WIRELESS_PLAYBACK_TARGET)
     _allowsAirPlayForMediaPlayback = YES;
@@ -240,6 +244,7 @@ static _WKDragLiftDelay toDragLiftDelay(NSUInteger value)
     _colorFilterEnabled = NO;
     _incompleteImageBorderEnabled = NO;
     _shouldDeferAsynchronousScriptsUntilAfterDocumentLoad = NO;
+    _drawsBackground = YES;
 
     return self;
 }
@@ -354,6 +359,8 @@ static _WKDragLiftDelay toDragLiftDelay(NSUInteger value)
     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;
@@ -394,6 +401,7 @@ static _WKDragLiftDelay toDragLiftDelay(NSUInteger value)
     configuration->_colorFilterEnabled = self->_colorFilterEnabled;
     configuration->_incompleteImageBorderEnabled = self->_incompleteImageBorderEnabled;
     configuration->_shouldDeferAsynchronousScriptsUntilAfterDocumentLoad = self->_shouldDeferAsynchronousScriptsUntilAfterDocumentLoad;
+    configuration->_drawsBackground = self->_drawsBackground;
 
     return configuration;
 }
@@ -773,12 +781,12 @@ static NSString *defaultApplicationNameForUserAgent()
 
 - (BOOL)_drawsBackground
 {
-    return _pageConfiguration->drawsBackground();
+    return _drawsBackground;
 }
 
 - (void)_setDrawsBackground:(BOOL)drawsBackground
 {
-    _pageConfiguration->setDrawsBackground(drawsBackground);
+    _drawsBackground = drawsBackground;
 }
 
 - (BOOL)_requiresUserActionForVideoPlayback
@@ -829,22 +837,22 @@ static NSString *defaultApplicationNameForUserAgent()
 
 - (BOOL)_waitsForPaintAfterViewDidMoveToWindow
 {
-    return _pageConfiguration->waitsForPaintAfterViewDidMoveToWindow();
+    return _waitsForPaintAfterViewDidMoveToWindow;
 }
 
-- (void)_setWaitsForPaintAfterViewDidMoveToWindow:(BOOL)waitsForPaintAfterViewDidMoveToWindow
+- (void)_setWaitsForPaintAfterViewDidMoveToWindow:(BOOL)shouldSynchronize
 {
-    _pageConfiguration->setWaitsForPaintAfterViewDidMoveToWindow(waitsForPaintAfterViewDidMoveToWindow);
+    _waitsForPaintAfterViewDidMoveToWindow = shouldSynchronize;
 }
 
 - (BOOL)_isControlledByAutomation
 {
-    return _pageConfiguration->isControlledByAutomation();
+    return _controlledByAutomation;
 }
 
 - (void)_setControlledByAutomation:(BOOL)controlledByAutomation
 {
-    _pageConfiguration->setControlledByAutomation(controlledByAutomation);
+    _controlledByAutomation = controlledByAutomation;
 }
 
 - (_WKApplicationManifest *)_applicationManifest