Changeset 222663 in webkit

Timestamp:

Sep 29, 2017 1:50:13 PM (7 years ago)

Author:

achristensen@apple.com

Message:

Add WKWebViewConfiguration SPI equivalent to WKPageConfigurationSetBackgroundCPULimit
​https://bugs.webkit.org/show_bug.cgi?id=177644
<rdar://problem/34338698>

Reviewed by Geoffrey Garen.

WKPageConfigurationSetBackgroundCPULimit is a setter of a std::optional<double> with no accessor.
It's never set to 0 in practice, so I guess the ObjC equivalent is a double that is zero or nonzero.

• UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView _initializeWithConfiguration:]):

• UIProcess/API/Cocoa/WKWebViewConfiguration.mm:

(-[WKWebViewConfiguration _setCPULimit:]):
(-[WKWebViewConfiguration _cpuLimit]):

• UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebView.mm (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebViewConfiguration.mm (modified) (2 diffs)
• UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2017-09-28  Alex Christensen  <achristensen@webkit.org>
+
+        Add WKWebViewConfiguration SPI equivalent to WKPageConfigurationSetBackgroundCPULimit
+        https://bugs.webkit.org/show_bug.cgi?id=177644
+        <rdar://problem/34338698>
+
+        Reviewed by Geoffrey Garen.
+
+        WKPageConfigurationSetBackgroundCPULimit is a setter of a std::optional<double> with no accessor.
+        It's never set to 0 in practice, so I guess the ObjC equivalent is a double that is zero or nonzero.
+
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView _initializeWithConfiguration:]):
+        * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+        (-[WKWebViewConfiguration _setCPULimit:]):
+        (-[WKWebViewConfiguration _cpuLimit]):
+        * UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:
+
 2017-09-28  Ryosuke Niwa  <rniwa@webkit.org>
 

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

@@ -471 +471 @@
 
 #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

@@ -138 +138 @@
 
 #if PLATFORM(MAC)
+    double _cpuLimit;
     BOOL _showsURLsInToolTips;
     BOOL _serviceControlsEnabled;
@@ -819 +820 @@
 }
 
+- (void)_setCPULimit:(double)cpuLimit
+{
+    _cpuLimit = cpuLimit;
+}
+
+- (double)_cpuLimit
+{
+    return _cpuLimit;
+}
+
 #endif // PLATFORM(MAC)
 

trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h

@@ -79 +79 @@
 @property (nonatomic, setter=_setImageControlsEnabled:) BOOL _imageControlsEnabled WK_API_AVAILABLE(macosx(10.12));
 @property (nonatomic, readwrite, setter=_setRequiresUserActionForEditingControlsManager:) BOOL _requiresUserActionForEditingControlsManager WK_API_AVAILABLE(macosx(10.12));
+@property (nonatomic, readwrite, setter=_setCPULimit:) double _cpuLimit WK_API_AVAILABLE(WK_MAC_TBA);
 #endif