Attachment 347292 Details for Bug 188673 – Patch

[patch] Patch

bug-188673-20180816131242.patch (text/plain), 7.35 KB, created by Alex Christensen on 2018-08-16 13:12:43 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2018-08-16 13:12:43 PDT

Size: 7.35 KB

patch

obsolete

>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 234949)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,20 @@
>+2018-08-16  Alex Christensen  <achristensen@webkit.org>
>+
>+        Begin moving preference SPI from WKWebViewConfiguration to WKPreferences
>+        https://bugs.webkit.org/show_bug.cgi?id=188673
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        I do this by deprecating the old SPI, making new SPI, and using the value from the old if the new hasn't been used.
>+
>+        * UIProcess/API/Cocoa/WKPreferences.mm:
>+        (-[WKPreferences _attachmentElementEnabled]):
>+        (-[WKPreferences _setAttachmentElementEnabled:]):
>+        * UIProcess/API/Cocoa/WKPreferencesPrivate.h:
>+        * UIProcess/API/Cocoa/WKWebView.mm:
>+        (-[WKWebView _initializeWithConfiguration:]):
>+        * UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:
>+
> 2018-08-16  Alex Christensen  <achristensen@webkit.org>
> 
>         Transition more WKWebViewConfiguration ivars to API::PageConfiguration values
>Index: Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm
>===================================================================
>--- Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm	(revision 234932)
>+++ Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm	(working copy)
>@@ -417,6 +417,16 @@ - (void)_setDeveloperExtrasEnabled:(BOOL
>     _preferences->setDeveloperExtrasEnabled(developerExtrasEnabled);
> }
> 
>+- (BOOL)_attachmentElementEnabled
>+{
>+    return _preferences->attachmentElementEnabled();
>+}
>+
>+- (void)_setAttachmentElementEnabled:(BOOL)attachmentElementEnabled
>+{
>+    _preferences->setAttachmentElementEnabled(attachmentElementEnabled);
>+}
>+
> - (BOOL)_logsPageMessagesToSystemConsoleEnabled
> {
>     return _preferences->logsPageMessagesToSystemConsoleEnabled();
>Index: Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h
>===================================================================
>--- Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h	(revision 234932)
>+++ Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h	(working copy)
>@@ -82,6 +82,8 @@ typedef NS_ENUM(NSInteger, _WKEditableLi
> 
> @property (nonatomic, setter=_setDeveloperExtrasEnabled:) BOOL _developerExtrasEnabled WK_API_AVAILABLE(macosx(10.11), ios(9.0));
> 
>+@property (nonatomic, setter=_setAttachmentElementEnabled:) BOOL _attachmentElementEnabled WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
>+
> @property (nonatomic, setter=_setLogsPageMessagesToSystemConsoleEnabled:) BOOL _logsPageMessagesToSystemConsoleEnabled WK_API_AVAILABLE(macosx(10.11), ios(9.0));
> 
> @property (nonatomic, setter=_setHiddenPageDOMTimerThrottlingEnabled:) BOOL _hiddenPageDOMTimerThrottlingEnabled WK_API_AVAILABLE(macosx(10.12), ios(10.0));
>Index: Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
>===================================================================
>--- Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm	(revision 234946)
>+++ Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm	(working copy)
>@@ -531,6 +531,8 @@ - (void)_initializeWithConfiguration:(WK
> 
>     pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::suppressesIncrementalRenderingKey(), WebKit::WebPreferencesStore::Value(!![_configuration suppressesIncrementalRendering]));
> 
>+#pragma clang diagnostic push
>+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
>     pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::shouldRespectImageOrientationKey(), WebKit::WebPreferencesStore::Value(!![_configuration _respectsImageOrientation]));
>     pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::shouldPrintBackgroundsKey(), WebKit::WebPreferencesStore::Value(!![_configuration _printsBackgrounds]));
>     pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::incrementalRenderingSuppressionTimeoutKey(), WebKit::WebPreferencesStore::Value([_configuration _incrementalRenderingSuppressionTimeout]));
>@@ -573,7 +575,8 @@     // We are in the View's initializati
>     pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::mainContentUserGestureOverrideEnabledKey(), WebKit::WebPreferencesStore::Value(!![_configuration _mainContentUserGestureOverrideEnabled]));
>     pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::invisibleAutoplayNotPermittedKey(), WebKit::WebPreferencesStore::Value(!![_configuration _invisibleAutoplayNotPermitted]));
>     pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::mediaDataLoadsAutomaticallyKey(), WebKit::WebPreferencesStore::Value(!![_configuration _mediaDataLoadsAutomatically]));
>-    pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::attachmentElementEnabledKey(), WebKit::WebPreferencesStore::Value(!![_configuration _attachmentElementEnabled]));
>+    if (!pageConfiguration->preferenceValues().contains(WebKit::WebPreferencesKey::attachmentElementEnabledKey()))
>+        pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::attachmentElementEnabledKey(), WebKit::WebPreferencesStore::Value(!![_configuration _attachmentElementEnabled]));
> 
> #if ENABLE(DATA_DETECTION) && PLATFORM(IOS)
>     pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::dataDetectorTypesKey(), WebKit::WebPreferencesStore::Value(static_cast<uint32_t>(fromWKDataDetectorTypes([_configuration dataDetectorTypes]))));
>@@ -595,6 +598,7 @@     // We are in the View's initializati
> #if ENABLE(LEGACY_ENCRYPTED_MEDIA)
>     pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::legacyEncryptedMediaAPIEnabledKey(), WebKit::WebPreferencesStore::Value(!![_configuration _legacyEncryptedMediaAPIEnabled]));
> #endif
>+#pragma clang diagnostic pop
> 
> #if PLATFORM(IOS) && ENABLE(SERVICE_WORKER)
>     if (!WTF::processHasEntitlement("com.apple.developer.WebKit.ServiceWorkers"))
>Index: Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h
>===================================================================
>--- Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h	(revision 234932)
>+++ Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h	(working copy)
>@@ -64,7 +64,7 @@ typedef NS_ENUM(NSUInteger, _WKDragLiftD
> @property (nonatomic, setter=_setMainContentUserGestureOverrideEnabled:) BOOL _mainContentUserGestureOverrideEnabled WK_API_AVAILABLE(macosx(10.12), ios(10.0));
> @property (nonatomic, setter=_setInvisibleAutoplayNotPermitted:) BOOL _invisibleAutoplayNotPermitted WK_API_AVAILABLE(macosx(10.12), ios(10.0));
> @property (nonatomic, setter=_setMediaDataLoadsAutomatically:) BOOL _mediaDataLoadsAutomatically WK_API_AVAILABLE(macosx(10.12), ios(10.0));
>-@property (nonatomic, setter=_setAttachmentElementEnabled:) BOOL _attachmentElementEnabled WK_API_AVAILABLE(macosx(10.12), ios(10.0));
>+@property (nonatomic, setter=_setAttachmentElementEnabled:) BOOL _attachmentElementEnabled WK_API_DEPRECATED_WITH_REPLACEMENT("WKPreferences._attachmentElementEnabled", macosx(10.12, WK_MAC_TBA), ios(10.0, WK_IOS_TBA));
> @property (nonatomic, setter=_setInitialCapitalizationEnabled:) BOOL _initialCapitalizationEnabled WK_API_AVAILABLE(macosx(10.12), ios(10.0));
> @property (nonatomic, setter=_setApplePayEnabled:) BOOL _applePayEnabled WK_API_AVAILABLE(macosx(10.12), ios(10.0));
> @property (nonatomic, setter=_setWaitsForPaintAfterViewDidMoveToWindow:) BOOL _waitsForPaintAfterViewDidMoveToWindow WK_API_AVAILABLE(macosx(10.12.3), ios(10.3));

Flags:

achristensen: review-

Actions: View | Formatted Diff | Diff

Attachments on bug 188673: 347292