Title: [234942] trunk/Source/WebKit
- Revision
- 234942
- Author
- [email protected]
- Date
- 2018-08-16 11:19:19 -0700 (Thu, 16 Aug 2018)
Log 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:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (234941 => 234942)
--- trunk/Source/WebKit/ChangeLog 2018-08-16 17:59:30 UTC (rev 234941)
+++ trunk/Source/WebKit/ChangeLog 2018-08-16 18:19:19 UTC (rev 234942)
@@ -1,5 +1,24 @@
2018-08-16 Alex Christensen <[email protected]>
+ 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 <[email protected]>
+
Stop using canAuthenticateAgainstProtectionSpace in modern WebKit
https://bugs.webkit.org/show_bug.cgi?id=188639
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (234941 => 234942)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2018-08-16 17:59:30 UTC (rev 234941)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2018-08-16 18:19:19 UTC (rev 234942)
@@ -538,9 +538,6 @@
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: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (234941 => 234942)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2018-08-16 17:59:30 UTC (rev 234941)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2018-08-16 18:19:19 UTC (rev 234942)
@@ -147,8 +147,6 @@
BOOL _imageControlsEnabled;
BOOL _requiresUserActionForEditingControlsManager;
#endif
- BOOL _waitsForPaintAfterViewDidMoveToWindow;
- BOOL _controlledByAutomation;
#if ENABLE(APPLICATION_MANIFEST)
RetainPtr<_WKApplicationManifest> _applicationManifest;
@@ -163,7 +161,6 @@
BOOL _colorFilterEnabled;
BOOL _incompleteImageBorderEnabled;
BOOL _shouldDeferAsynchronousScriptsUntilAfterDocumentLoad;
- BOOL _drawsBackground;
RetainPtr<NSString> _mediaContentTypesRequiringHardwareSupport;
}
@@ -217,7 +214,6 @@
_imageControlsEnabled = NO;
_requiresUserActionForEditingControlsManager = NO;
#endif
- _waitsForPaintAfterViewDidMoveToWindow = YES;
#if ENABLE(WIRELESS_PLAYBACK_TARGET)
_allowsAirPlayForMediaPlayback = YES;
@@ -249,7 +245,6 @@
_colorFilterEnabled = NO;
_incompleteImageBorderEnabled = NO;
_shouldDeferAsynchronousScriptsUntilAfterDocumentLoad = NO;
- _drawsBackground = YES;
return self;
}
@@ -364,8 +359,6 @@
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 @@
configuration->_colorFilterEnabled = self->_colorFilterEnabled;
configuration->_incompleteImageBorderEnabled = self->_incompleteImageBorderEnabled;
configuration->_shouldDeferAsynchronousScriptsUntilAfterDocumentLoad = self->_shouldDeferAsynchronousScriptsUntilAfterDocumentLoad;
- configuration->_drawsBackground = self->_drawsBackground;
return configuration;
}
@@ -790,12 +782,12 @@
- (BOOL)_drawsBackground
{
- return _drawsBackground;
+ return _pageConfiguration->drawsBackground();
}
- (void)_setDrawsBackground:(BOOL)drawsBackground
{
- _drawsBackground = drawsBackground;
+ _pageConfiguration->setDrawsBackground(drawsBackground);
}
- (BOOL)_requiresUserActionForVideoPlayback
@@ -846,22 +838,22 @@
- (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
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
