Changeset 234946 in webkit

Timestamp:

Aug 16, 2018 11:49:48 AM (6 years ago)

Author:

achristensen@apple.com

Message:

Transition more WKWebViewConfiguration ivars to API::PageConfiguration values
​https://bugs.webkit.org/show_bug.cgi?id=188665

Reviewed by Joseph Pecoraro.

APPLICATION_MANIFEST is enabled on all Cocoa platforms, so I removed some guards, too!

• UIProcess/API/APIPageConfiguration.cpp:

(API::PageConfiguration::applicationManifest const):

• UIProcess/API/APIPageConfiguration.h:
• UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView _initializeWithConfiguration:]):

• UIProcess/API/Cocoa/WKWebViewConfiguration.mm:

(-[WKWebViewConfiguration init]):
(-[WKWebViewConfiguration copyWithZone:]):
(-[WKWebViewConfiguration _applicationManifest]):
(-[WKWebViewConfiguration _setApplicationManifest:]):
(-[WKWebViewConfiguration _setCPULimit:]):
(-[WKWebViewConfiguration _cpuLimit]):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/APIPageConfiguration.cpp (modified) (1 diff)
• UIProcess/API/APIPageConfiguration.h (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebView.mm (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebViewConfiguration.mm (modified) (7 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-08-16  Alex Christensen  <achristensen@webkit.org>
+
+        Transition more WKWebViewConfiguration ivars to API::PageConfiguration values
+        https://bugs.webkit.org/show_bug.cgi?id=188665
+
+        Reviewed by Joseph Pecoraro.
+
+        APPLICATION_MANIFEST is enabled on all Cocoa platforms, so I removed some guards, too!
+
+        * UIProcess/API/APIPageConfiguration.cpp:
+        (API::PageConfiguration::applicationManifest const):
+        * UIProcess/API/APIPageConfiguration.h:
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView _initializeWithConfiguration:]):
+        * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+        (-[WKWebViewConfiguration init]):
+        (-[WKWebViewConfiguration copyWithZone:]):
+        (-[WKWebViewConfiguration _applicationManifest]):
+        (-[WKWebViewConfiguration _setApplicationManifest:]):
+        (-[WKWebViewConfiguration _setCPULimit:]):
+        (-[WKWebViewConfiguration _cpuLimit]):
+
 2018-08-16  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/UIProcess/API/APIPageConfiguration.cpp

@@ -189 +189 @@
 
 #if ENABLE(APPLICATION_MANIFEST)
-const ApplicationManifest* PageConfiguration::applicationManifest() const
+ApplicationManifest* PageConfiguration::applicationManifest() const
 {
     return m_applicationManifest.get();

trunk/Source/WebKit/UIProcess/API/APIPageConfiguration.h

@@ -112 +112 @@
 
 #if ENABLE(APPLICATION_MANIFEST)
-    const ApplicationManifest* applicationManifest() const;
+    ApplicationManifest* applicationManifest() const;
     void setApplicationManifest(ApplicationManifest*);
 #endif

trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm

@@ -542 +542 @@
     pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::shouldDeferAsynchronousScriptsUntilAfterDocumentLoadKey(), WebKit::WebPreferencesStore::Value(!![_configuration _shouldDeferAsynchronousScriptsUntilAfterDocumentLoad]));
 
-#if ENABLE(APPLICATION_MANIFEST)
-    pageConfiguration->setApplicationManifest([_configuration _applicationManifest] ? [configuration _applicationManifest]->_applicationManifest.get() : nullptr);
-#endif
-
 #if PLATFORM(MAC)
-    if (auto cpuLimit = [_configuration _cpuLimit])
-        pageConfiguration->setCPULimit(cpuLimit);
     pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::showsURLsInToolTipsEnabledKey(), WebKit::WebPreferencesStore::Value(!![_configuration _showsURLsInToolTips]));
     pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::serviceControlsEnabledKey(), WebKit::WebPreferencesStore::Value(!![_configuration _serviceControlsEnabled]));

trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm

@@ -40 +40 @@
 #import "WebKit2Initialize.h"
 #import "WebURLSchemeHandlerCocoa.h"
+#import "_WKApplicationManifestInternal.h"
 #import "_WKVisitedLinkStore.h"
 #import "_WKWebsiteDataStoreInternal.h"
@@ -142 +143 @@
 #if PLATFORM(MAC)
     WKRetainPtr<WKPageGroupRef> _pageGroup;
-    double _cpuLimit;
     BOOL _showsURLsInToolTips;
     BOOL _serviceControlsEnabled;
     BOOL _imageControlsEnabled;
     BOOL _requiresUserActionForEditingControlsManager;
-#endif
-
-#if ENABLE(APPLICATION_MANIFEST)
-    RetainPtr<_WKApplicationManifest> _applicationManifest;
 #endif
 
@@ -207 +203 @@
 
 #if PLATFORM(MAC)
-    _cpuLimit = 0;
     _printsBackgrounds = NO;
     _respectsImageOrientation = NO;
@@ -374 +369 @@
 #endif
 #if PLATFORM(MAC)
-    configuration->_cpuLimit = self->_cpuLimit;
     configuration->_userInterfaceDirectionPolicy = self->_userInterfaceDirectionPolicy;
     configuration->_showsURLsInToolTips = self->_showsURLsInToolTips;
@@ -391 +385 @@
     configuration->_applePayEnabled = self->_applePayEnabled;
 #endif
-#if ENABLE(APPLICATION_MANIFEST)
-    configuration->_applicationManifest = self->_applicationManifest;
-#endif
     configuration->_needsStorageAccessFromFileURLsQuirk = self->_needsStorageAccessFromFileURLsQuirk;
 
@@ -859 +850 @@
 - (_WKApplicationManifest *)_applicationManifest
 {
-#if ENABLE(APPLICATION_MANIFEST)
-    return _applicationManifest.get();
-#else
+    if (auto* manifest = _pageConfiguration->applicationManifest())
+        return wrapper(*manifest);
     return nil;
-#endif
 }
 
 - (void)_setApplicationManifest:(_WKApplicationManifest *)applicationManifest
 {
-#if ENABLE(APPLICATION_MANIFEST)
-    _applicationManifest = applicationManifest;
-#endif
+    _pageConfiguration->setApplicationManifest(applicationManifest ? applicationManifest->_applicationManifest.get() : nullptr);
 }
 
@@ -926 +913 @@
 - (void)_setCPULimit:(double)cpuLimit
 {
-    _cpuLimit = cpuLimit;
+    _pageConfiguration->setCPULimit(cpuLimit);
 }
 
 - (double)_cpuLimit
 {
-    return _cpuLimit;
+    return _pageConfiguration->cpuLimit().value_or(0);
 }