Title: [235244] tags/Safari-607.1.3/Source/WebKit
- Revision
- 235244
- Author
- [email protected]
- Date
- 2018-08-23 14:14:17 -0700 (Thu, 23 Aug 2018)
Log Message
Revert r234942. rdar://problem/43655048
Modified Paths
Diff
Modified: tags/Safari-607.1.3/Source/WebKit/ChangeLog (235243 => 235244)
--- tags/Safari-607.1.3/Source/WebKit/ChangeLog 2018-08-23 20:51:19 UTC (rev 235243)
+++ tags/Safari-607.1.3/Source/WebKit/ChangeLog 2018-08-23 21:14:17 UTC (rev 235244)
@@ -1,3 +1,7 @@
+2018-08-23 Kocsen Chung <[email protected]>
+
+ Revert r234942. rdar://problem/43655048
+
2018-08-22 Antti Koivisto <[email protected]>
Use OptionSet for NetworkCache::Storage::TraverseFlags
Modified: tags/Safari-607.1.3/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (235243 => 235244)
--- tags/Safari-607.1.3/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2018-08-23 20:51:19 UTC (rev 235243)
+++ tags/Safari-607.1.3/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2018-08-23 21:14:17 UTC (rev 235244)
@@ -539,6 +539,9 @@
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]));
Modified: tags/Safari-607.1.3/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (235243 => 235244)
--- tags/Safari-607.1.3/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2018-08-23 20:51:19 UTC (rev 235243)
+++ tags/Safari-607.1.3/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2018-08-23 21:14:17 UTC (rev 235244)
@@ -147,6 +147,8 @@
BOOL _imageControlsEnabled;
BOOL _requiresUserActionForEditingControlsManager;
#endif
+ BOOL _waitsForPaintAfterViewDidMoveToWindow;
+ BOOL _controlledByAutomation;
#if ENABLE(APPLE_PAY)
BOOL _applePayEnabled;
@@ -157,6 +159,7 @@
BOOL _colorFilterEnabled;
BOOL _incompleteImageBorderEnabled;
BOOL _shouldDeferAsynchronousScriptsUntilAfterDocumentLoad;
+ BOOL _drawsBackground;
RetainPtr<NSString> _mediaContentTypesRequiringHardwareSupport;
}
@@ -209,6 +212,7 @@
_imageControlsEnabled = NO;
_requiresUserActionForEditingControlsManager = NO;
#endif
+ _waitsForPaintAfterViewDidMoveToWindow = YES;
#if ENABLE(WIRELESS_PLAYBACK_TARGET)
_allowsAirPlayForMediaPlayback = YES;
@@ -240,6 +244,7 @@
_colorFilterEnabled = NO;
_incompleteImageBorderEnabled = NO;
_shouldDeferAsynchronousScriptsUntilAfterDocumentLoad = NO;
+ _drawsBackground = YES;
return self;
}
@@ -354,6 +359,8 @@
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 @@
configuration->_colorFilterEnabled = self->_colorFilterEnabled;
configuration->_incompleteImageBorderEnabled = self->_incompleteImageBorderEnabled;
configuration->_shouldDeferAsynchronousScriptsUntilAfterDocumentLoad = self->_shouldDeferAsynchronousScriptsUntilAfterDocumentLoad;
+ configuration->_drawsBackground = self->_drawsBackground;
return configuration;
}
@@ -773,12 +781,12 @@
- (BOOL)_drawsBackground
{
- return _pageConfiguration->drawsBackground();
+ return _drawsBackground;
}
- (void)_setDrawsBackground:(BOOL)drawsBackground
{
- _pageConfiguration->setDrawsBackground(drawsBackground);
+ _drawsBackground = drawsBackground;
}
- (BOOL)_requiresUserActionForVideoPlayback
@@ -829,22 +837,22 @@
- (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
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
