Diff
Modified: trunk/Source/WebKit2/ChangeLog (209293 => 209294)
--- trunk/Source/WebKit2/ChangeLog 2016-12-03 03:39:42 UTC (rev 209293)
+++ trunk/Source/WebKit2/ChangeLog 2016-12-03 03:58:56 UTC (rev 209294)
@@ -1,3 +1,28 @@
+2016-12-02 Said Abou-Hallawa <[email protected]>
+
+ [iOS] Add a WebView private configuration for changing the WebContent update frequency
+ https://bugs.webkit.org/show_bug.cgi?id=165289
+ <rdar://problem/29472577>
+
+ Reviewed by Tim Horton.
+
+ Expose a preference which allows us to control the fps of web content updates.
+
+ * UIProcess/API/APIPageConfiguration.h:
+ (API::PageConfiguration::contentUpdateFrequency):
+ (API::PageConfiguration::setContentUpdateFrequency):
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _initializeWithConfiguration:]):
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+ (-[WKWebViewConfiguration copyWithZone:]):
+ (-[WKWebViewConfiguration _contentUpdateFrequency]):
+ (-[WKWebViewConfiguration _setContentUpdateFrequency:]):
+ * UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:
+ * UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h:
+ * UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm:
+ (-[WKOneShotDisplayLinkHandler initWithDrawingAreaProxy:]):
+ (WebKit::RemoteLayerTreeDrawingAreaProxy::contentUpdateFrequency):
+
2016-12-02 Andy Estes <[email protected]>
[Cocoa] Adopt the PRODUCT_BUNDLE_IDENTIFIER build setting
Modified: trunk/Source/WebKit2/UIProcess/API/APIPageConfiguration.h (209293 => 209294)
--- trunk/Source/WebKit2/UIProcess/API/APIPageConfiguration.h 2016-12-03 03:39:42 UTC (rev 209293)
+++ trunk/Source/WebKit2/UIProcess/API/APIPageConfiguration.h 2016-12-03 03:58:56 UTC (rev 209294)
@@ -88,6 +88,9 @@
#if PLATFORM(IOS)
bool alwaysRunsAtForegroundPriority() { return m_alwaysRunsAtForegroundPriority; }
void setAlwaysRunsAtForegroundPriority(bool alwaysRunsAtForegroundPriority) { m_alwaysRunsAtForegroundPriority = alwaysRunsAtForegroundPriority; }
+
+ uint32_t contentUpdateFrequency() const { return m_contentUpdateFrequency; }
+ void setContentUpdateFrequency(uint32_t updateFrequency) { m_contentUpdateFrequency = updateFrequency; }
#endif
bool initialCapitalizationEnabled() { return m_initialCapitalizationEnabled; }
void setInitialCapitalizationEnabled(bool initialCapitalizationEnabled) { m_initialCapitalizationEnabled = initialCapitalizationEnabled; }
@@ -116,6 +119,7 @@
bool m_treatsSHA1SignedCertificatesAsInsecure = true;
#if PLATFORM(IOS)
bool m_alwaysRunsAtForegroundPriority = false;
+ uint32_t m_contentUpdateFrequency { 0 };
#endif
bool m_initialCapitalizationEnabled = true;
bool m_waitsForPaintAfterViewDidMoveToWindow = true;
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (209293 => 209294)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-12-03 03:39:42 UTC (rev 209293)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-12-03 03:58:56 UTC (rev 209294)
@@ -466,6 +466,7 @@
#if PLATFORM(IOS)
pageConfiguration->setAlwaysRunsAtForegroundPriority([_configuration _alwaysRunsAtForegroundPriority]);
+ pageConfiguration->setContentUpdateFrequency([_configuration _contentUpdateFrequency]);
pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::allowsInlineMediaPlaybackKey(), WebKit::WebPreferencesStore::Value(!![_configuration allowsInlineMediaPlayback]));
pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::allowsInlineMediaPlaybackAfterFullscreenKey(), WebKit::WebPreferencesStore::Value(!![_configuration _allowsInlineMediaPlaybackAfterFullscreen]));
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (209293 => 209294)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2016-12-03 03:39:42 UTC (rev 209293)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2016-12-03 03:58:56 UTC (rev 209294)
@@ -109,6 +109,7 @@
BOOL _allowsInlineMediaPlayback;
BOOL _inlineMediaPlaybackRequiresPlaysInlineAttribute;
BOOL _allowsInlineMediaPlaybackAfterFullscreen;
+ unsigned _contentUpdateFrequency;
#endif
BOOL _invisibleAutoplayNotPermitted;
@@ -300,6 +301,7 @@
configuration->_alwaysRunsAtForegroundPriority = _alwaysRunsAtForegroundPriority;
configuration->_selectionGranularity = self->_selectionGranularity;
configuration->_ignoresViewportScaleLimits = self->_ignoresViewportScaleLimits;
+ configuration->_contentUpdateFrequency = self->_contentUpdateFrequency;
#endif
#if PLATFORM(MAC)
configuration->_userInterfaceDirectionPolicy = self->_userInterfaceDirectionPolicy;
@@ -585,6 +587,16 @@
{
_allowsInlineMediaPlaybackAfterFullscreen = allows;
}
+
+- (NSUInteger)_contentUpdateFrequency
+{
+ return _contentUpdateFrequency;
+}
+
+- (void)_setContentUpdateFrequency:(NSUInteger)contentUpdateFrequency
+{
+ _contentUpdateFrequency = contentUpdateFrequency;
+}
#endif // PLATFORM(IOS)
- (BOOL)_invisibleAutoplayNotPermitted
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h (209293 => 209294)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2016-12-03 03:39:42 UTC (rev 209293)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2016-12-03 03:58:56 UTC (rev 209294)
@@ -63,6 +63,7 @@
@property (nonatomic, setter=_setAlwaysRunsAtForegroundPriority:) BOOL _alwaysRunsAtForegroundPriority WK_API_AVAILABLE(ios(9_0));
@property (nonatomic, setter=_setInlineMediaPlaybackRequiresPlaysInlineAttribute:) BOOL _inlineMediaPlaybackRequiresPlaysInlineAttribute WK_API_AVAILABLE(ios(10.0));
@property (nonatomic, setter=_setAllowsInlineMediaPlaybackAfterFullscreen:) BOOL _allowsInlineMediaPlaybackAfterFullscreen WK_API_AVAILABLE(ios(10.0));
+@property (nonatomic, setter=_setContentUpdateFrequency:) NSUInteger _contentUpdateFrequency WK_API_AVAILABLE(ios(WK_IOS_TBA));
#else
@property (nonatomic, setter=_setShowsURLsInToolTips:) BOOL _showsURLsInToolTips WK_API_AVAILABLE(macosx(10.12));
@property (nonatomic, setter=_setServiceControlsEnabled:) BOOL _serviceControlsEnabled WK_API_AVAILABLE(macosx(10.12));
Modified: trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h (209293 => 209294)
--- trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h 2016-12-03 03:39:42 UTC (rev 209293)
+++ trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h 2016-12-03 03:58:56 UTC (rev 209294)
@@ -53,6 +53,8 @@
uint64_t lastCommittedLayerTreeTransactionID() const { return m_transactionIDForPendingCACommit; }
void didRefreshDisplay();
+
+ uint32_t contentUpdateFrequency() const;
private:
void sizeDidChange() override;
Modified: trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm (209293 => 209294)
--- trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm 2016-12-03 03:39:42 UTC (rev 209293)
+++ trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm 2016-12-03 03:58:56 UTC (rev 209294)
@@ -26,6 +26,7 @@
#import "config.h"
#import "RemoteLayerTreeDrawingAreaProxy.h"
+#import "APIPageConfiguration.h"
#import "Logging.h"
#import "RemoteLayerTreeDrawingAreaProxyMessages.h"
#import "DrawingAreaMessages.h"
@@ -68,6 +69,7 @@
_displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(displayLinkFired:)];
[_displayLink addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes];
_displayLink.paused = YES;
+ _displayLink.preferredFramesPerSecond = drawingAreaProxy->contentUpdateFrequency();
}
return self;
}
@@ -134,6 +136,16 @@
#endif
}
+uint32_t RemoteLayerTreeDrawingAreaProxy::contentUpdateFrequency() const
+{
+#if PLATFORM(IOS)
+ return m_webPageProxy.configuration().contentUpdateFrequency();
+#else
+ return 0;
+#endif
+}
+
+
void RemoteLayerTreeDrawingAreaProxy::sizeDidChange()
{
if (!m_webPageProxy.isValid())