<!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>[193655] 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/193655">193655</a></dd>
<dt>Author</dt> <dd>barraclough@apple.com</dd>
<dt>Date</dt> <dd>2015-12-07 14:52:07 -0800 (Mon, 07 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>UIProcess should determine AppNap state for WebPage
https://bugs.webkit.org/show_bug.cgi?id=151964
Reviewed by Anders Carlson.
Step 1 in unifying this with the iOS process suppression mechanism is to move the decision out of the WebContent process.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::WebPageProxy):
(WebKit::WebPageProxy::dispatchViewStateChange):
(WebKit::WebPageProxy::setPageActivityState):
(WebKit::WebPageProxy::updateActivityToken):
(WebKit::WebPageProxy::preferencesDidChange):
* UIProcess/WebPageProxy.h:
(WebKit::WebPageProxy::isInWindow):
(WebKit::WebPageProxy::didUpdateViewState):
* UIProcess/WebPageProxy.messages.in:
- WebPage now propagates PageActivityState to the WebPageProxy, for use
determining the supression state of the WebProcess.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::m_shouldDispatchFakeMouseMoveEvents):
(WebKit::WebPage::setPageActivityState):
(WebKit::WebPage::setUserActivityStarted):
(WebKit::WebPage::setViewState):
(WebKit::WebPage::updatePreferences):
(WebKit::WebPage::updateUserActivity): Deleted.
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/WebPage.messages.in:
- WebPage no longer determines when to update it's own UserActivity - instead,
let the UI process do so. As such, no longer need to track whether process
supression is enabled. Instead, add message to</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</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>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxymessagesin">trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagemessagesin">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (193654 => 193655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-12-07 22:44:33 UTC (rev 193654)
+++ trunk/Source/WebKit2/ChangeLog 2015-12-07 22:52:07 UTC (rev 193655)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2015-12-05 Gavin Barraclough <barraclough@apple.com>
+
+ UIProcess should determine AppNap state for WebPage
+ https://bugs.webkit.org/show_bug.cgi?id=151964
+
+ Reviewed by Anders Carlson.
+
+ Step 1 in unifying this with the iOS process suppression mechanism is to move the decision out of the WebContent process.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::WebPageProxy):
+ (WebKit::WebPageProxy::dispatchViewStateChange):
+ (WebKit::WebPageProxy::setPageActivityState):
+ (WebKit::WebPageProxy::updateActivityToken):
+ (WebKit::WebPageProxy::preferencesDidChange):
+ * UIProcess/WebPageProxy.h:
+ (WebKit::WebPageProxy::isInWindow):
+ (WebKit::WebPageProxy::didUpdateViewState):
+ * UIProcess/WebPageProxy.messages.in:
+ - WebPage now propagates PageActivityState to the WebPageProxy, for use
+ determining the supression state of the WebProcess.
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::m_shouldDispatchFakeMouseMoveEvents):
+ (WebKit::WebPage::setPageActivityState):
+ (WebKit::WebPage::setUserActivityStarted):
+ (WebKit::WebPage::setViewState):
+ (WebKit::WebPage::updatePreferences):
+ (WebKit::WebPage::updateUserActivity): Deleted.
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+ - WebPage no longer determines when to update it's own UserActivity - instead,
+ let the UI process do so. As such, no longer need to track whether process
+ supression is enabled. Instead, add message to
+
</ins><span class="cx"> 2015-12-07 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK2] Regression(r187691): If a page is showing an auth pane in one tab, any new tabs with same page hang until credentials are entered in first tab
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (193654 => 193655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-12-07 22:44:33 UTC (rev 193654)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-12-07 22:52:07 UTC (rev 193655)
</span><span class="lines">@@ -338,6 +338,8 @@
</span><span class="cx"> , m_notificationPermissionRequestManager(*this)
</span><span class="cx"> , m_userMediaPermissionRequestManager(*this)
</span><span class="cx"> , m_viewState(ViewState::NoFlags)
</span><ins>+ , m_activityState(PageActivityState::NoFlags)
+ , m_userActivityStarted(false)
</ins><span class="cx"> , m_viewWasEverInWindow(false)
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> , m_alwaysRunsAtForegroundPriority(m_configuration->alwaysRunsAtForegroundPriority())
</span><span class="lines">@@ -1448,6 +1450,15 @@
</span><span class="cx"> m_viewWasEverInWindow |= isNowInWindow;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPageProxy::setPageActivityState(PageActivityState::Flags activityState)
+{
+ if (m_activityState == activityState)
+ return;
+
+ m_activityState = activityState;
+ updateActivityToken();
+}
+
</ins><span class="cx"> void WebPageProxy::updateActivityToken()
</span><span class="cx"> {
</span><span class="cx"> if (m_viewState & ViewState::IsVisuallyIdle)
</span><span class="lines">@@ -1455,6 +1466,14 @@
</span><span class="cx"> else if (!m_pageIsUserObservableCount)
</span><span class="cx"> m_pageIsUserObservableCount = m_process->processPool().userObservablePageCount();
</span><span class="cx">
</span><ins>+ // Start the activity to prevent AppNap if the page activity is in progress,
+ // the page is visible and non-idle, or process suppression is disabled.
+ bool shouldHoldUserActivity = m_activityState || !(m_viewState & ViewState::IsVisuallyIdle) || !m_preferences->pageVisibilityBasedProcessSuppressionEnabled();
+ if (m_userActivityStarted != shouldHoldUserActivity) {
+ m_process->send(Messages::WebPage::SetUserActivityStarted(shouldHoldUserActivity), m_pageID);
+ m_userActivityStarted = shouldHoldUserActivity;
+ }
+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> if (!isViewVisible() && !m_alwaysRunsAtForegroundPriority)
</span><span class="cx"> m_activityToken = nullptr;
</span><span class="lines">@@ -2732,6 +2751,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> updateProccessSuppressionState();
</span><ins>+ updateActivityToken();
</ins><span class="cx">
</span><span class="cx"> m_pageClient.preferencesDidChange();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (193654 => 193655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-12-07 22:44:33 UTC (rev 193654)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-12-07 22:52:07 UTC (rev 193655)
</span><span class="lines">@@ -420,6 +420,7 @@
</span><span class="cx"> bool isInWindow() const { return m_viewState & WebCore::ViewState::IsInWindow; }
</span><span class="cx"> void waitForDidUpdateViewState();
</span><span class="cx"> void didUpdateViewState() { m_waitingForDidUpdateViewState = false; }
</span><ins>+ void setPageActivityState(WebCore::PageActivityState::Flags);
</ins><span class="cx">
</span><span class="cx"> void layerHostingModeDidChange();
</span><span class="cx">
</span><span class="lines">@@ -1556,6 +1557,8 @@
</span><span class="cx"> UserMediaPermissionRequestManagerProxy m_userMediaPermissionRequestManager;
</span><span class="cx">
</span><span class="cx"> WebCore::ViewState::Flags m_viewState;
</span><ins>+ WebCore::PageActivityState::Flags m_activityState;
+ bool m_userActivityStarted;
</ins><span class="cx"> bool m_viewWasEverInWindow;
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> bool m_allowsMediaDocumentInlinePlayback { false };
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (193654 => 193655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2015-12-07 22:44:33 UTC (rev 193654)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2015-12-07 22:52:07 UTC (rev 193655)
</span><span class="lines">@@ -447,4 +447,6 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> DidRestoreScrollPosition()
</span><ins>+
+ SetPageActivityState(unsigned activityState)
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (193654 => 193655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-12-07 22:44:33 UTC (rev 193654)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-12-07 22:52:07 UTC (rev 193655)
</span><span class="lines">@@ -341,7 +341,7 @@
</span><span class="cx"> , m_scrollPinningBehavior(DoNotPin)
</span><span class="cx"> , m_useAsyncScrolling(false)
</span><span class="cx"> , m_viewState(parameters.viewState)
</span><del>- , m_processSuppressionEnabled(true)
</del><ins>+ , m_activityState(PageActivityState::NoFlags)
</ins><span class="cx"> , m_userActivity("Process suppression disabled for page.")
</span><span class="cx"> , m_pendingNavigationID(0)
</span><span class="cx"> #if ENABLE(WEBGL)
</span><span class="lines">@@ -448,7 +448,6 @@
</span><span class="cx"> m_page->setViewState(m_viewState);
</span><span class="cx"> if (!isVisible())
</span><span class="cx"> m_page->setIsPrerender();
</span><del>- updateUserActivity();
</del><span class="cx">
</span><span class="cx"> updateIsInWindow(true);
</span><span class="cx">
</span><span class="lines">@@ -534,18 +533,16 @@
</span><span class="cx">
</span><span class="cx"> void WebPage::setPageActivityState(PageActivityState::Flags activityState)
</span><span class="cx"> {
</span><del>- PageActivityState::Flags changed = m_activityState ^ activityState;
- m_activityState = activityState;
</del><ins>+ if (m_activityState == activityState)
+ return;
</ins><span class="cx">
</span><del>- if (changed)
- updateUserActivity();
</del><ins>+ m_activityState = activityState;
+ send(Messages::WebPageProxy::SetPageActivityState(activityState));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPage::updateUserActivity()
</del><ins>+void WebPage::setUserActivityStarted(bool started)
</ins><span class="cx"> {
</span><del>- // Start the activity to prevent AppNap if the page activity is in progress,
- // the page is visible and non-idle, or process suppression is disabled.
- if (m_activityState || !(m_viewState & ViewState::IsVisuallyIdle) || !m_processSuppressionEnabled)
</del><ins>+ if (started)
</ins><span class="cx"> m_userActivity.start();
</span><span class="cx"> else
</span><span class="cx"> m_userActivity.stop();
</span><span class="lines">@@ -2371,9 +2368,6 @@
</span><span class="cx"> ViewState::Flags changed = m_viewState ^ viewState;
</span><span class="cx"> m_viewState = viewState;
</span><span class="cx">
</span><del>- if (changed)
- updateUserActivity();
-
</del><span class="cx"> m_page->setViewState(viewState);
</span><span class="cx"> for (auto* pluginView : m_pluginViews)
</span><span class="cx"> pluginView->viewStateDidChange(changed);
</span><span class="lines">@@ -2931,12 +2925,6 @@
</span><span class="cx"> settings.setServiceControlsEnabled(store.getBoolValueForKey(WebPreferencesKey::serviceControlsEnabledKey()));
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- bool processSuppressionEnabled = store.getBoolValueForKey(WebPreferencesKey::pageVisibilityBasedProcessSuppressionEnabledKey());
- if (m_processSuppressionEnabled != processSuppressionEnabled) {
- m_processSuppressionEnabled = processSuppressionEnabled;
- updateUserActivity();
- }
-
</del><span class="cx"> platformPreferencesDidChange(store);
</span><span class="cx">
</span><span class="cx"> if (m_drawingArea)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (193654 => 193655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-12-07 22:44:33 UTC (rev 193654)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-12-07 22:52:07 UTC (rev 193655)
</span><span class="lines">@@ -991,7 +991,7 @@
</span><span class="cx"> void executeEditCommand(const String&, const String&);
</span><span class="cx"> void setEditable(bool);
</span><span class="cx">
</span><del>- void updateUserActivity();
</del><ins>+ void setUserActivityStarted(bool);
</ins><span class="cx">
</span><span class="cx"> void mouseEvent(const WebMouseEvent&);
</span><span class="cx"> void keyEvent(const WebKeyboardEvent&);
</span><span class="lines">@@ -1394,7 +1394,6 @@
</span><span class="cx"> WebCore::ViewState::Flags m_viewState;
</span><span class="cx"> WebCore::PageActivityState::Flags m_activityState;
</span><span class="cx">
</span><del>- bool m_processSuppressionEnabled;
</del><span class="cx"> UserActivity m_userActivity;
</span><span class="cx">
</span><span class="cx"> uint64_t m_pendingNavigationID;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (193654 => 193655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-12-07 22:44:33 UTC (rev 193654)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-12-07 22:52:07 UTC (rev 193655)
</span><span class="lines">@@ -23,6 +23,7 @@
</span><span class="cx"> messages -> WebPage LegacyReceiver {
</span><span class="cx"> SetInitialFocus(bool forward, bool isKeyboardEventValid, WebKit::WebKeyboardEvent event, uint64_t callbackID)
</span><span class="cx"> SetViewState(unsigned viewState, bool wantsDidUpdateViewState, Vector<uint64_t> callbackIDs)
</span><ins>+ SetUserActivityStarted(bool started)
</ins><span class="cx"> SetLayerHostingMode(unsigned layerHostingMode)
</span><span class="cx">
</span><span class="cx"> SetSessionID(WebCore::SessionID sessionID)
</span></span></pre>
</div>
</div>
</body>
</html>