Diff
Modified: branches/safari-603-branch/Source/WebKit2/ChangeLog (210961 => 210962)
--- branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-01-20 16:25:48 UTC (rev 210961)
+++ branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-01-20 16:25:52 UTC (rev 210962)
@@ -1,5 +1,39 @@
2017-01-20 Matthew Hanson <matthew_han...@apple.com>
+ Merge r210913. rdar://problem/30086738
+
+ 2017-01-18 Said Abou-Hallawa <sabouhall...@apple.com>
+
+ [iOS][WK2] Remove the WebView private configuration contentUpdateFrequency
+ https://bugs.webkit.org/show_bug.cgi?id=167188
+
+ Reviewed by Simon Fraser.
+
+ This patch reverts r209294. This configuration is not needed anymore.
+ The CADisplayLink::preferredFramesPerSecond for WK2 will be set to the
+ default value always.
+
+ * UIProcess/API/APIPageConfiguration.h:
+ (API::PageConfiguration::setAlwaysRunsAtForegroundPriority):
+ (API::PageConfiguration::contentUpdateFrequency): Deleted.
+ (API::PageConfiguration::setContentUpdateFrequency): Deleted.
+ (): Deleted.
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _initializeWithConfiguration:]):
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+ (-[WKWebViewConfiguration init]):
+ (-[WKWebViewConfiguration copyWithZone:]):
+ (-[WKWebViewConfiguration _setAllowsInlineMediaPlaybackAfterFullscreen:]):
+ (-[WKWebViewConfiguration _contentUpdateFrequency]): Deleted.
+ (-[WKWebViewConfiguration _setContentUpdateFrequency:]): Deleted.
+ * UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:
+ * UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h:
+ * UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm:
+ (-[WKOneShotDisplayLinkHandler initWithDrawingAreaProxy:]):
+ (WebKit::RemoteLayerTreeDrawingAreaProxy::contentUpdateFrequency): Deleted.
+
+2017-01-20 Matthew Hanson <matthew_han...@apple.com>
+
Merge r210939. rdar://problem/29885052
2017-01-19 Chris Dumez <cdu...@apple.com>
Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/API/APIPageConfiguration.h (210961 => 210962)
--- branches/safari-603-branch/Source/WebKit2/UIProcess/API/APIPageConfiguration.h 2017-01-20 16:25:48 UTC (rev 210961)
+++ branches/safari-603-branch/Source/WebKit2/UIProcess/API/APIPageConfiguration.h 2017-01-20 16:25:52 UTC (rev 210962)
@@ -88,9 +88,6 @@
#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; }
@@ -119,7 +116,6 @@
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: branches/safari-603-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (210961 => 210962)
--- branches/safari-603-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2017-01-20 16:25:48 UTC (rev 210961)
+++ branches/safari-603-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2017-01-20 16:25:52 UTC (rev 210962)
@@ -467,7 +467,6 @@
#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: branches/safari-603-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (210961 => 210962)
--- branches/safari-603-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2017-01-20 16:25:48 UTC (rev 210961)
+++ branches/safari-603-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2017-01-20 16:25:52 UTC (rev 210962)
@@ -109,7 +109,6 @@
BOOL _allowsInlineMediaPlayback;
BOOL _inlineMediaPlaybackRequiresPlaysInlineAttribute;
BOOL _allowsInlineMediaPlaybackAfterFullscreen;
- unsigned _contentUpdateFrequency;
#endif
BOOL _invisibleAutoplayNotPermitted;
@@ -149,7 +148,6 @@
else
_mediaTypesRequiringUserActionForPlayback = WKAudiovisualMediaTypeAll;
_ignoresViewportScaleLimits = NO;
- _contentUpdateFrequency = 60;
#else
_mediaTypesRequiringUserActionForPlayback = WKAudiovisualMediaTypeNone;
_mediaDataLoadsAutomatically = YES;
@@ -302,7 +300,6 @@
configuration->_alwaysRunsAtForegroundPriority = _alwaysRunsAtForegroundPriority;
configuration->_selectionGranularity = self->_selectionGranularity;
configuration->_ignoresViewportScaleLimits = self->_ignoresViewportScaleLimits;
- configuration->_contentUpdateFrequency = self->_contentUpdateFrequency;
#endif
#if PLATFORM(MAC)
configuration->_userInterfaceDirectionPolicy = self->_userInterfaceDirectionPolicy;
@@ -588,16 +585,6 @@
{
_allowsInlineMediaPlaybackAfterFullscreen = allows;
}
-
-- (NSUInteger)_contentUpdateFrequency
-{
- return _contentUpdateFrequency;
-}
-
-- (void)_setContentUpdateFrequency:(NSUInteger)contentUpdateFrequency
-{
- _contentUpdateFrequency = contentUpdateFrequency;
-}
#endif // PLATFORM(IOS)
- (BOOL)_invisibleAutoplayNotPermitted
Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h (210961 => 210962)
--- branches/safari-603-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2017-01-20 16:25:48 UTC (rev 210961)
+++ branches/safari-603-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2017-01-20 16:25:52 UTC (rev 210962)
@@ -63,7 +63,6 @@
@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: branches/safari-603-branch/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h (210961 => 210962)
--- branches/safari-603-branch/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h 2017-01-20 16:25:48 UTC (rev 210961)
+++ branches/safari-603-branch/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h 2017-01-20 16:25:52 UTC (rev 210962)
@@ -54,8 +54,6 @@
void didRefreshDisplay();
- uint32_t contentUpdateFrequency() const;
-
bool hasDebugIndicator() const { return !!m_debugIndicatorLayerTreeHost; }
private:
Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm (210961 => 210962)
--- branches/safari-603-branch/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm 2017-01-20 16:25:48 UTC (rev 210961)
+++ branches/safari-603-branch/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm 2017-01-20 16:25:52 UTC (rev 210962)
@@ -26,7 +26,6 @@
#import "config.h"
#import "RemoteLayerTreeDrawingAreaProxy.h"
-#import "APIPageConfiguration.h"
#import "Logging.h"
#import "RemoteLayerTreeDrawingAreaProxyMessages.h"
#import "DrawingAreaMessages.h"
@@ -69,7 +68,7 @@
_displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(displayLinkFired:)];
[_displayLink addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes];
_displayLink.paused = YES;
- _displayLink.preferredFramesPerSecond = drawingAreaProxy->contentUpdateFrequency();
+ _displayLink.preferredFramesPerSecond = 60;
}
return self;
}
@@ -136,16 +135,6 @@
#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())
