<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[210962] branches/safari-603-branch/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/210962">210962</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-01-20 08:25:52 -0800 (Fri, 20 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/210913">r210913</a>. rdar://problem/30086738</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchSourceWebKit2ChangeLog">branches/safari-603-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebKit2UIProcessAPIAPIPageConfigurationh">branches/safari-603-branch/Source/WebKit2/UIProcess/API/APIPageConfiguration.h</a></li>
<li><a href="#branchessafari603branchSourceWebKit2UIProcessAPICocoaWKWebViewmm">branches/safari-603-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#branchessafari603branchSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationmm">branches/safari-603-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm</a></li>
<li><a href="#branchessafari603branchSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationPrivateh">branches/safari-603-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h</a></li>
<li><a href="#branchessafari603branchSourceWebKit2UIProcessmacRemoteLayerTreeDrawingAreaProxyh">branches/safari-603-branch/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h</a></li>
<li><a href="#branchessafari603branchSourceWebKit2UIProcessmacRemoteLayerTreeDrawingAreaProxymm">branches/safari-603-branch/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/ChangeLog (210961 => 210962)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,39 @@
</span><span class="cx"> 2017-01-20 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r210913. rdar://problem/30086738
+
+ 2017-01-18 Said Abou-Hallawa <sabouhallawa@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_hanson@apple.com>
+
</ins><span class="cx"> Merge r210939. rdar://problem/29885052
</span><span class="cx">
</span><span class="cx"> 2017-01-19 Chris Dumez <cdumez@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2UIProcessAPIAPIPageConfigurationh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/API/APIPageConfiguration.h (210961 => 210962)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -88,9 +88,6 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> bool alwaysRunsAtForegroundPriority() { return m_alwaysRunsAtForegroundPriority; }
</span><span class="cx"> void setAlwaysRunsAtForegroundPriority(bool alwaysRunsAtForegroundPriority) { m_alwaysRunsAtForegroundPriority = alwaysRunsAtForegroundPriority; }
</span><del>-
- uint32_t contentUpdateFrequency() const { return m_contentUpdateFrequency; }
- void setContentUpdateFrequency(uint32_t updateFrequency) { m_contentUpdateFrequency = updateFrequency; }
</del><span class="cx"> #endif
</span><span class="cx"> bool initialCapitalizationEnabled() { return m_initialCapitalizationEnabled; }
</span><span class="cx"> void setInitialCapitalizationEnabled(bool initialCapitalizationEnabled) { m_initialCapitalizationEnabled = initialCapitalizationEnabled; }
</span><span class="lines">@@ -119,7 +116,6 @@
</span><span class="cx"> bool m_treatsSHA1SignedCertificatesAsInsecure = true;
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> bool m_alwaysRunsAtForegroundPriority = false;
</span><del>- uint32_t m_contentUpdateFrequency { 0 };
</del><span class="cx"> #endif
</span><span class="cx"> bool m_initialCapitalizationEnabled = true;
</span><span class="cx"> bool m_waitsForPaintAfterViewDidMoveToWindow = true;
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (210961 => 210962)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -467,7 +467,6 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> pageConfiguration->setAlwaysRunsAtForegroundPriority([_configuration _alwaysRunsAtForegroundPriority]);
</span><del>- pageConfiguration->setContentUpdateFrequency([_configuration _contentUpdateFrequency]);
</del><span class="cx">
</span><span class="cx"> pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::allowsInlineMediaPlaybackKey(), WebKit::WebPreferencesStore::Value(!![_configuration allowsInlineMediaPlayback]));
</span><span class="cx"> pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::allowsInlineMediaPlaybackAfterFullscreenKey(), WebKit::WebPreferencesStore::Value(!![_configuration _allowsInlineMediaPlaybackAfterFullscreen]));
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationmm"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (210961 => 210962)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -109,7 +109,6 @@
</span><span class="cx"> BOOL _allowsInlineMediaPlayback;
</span><span class="cx"> BOOL _inlineMediaPlaybackRequiresPlaysInlineAttribute;
</span><span class="cx"> BOOL _allowsInlineMediaPlaybackAfterFullscreen;
</span><del>- unsigned _contentUpdateFrequency;
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> BOOL _invisibleAutoplayNotPermitted;
</span><span class="lines">@@ -149,7 +148,6 @@
</span><span class="cx"> else
</span><span class="cx"> _mediaTypesRequiringUserActionForPlayback = WKAudiovisualMediaTypeAll;
</span><span class="cx"> _ignoresViewportScaleLimits = NO;
</span><del>- _contentUpdateFrequency = 60;
</del><span class="cx"> #else
</span><span class="cx"> _mediaTypesRequiringUserActionForPlayback = WKAudiovisualMediaTypeNone;
</span><span class="cx"> _mediaDataLoadsAutomatically = YES;
</span><span class="lines">@@ -302,7 +300,6 @@
</span><span class="cx"> configuration->_alwaysRunsAtForegroundPriority = _alwaysRunsAtForegroundPriority;
</span><span class="cx"> configuration->_selectionGranularity = self->_selectionGranularity;
</span><span class="cx"> configuration->_ignoresViewportScaleLimits = self->_ignoresViewportScaleLimits;
</span><del>- configuration->_contentUpdateFrequency = self->_contentUpdateFrequency;
</del><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> configuration->_userInterfaceDirectionPolicy = self->_userInterfaceDirectionPolicy;
</span><span class="lines">@@ -588,16 +585,6 @@
</span><span class="cx"> {
</span><span class="cx"> _allowsInlineMediaPlaybackAfterFullscreen = allows;
</span><span class="cx"> }
</span><del>-
-- (NSUInteger)_contentUpdateFrequency
-{
- return _contentUpdateFrequency;
-}
-
-- (void)_setContentUpdateFrequency:(NSUInteger)contentUpdateFrequency
-{
- _contentUpdateFrequency = contentUpdateFrequency;
-}
</del><span class="cx"> #endif // PLATFORM(IOS)
</span><span class="cx">
</span><span class="cx"> - (BOOL)_invisibleAutoplayNotPermitted
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h (210961 => 210962)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -63,7 +63,6 @@
</span><span class="cx"> @property (nonatomic, setter=_setAlwaysRunsAtForegroundPriority:) BOOL _alwaysRunsAtForegroundPriority WK_API_AVAILABLE(ios(9_0));
</span><span class="cx"> @property (nonatomic, setter=_setInlineMediaPlaybackRequiresPlaysInlineAttribute:) BOOL _inlineMediaPlaybackRequiresPlaysInlineAttribute WK_API_AVAILABLE(ios(10.0));
</span><span class="cx"> @property (nonatomic, setter=_setAllowsInlineMediaPlaybackAfterFullscreen:) BOOL _allowsInlineMediaPlaybackAfterFullscreen WK_API_AVAILABLE(ios(10.0));
</span><del>-@property (nonatomic, setter=_setContentUpdateFrequency:) NSUInteger _contentUpdateFrequency WK_API_AVAILABLE(ios(WK_IOS_TBA));
</del><span class="cx"> #else
</span><span class="cx"> @property (nonatomic, setter=_setShowsURLsInToolTips:) BOOL _showsURLsInToolTips WK_API_AVAILABLE(macosx(10.12));
</span><span class="cx"> @property (nonatomic, setter=_setServiceControlsEnabled:) BOOL _serviceControlsEnabled WK_API_AVAILABLE(macosx(10.12));
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2UIProcessmacRemoteLayerTreeDrawingAreaProxyh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h (210961 => 210962)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -54,8 +54,6 @@
</span><span class="cx">
</span><span class="cx"> void didRefreshDisplay();
</span><span class="cx">
</span><del>- uint32_t contentUpdateFrequency() const;
-
</del><span class="cx"> bool hasDebugIndicator() const { return !!m_debugIndicatorLayerTreeHost; }
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2UIProcessmacRemoteLayerTreeDrawingAreaProxymm"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm (210961 => 210962)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -26,7 +26,6 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "RemoteLayerTreeDrawingAreaProxy.h"
</span><span class="cx">
</span><del>-#import "APIPageConfiguration.h"
</del><span class="cx"> #import "Logging.h"
</span><span class="cx"> #import "RemoteLayerTreeDrawingAreaProxyMessages.h"
</span><span class="cx"> #import "DrawingAreaMessages.h"
</span><span class="lines">@@ -69,7 +68,7 @@
</span><span class="cx"> _displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(displayLinkFired:)];
</span><span class="cx"> [_displayLink addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes];
</span><span class="cx"> _displayLink.paused = YES;
</span><del>- _displayLink.preferredFramesPerSecond = drawingAreaProxy->contentUpdateFrequency();
</del><ins>+ _displayLink.preferredFramesPerSecond = 60;
</ins><span class="cx"> }
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="lines">@@ -136,16 +135,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-uint32_t RemoteLayerTreeDrawingAreaProxy::contentUpdateFrequency() const
-{
-#if PLATFORM(IOS)
- return m_webPageProxy.configuration().contentUpdateFrequency();
-#else
- return 0;
-#endif
-}
-
-
</del><span class="cx"> void RemoteLayerTreeDrawingAreaProxy::sizeDidChange()
</span><span class="cx"> {
</span><span class="cx"> if (!m_webPageProxy.isValid())
</span></span></pre>
</div>
</div>
</body>
</html>