Attachment 347270 Details for Bug 188661 – Patch

[patch] Patch

bug-188661-20180816100031.patch (text/plain), 8.82 KB, created by Alex Christensen on 2018-08-16 10:00:32 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2018-08-16 10:00:32 PDT

Size: 8.82 KB

patch

obsolete

>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 234931)
>+++ 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=188661
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UIProcess/API/Cocoa/WKWebView.mm:
>+        (-[WKWebView _initializeWithConfiguration:]):
>+        * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
>+        (-[WKWebViewConfiguration init]):
>+        (-[WKWebViewConfiguration copyWithZone:]):
>+        (-[WKWebViewConfiguration _alwaysRunsAtForegroundPriority]):
>+        (-[WKWebViewConfiguration _setAlwaysRunsAtForegroundPriority:]):
>+        (-[WKWebViewConfiguration _initialCapitalizationEnabled]):
>+        (-[WKWebViewConfiguration _setInitialCapitalizationEnabled:]):
>+        (-[WKWebViewConfiguration _overrideContentSecurityPolicy]):
>+        (-[WKWebViewConfiguration _setOverrideContentSecurityPolicy:]):
>+
> 2018-08-16  Aditya Keerthi  <akeerthi@apple.com>
> 
>         Support drag-and-drop for input[type=color]
>Index: Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
>===================================================================
>--- Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm	(revision 234900)
>+++ Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm	(working copy)
>@@ -517,9 +517,6 @@ - (void)_initializeWithConfiguration:(WK
>     pageConfiguration->setVisitedLinkStore([_configuration _visitedLinkStore]->_visitedLinkStore.get());
>     pageConfiguration->setWebsiteDataStore([_configuration websiteDataStore]->_websiteDataStore.get());
> 
>-    if (NSString *overrideContentSecurityPolicy = configuration._overrideContentSecurityPolicy)
>-        pageConfiguration->setOverrideContentSecurityPolicy(overrideContentSecurityPolicy);
>-
> #if PLATFORM(MAC)
>     if (auto pageGroup = WebKit::toImpl([configuration _pageGroup])) {
>         pageConfiguration->setPageGroup(pageGroup);
>@@ -541,7 +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->setInitialCapitalizationEnabled([_configuration _initialCapitalizationEnabled]);
>     pageConfiguration->setWaitsForPaintAfterViewDidMoveToWindow([_configuration _waitsForPaintAfterViewDidMoveToWindow]);
>     pageConfiguration->setDrawsBackground([_configuration _drawsBackground]);
>     pageConfiguration->setControlledByAutomation([_configuration _isControlledByAutomation]);
>@@ -567,8 +563,6 @@     // We are in the View's initializati
> #endif
> 
> #if PLATFORM(IOS)
>-    pageConfiguration->setAlwaysRunsAtForegroundPriority([_configuration _alwaysRunsAtForegroundPriority]);
>-
>     pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::allowsInlineMediaPlaybackKey(), WebKit::WebPreferencesStore::Value(!![_configuration allowsInlineMediaPlayback]));
>     pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::allowsInlineMediaPlaybackAfterFullscreenKey(), WebKit::WebPreferencesStore::Value(!![_configuration _allowsInlineMediaPlaybackAfterFullscreen]));
>     pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::inlineMediaPlaybackRequiresPlaysInlineAttributeKey(), WebKit::WebPreferencesStore::Value(!![_configuration _inlineMediaPlaybackRequiresPlaysInlineAttribute]));
>Index: Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm
>===================================================================
>--- Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm	(revision 234900)
>+++ Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm	(working copy)
>@@ -125,7 +125,6 @@ static _WKDragLiftDelay toDragLiftDelay(
> 
> #if PLATFORM(IOS)
>     LazyInitialized<RetainPtr<WKWebViewContentProviderRegistry>> _contentProviderRegistry;
>-    BOOL _alwaysRunsAtForegroundPriority;
>     BOOL _allowsInlineMediaPlayback;
>     BOOL _inlineMediaPlaybackRequiresPlaysInlineAttribute;
>     BOOL _allowsInlineMediaPlaybackAfterFullscreen;
>@@ -148,7 +147,6 @@ static _WKDragLiftDelay toDragLiftDelay(
>     BOOL _imageControlsEnabled;
>     BOOL _requiresUserActionForEditingControlsManager;
> #endif
>-    BOOL _initialCapitalizationEnabled;
>     BOOL _waitsForPaintAfterViewDidMoveToWindow;
>     BOOL _controlledByAutomation;
> 
>@@ -167,7 +165,6 @@ static _WKDragLiftDelay toDragLiftDelay(
>     BOOL _shouldDeferAsynchronousScriptsUntilAfterDocumentLoad;
>     BOOL _drawsBackground;
> 
>-    RetainPtr<NSString> _overrideContentSecurityPolicy;
>     RetainPtr<NSString> _mediaContentTypesRequiringHardwareSupport;
> }
> 
>@@ -220,7 +217,6 @@ - (instancetype)init
>     _imageControlsEnabled = NO;
>     _requiresUserActionForEditingControlsManager = NO;
> #endif
>-    _initialCapitalizationEnabled = YES;
>     _waitsForPaintAfterViewDidMoveToWindow = YES;
> 
> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
>@@ -368,7 +364,6 @@ - (id)copyWithZone:(NSZone *)zone
>     configuration->_attachmentElementEnabled = self->_attachmentElementEnabled;
>     configuration->_mediaTypesRequiringUserActionForPlayback = self->_mediaTypesRequiringUserActionForPlayback;
>     configuration->_mainContentUserGestureOverrideEnabled = self->_mainContentUserGestureOverrideEnabled;
>-    configuration->_initialCapitalizationEnabled = self->_initialCapitalizationEnabled;
>     configuration->_waitsForPaintAfterViewDidMoveToWindow = self->_waitsForPaintAfterViewDidMoveToWindow;
>     configuration->_controlledByAutomation = self->_controlledByAutomation;
> 
>@@ -377,7 +372,6 @@ - (id)copyWithZone:(NSZone *)zone
>     configuration->_allowsInlineMediaPlaybackAfterFullscreen = self->_allowsInlineMediaPlaybackAfterFullscreen;
>     configuration->_inlineMediaPlaybackRequiresPlaysInlineAttribute = self->_inlineMediaPlaybackRequiresPlaysInlineAttribute;
>     configuration->_allowsPictureInPictureMediaPlayback = self->_allowsPictureInPictureMediaPlayback;
>-    configuration->_alwaysRunsAtForegroundPriority = _alwaysRunsAtForegroundPriority;
>     configuration->_selectionGranularity = self->_selectionGranularity;
>     configuration->_ignoresViewportScaleLimits = self->_ignoresViewportScaleLimits;
>     configuration->_dragLiftDelay = self->_dragLiftDelay;
>@@ -407,7 +401,6 @@ - (id)copyWithZone:(NSZone *)zone
>     configuration->_applicationManifest = self->_applicationManifest;
> #endif
>     configuration->_needsStorageAccessFromFileURLsQuirk = self->_needsStorageAccessFromFileURLsQuirk;
>-    configuration->_overrideContentSecurityPolicy = adoptNS([self->_overrideContentSecurityPolicy copyWithZone:zone]);
> 
>     configuration->_mediaContentTypesRequiringHardwareSupport = adoptNS([self._mediaContentTypesRequiringHardwareSupport copyWithZone:zone]);
>     configuration->_legacyEncryptedMediaAPIEnabled = self->_legacyEncryptedMediaAPIEnabled;
>@@ -665,12 +658,12 @@ - (void)_setAllowsMetaRefresh:(BOOL)allo
> #if PLATFORM(IOS)
> - (BOOL)_alwaysRunsAtForegroundPriority
> {
>-    return _alwaysRunsAtForegroundPriority;
>+    return _pageConfiguration->alwaysRunsAtForegroundPriority();
> }
> 
> - (void)_setAlwaysRunsAtForegroundPriority:(BOOL)alwaysRunsAtForegroundPriority
> {
>-    _alwaysRunsAtForegroundPriority = alwaysRunsAtForegroundPriority;
>+    _pageConfiguration->setAlwaysRunsAtForegroundPriority(alwaysRunsAtForegroundPriority);
> }
> 
> - (BOOL)_inlineMediaPlaybackRequiresPlaysInlineAttribute
>@@ -843,12 +836,12 @@ - (void)_setMainContentUserGestureOverri
> 
> - (BOOL)_initialCapitalizationEnabled
> {
>-    return _initialCapitalizationEnabled;
>+    return _pageConfiguration->initialCapitalizationEnabled();
> }
> 
> - (void)_setInitialCapitalizationEnabled:(BOOL)initialCapitalizationEnabled
> {
>-    _initialCapitalizationEnabled = initialCapitalizationEnabled;
>+    _pageConfiguration->setInitialCapitalizationEnabled(initialCapitalizationEnabled);
> }
> 
> - (BOOL)_waitsForPaintAfterViewDidMoveToWindow
>@@ -978,12 +971,12 @@ - (void)_setNeedsStorageAccessFromFileUR
> 
> - (NSString *)_overrideContentSecurityPolicy
> {
>-    return _overrideContentSecurityPolicy.get();
>+    return _pageConfiguration->overrideContentSecurityPolicy();
> }
> 
> - (void)_setOverrideContentSecurityPolicy:(NSString *)overrideContentSecurityPolicy
> {
>-    _overrideContentSecurityPolicy = adoptNS([overrideContentSecurityPolicy copy]);
>+    _pageConfiguration->setOverrideContentSecurityPolicy(overrideContentSecurityPolicy);
> }
> 
> - (NSString *)_mediaContentTypesRequiringHardwareSupport

Flags:

andersca: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 188661: 347269 | 347270