<!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>[177385] 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/177385">177385</a></dd>
<dt>Author</dt> <dd>barraclough@apple.com</dd>
<dt>Date</dt> <dd>2014-12-16 12:45:03 -0800 (Tue, 16 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Split UserActivity from disabled flag in WebPage
https://bugs.webkit.org/show_bug.cgi?id=139696
Reviewed by Geoffrey Garen.
In preparation for other things driving the UserActivity.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::WebPage):
- initialize new members.
(WebKit::WebPage::updateUserActivity):
- start/stop the m_userActivity, based on m_processSupressionEnabled
(WebKit::WebPage::updatePreferences):
- call updateUserActivity to account for m_processSupressionEnabled changes.
* WebProcess/WebPage/WebPage.h:
- split m_processSuppressionDisabledByWebPreference -> m_processSupressionEnabled, m_userActivity.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (177384 => 177385)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2014-12-16 20:36:41 UTC (rev 177384)
+++ trunk/Source/WebKit2/ChangeLog        2014-12-16 20:45:03 UTC (rev 177385)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-12-16 Gavin Barraclough <barraclough@apple.com>
+
+ Split UserActivity from disabled flag in WebPage
+ https://bugs.webkit.org/show_bug.cgi?id=139696
+
+ Reviewed by Geoffrey Garen.
+
+ In preparation for other things driving the UserActivity.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::WebPage):
+ - initialize new members.
+ (WebKit::WebPage::updateUserActivity):
+ - start/stop the m_userActivity, based on m_processSupressionEnabled
+ (WebKit::WebPage::updatePreferences):
+ - call updateUserActivity to account for m_processSupressionEnabled changes.
+ * WebProcess/WebPage/WebPage.h:
+ - split m_processSuppressionDisabledByWebPreference -> m_processSupressionEnabled, m_userActivity.
+
</ins><span class="cx"> 2014-12-16 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Get rid of PassRefPtr inside StorageManager
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (177384 => 177385)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp        2014-12-16 20:36:41 UTC (rev 177384)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp        2014-12-16 20:45:03 UTC (rev 177385)
</span><span class="lines">@@ -329,7 +329,8 @@
</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_processSuppressionDisabledByWebPreference("Process suppression is disabled.")
</del><ins>+ , m_processSuppressionEnabled(true)
+ , m_userActivity("Process suppression disabled for page.")
</ins><span class="cx"> , m_pendingNavigationID(0)
</span><span class="cx"> #if ENABLE(WEBGL)
</span><span class="cx"> , m_systemWebGLPolicy(WebGLAllowCreation)
</span><span class="lines">@@ -511,6 +512,15 @@
</span><span class="cx"> setLayerHostingMode(static_cast<unsigned>(parameters.layerHostingMode));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPage::updateUserActivity()
+{
+ // If process suppression is disabled, then start the activity to prevent AppNap.
+ if (!m_processSuppressionEnabled)
+ m_userActivity.start();
+ else
+ m_userActivity.stop();
+}
+
</ins><span class="cx"> WebPage::~WebPage()
</span><span class="cx"> {
</span><span class="cx"> if (m_backForwardList)
</span><span class="lines">@@ -2878,10 +2888,8 @@
</span><span class="cx"> settings.setServiceControlsEnabled(store.getBoolValueForKey(WebPreferencesKey::serviceControlsEnabledKey()));
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- if (store.getBoolValueForKey(WebPreferencesKey::pageVisibilityBasedProcessSuppressionEnabledKey()))
- m_processSuppressionDisabledByWebPreference.stop();
- else
- m_processSuppressionDisabledByWebPreference.start();
</del><ins>+ m_processSuppressionEnabled = store.getBoolValueForKey(WebPreferencesKey::pageVisibilityBasedProcessSuppressionEnabledKey());
+ updateUserActivity();
</ins><span class="cx">
</span><span class="cx"> platformPreferencesDidChange(store);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (177384 => 177385)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h        2014-12-16 20:36:41 UTC (rev 177384)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h        2014-12-16 20:45:03 UTC (rev 177385)
</span><span class="lines">@@ -931,6 +931,8 @@
</span><span class="cx"> void validateCommand(const String&, uint64_t);
</span><span class="cx"> void executeEditCommand(const String&);
</span><span class="cx">
</span><ins>+ void updateUserActivity();
+
</ins><span class="cx"> void mouseEvent(const WebMouseEvent&);
</span><span class="cx"> void mouseEventSyncForTesting(const WebMouseEvent&, bool&);
</span><span class="cx"> void wheelEventSyncForTesting(const WebWheelEvent&, bool&);
</span><span class="lines">@@ -1314,7 +1316,8 @@
</span><span class="cx">
</span><span class="cx"> WebCore::ViewState::Flags m_viewState;
</span><span class="cx">
</span><del>- UserActivity m_processSuppressionDisabledByWebPreference;
</del><ins>+ bool m_processSuppressionEnabled;
+ UserActivity m_userActivity;
</ins><span class="cx">
</span><span class="cx"> uint64_t m_pendingNavigationID;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>