<!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>[185541] trunk/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/185541">185541</a></dd>
<dt>Author</dt> <dd>barraclough@apple.com</dd>
<dt>Date</dt> <dd>2015-06-13 17:24:43 -0700 (Sat, 13 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add private API to force page to always run at foreground priority
https://bugs.webkit.org/show_bug.cgi?id=145946
<rdar://problem/21267221>
Reviewed by Anders Carlsson.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView initWithFrame:configuration:]):
- copy _alwaysRunsAtForegroundPriority to WebPageConfiguration.
* UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
(-[WKWebViewConfiguration copyWithZone:]):
(-[WKWebViewConfiguration _alwaysRunsAtForegroundPriority]):
(-[WKWebViewConfiguration _setAlwaysRunsAtForegroundPriority:]):
- added _alwaysRunsAtForegroundPriority.
* UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:
- added _alwaysRunsAtForegroundPriority.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::WebPageProxy):
- initialize m_alwaysRunsAtForegroundPriority.
(WebKit::WebPageProxy::updateActivityToken):
- if m_alwaysRunsAtForegroundPriority is set always take the foreground activity token.
* UIProcess/WebPageProxy.h:
- added m_alwaysRunsAtForegroundPriority, alwaysRunsAtForegroundPriority.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationPrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (185540 => 185541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-06-13 20:42:04 UTC (rev 185540)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-14 00:24:43 UTC (rev 185541)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2015-06-12 Gavin Barraclough <barraclough@apple.com>
+
+ Add private API to force page to always run at foreground priority
+ https://bugs.webkit.org/show_bug.cgi?id=145946
+ <rdar://problem/21267221>
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView initWithFrame:configuration:]):
+ - copy _alwaysRunsAtForegroundPriority to WebPageConfiguration.
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+ (-[WKWebViewConfiguration copyWithZone:]):
+ (-[WKWebViewConfiguration _alwaysRunsAtForegroundPriority]):
+ (-[WKWebViewConfiguration _setAlwaysRunsAtForegroundPriority:]):
+ - added _alwaysRunsAtForegroundPriority.
+ * UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:
+ - added _alwaysRunsAtForegroundPriority.
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::WebPageProxy):
+ - initialize m_alwaysRunsAtForegroundPriority.
+ (WebKit::WebPageProxy::updateActivityToken):
+ - if m_alwaysRunsAtForegroundPriority is set always take the foreground activity token.
+ * UIProcess/WebPageProxy.h:
+ - added m_alwaysRunsAtForegroundPriority, alwaysRunsAtForegroundPriority.
+
</ins><span class="cx"> 2015-06-12 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Reimplement WKResourceCacheManagerRef on top of WKWebsiteDataStoreRef
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (185540 => 185541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-06-13 20:42:04 UTC (rev 185540)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-06-14 00:24:43 UTC (rev 185541)
</span><span class="lines">@@ -320,6 +320,8 @@
</span><span class="cx"> webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::suppressesIncrementalRenderingKey(), WebKit::WebPreferencesStore::Value(!![_configuration suppressesIncrementalRendering]));
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><ins>+ webPageConfiguration.alwaysRunsAtForegroundPriority = [_configuration _alwaysRunsAtForegroundPriority];
+
</ins><span class="cx"> webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::allowsInlineMediaPlaybackKey(), WebKit::WebPreferencesStore::Value(!![_configuration allowsInlineMediaPlayback]));
</span><span class="cx"> webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::allowsAlternateFullscreenKey(), WebKit::WebPreferencesStore::Value(!![_configuration _allowsAlternateFullscreen] && shouldAllowAlternateFullscreen()));
</span><span class="cx"> webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::requiresUserGestureForMediaPlaybackKey(), WebKit::WebPreferencesStore::Value(!![_configuration requiresUserActionForMediaPlayback]));
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (185540 => 185541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2015-06-13 20:42:04 UTC (rev 185540)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2015-06-14 00:24:43 UTC (rev 185541)
</span><span class="lines">@@ -94,6 +94,7 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> LazyInitialized<RetainPtr<WKWebViewContentProviderRegistry>> _contentProviderRegistry;
</span><span class="cx"> BOOL _allowsAlternateFullscreen;
</span><ins>+ BOOL _alwaysRunsAtForegroundPriority;
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -140,6 +141,7 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> configuration->_allowsInlineMediaPlayback = self->_allowsInlineMediaPlayback;
</span><span class="cx"> configuration->_allowsAlternateFullscreen = self->_allowsAlternateFullscreen;
</span><ins>+ configuration->_alwaysRunsAtForegroundPriority = _alwaysRunsAtForegroundPriority;
</ins><span class="cx"> configuration->_requiresUserActionForMediaPlayback = self->_requiresUserActionForMediaPlayback;
</span><span class="cx"> configuration->_selectionGranularity = self->_selectionGranularity;
</span><span class="cx"> #endif
</span><span class="lines">@@ -323,6 +325,16 @@
</span><span class="cx"> {
</span><span class="cx"> _allowsAlternateFullscreen = allowed;
</span><span class="cx"> }
</span><ins>+
+- (BOOL)_alwaysRunsAtForegroundPriority
+{
+ return _alwaysRunsAtForegroundPriority;
+}
+
+- (void)_setAlwaysRunsAtForegroundPriority:(BOOL)alwaysRunsAtForegroundPriority
+{
+ _alwaysRunsAtForegroundPriority = alwaysRunsAtForegroundPriority;
+}
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h (185540 => 185541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2015-06-13 20:42:04 UTC (rev 185540)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2015-06-14 00:24:43 UTC (rev 185541)
</span><span class="lines">@@ -46,6 +46,8 @@
</span><span class="cx">
</span><span class="cx"> #if TARGET_OS_IPHONE
</span><span class="cx"> @property (nonatomic, setter=_setAllowsAlternateFullscreen:) BOOL _allowsAlternateFullscreen WK_AVAILABLE(NA, WK_IOS_TBA);
</span><ins>+
+@property (nonatomic, setter=_setAlwaysRunsAtForegroundPriority:) BOOL _alwaysRunsAtForegroundPriority WK_AVAILABLE(NA, WK_IOS_TBA);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (185540 => 185541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-06-13 20:42:04 UTC (rev 185540)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-06-14 00:24:43 UTC (rev 185541)
</span><span class="lines">@@ -309,6 +309,9 @@
</span><span class="cx"> , m_userMediaPermissionRequestManager(*this)
</span><span class="cx"> , m_viewState(ViewState::NoFlags)
</span><span class="cx"> , m_viewWasEverInWindow(false)
</span><ins>+#if PLATFORM(IOS)
+ , m_alwaysRunsAtForegroundPriority(configuration.alwaysRunsAtForegroundPriority)
+#endif
</ins><span class="cx"> , m_backForwardList(WebBackForwardList::create(*this))
</span><span class="cx"> , m_maintainsInactiveSelection(false)
</span><span class="cx"> , m_isEditable(false)
</span><span class="lines">@@ -1414,7 +1417,7 @@
</span><span class="cx"> m_pageIsUserObservableCount = m_process->processPool().userObservablePageCount();
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- if (!isViewVisible())
</del><ins>+ if (!isViewVisible() && !m_alwaysRunsAtForegroundPriority)
</ins><span class="cx"> m_activityToken = nullptr;
</span><span class="cx"> else if (!m_activityToken)
</span><span class="cx"> m_activityToken = m_process->throttler().foregroundActivityToken();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (185540 => 185541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-06-13 20:42:04 UTC (rev 185540)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-06-14 00:24:43 UTC (rev 185541)
</span><span class="lines">@@ -262,6 +262,10 @@
</span><span class="cx">
</span><span class="cx"> bool treatsSHA1SignedCertificatesAsInsecure = false;
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+ bool alwaysRunsAtForegroundPriority = false;
+#endif
+
</ins><span class="cx"> WebPreferencesStore::ValueMap preferenceValues;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -1541,8 +1545,8 @@
</span><span class="cx">
</span><span class="cx"> WebCore::ViewState::Flags m_viewState;
</span><span class="cx"> bool m_viewWasEverInWindow;
</span><del>-
</del><span class="cx"> #if PLATFORM(IOS)
</span><ins>+ bool m_alwaysRunsAtForegroundPriority;
</ins><span class="cx"> ProcessThrottler::ForegroundActivityToken m_activityToken;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>