<!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>[177378] trunk/Source/WebCore</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/177378">177378</a></dd>
<dt>Author</dt> <dd>barraclough@apple.com</dd>
<dt>Date</dt> <dd>2014-12-16 11:50:36 -0800 (Tue, 16 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Introduce PageActivityState
https://bugs.webkit.org/show_bug.cgi?id=139687
Reviewed by Anders Carlsson.
Add a bitfield to track each of the activities on the page separately.
Split the hysteresis & counters so we can track these separately.
* page/PageThrottler.cpp:
(WebCore::PageThrottler::PageThrottler):
- initialze new hysteresis, counters; closures call setActivityFlag.
(WebCore::PageThrottler::mediaActivityToken):
(WebCore::PageThrottler::pageLoadActivityToken):
- split m_pageActivityCounter -> m_mediaActivityCounter, m_pageLoadActivityCounter.
(WebCore::PageThrottler::updateUserActivity):
- use m_activityState to check for activity.
(WebCore::PageThrottler::setActivityFlag):
- helper to clear/set a bit in m_activityState, and call updateUserActivity as necessary.
* page/PageThrottler.h:
(WebCore::PageThrottler::didReceiveUserInput):
(WebCore::PageThrottler::pluginDidEvaluateWhileAudioIsPlaying):
- split m_hysteresis -> m_userInputHysteresis, m_audiblePluginHysteresis</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagePageThrottlercpp">trunk/Source/WebCore/page/PageThrottler.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageThrottlerh">trunk/Source/WebCore/page/PageThrottler.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177377 => 177378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-16 19:28:57 UTC (rev 177377)
+++ trunk/Source/WebCore/ChangeLog 2014-12-16 19:50:36 UTC (rev 177378)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-12-16 Gavin Barraclough <barraclough@apple.com>
+
+ Introduce PageActivityState
+ https://bugs.webkit.org/show_bug.cgi?id=139687
+
+ Reviewed by Anders Carlsson.
+
+ Add a bitfield to track each of the activities on the page separately.
+ Split the hysteresis & counters so we can track these separately.
+
+ * page/PageThrottler.cpp:
+ (WebCore::PageThrottler::PageThrottler):
+ - initialze new hysteresis, counters; closures call setActivityFlag.
+ (WebCore::PageThrottler::mediaActivityToken):
+ (WebCore::PageThrottler::pageLoadActivityToken):
+ - split m_pageActivityCounter -> m_mediaActivityCounter, m_pageLoadActivityCounter.
+ (WebCore::PageThrottler::updateUserActivity):
+ - use m_activityState to check for activity.
+ (WebCore::PageThrottler::setActivityFlag):
+ - helper to clear/set a bit in m_activityState, and call updateUserActivity as necessary.
+ * page/PageThrottler.h:
+ (WebCore::PageThrottler::didReceiveUserInput):
+ (WebCore::PageThrottler::pluginDidEvaluateWhileAudioIsPlaying):
+ - split m_hysteresis -> m_userInputHysteresis, m_audiblePluginHysteresis
+
</ins><span class="cx"> 2014-12-16 Myles C. Maxfield <litherum@gmail.com>
</span><span class="cx">
</span><span class="cx"> Ruby does not preserve expansion opportunities from enclosing context
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageThrottlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageThrottler.cpp (177377 => 177378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageThrottler.cpp 2014-12-16 19:28:57 UTC (rev 177377)
+++ trunk/Source/WebCore/page/PageThrottler.cpp 2014-12-16 19:50:36 UTC (rev 177378)
</span><span class="lines">@@ -30,8 +30,10 @@
</span><span class="cx">
</span><span class="cx"> PageThrottler::PageThrottler(ViewState::Flags viewState)
</span><span class="cx"> : m_viewState(viewState)
</span><del>- , m_hysteresis([this](HysteresisState) { updateUserActivity(); })
- , m_pageActivityCounter([this]() { updateUserActivity(); })
</del><ins>+ , m_userInputHysteresis([this](HysteresisState state) { setActivityFlag(PageActivityState::UserInputActivity, state == HysteresisState::Started); })
+ , m_audiblePluginHysteresis([this](HysteresisState state) { setActivityFlag(PageActivityState::AudiblePlugin, state == HysteresisState::Started); })
+ , m_mediaActivityCounter([this]() { setActivityFlag(PageActivityState::MediaActivity, m_mediaActivityCounter.value()); })
+ , m_pageLoadActivityCounter([this]() { setActivityFlag(PageActivityState::PageLoadActivity, m_pageLoadActivityCounter.value()); })
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -44,12 +46,12 @@
</span><span class="cx">
</span><span class="cx"> PageActivityAssertionToken PageThrottler::mediaActivityToken()
</span><span class="cx"> {
</span><del>- return m_pageActivityCounter.count();
</del><ins>+ return m_mediaActivityCounter.count();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PageActivityAssertionToken PageThrottler::pageLoadActivityToken()
</span><span class="cx"> {
</span><del>- return m_pageActivityCounter.count();
</del><ins>+ return m_pageLoadActivityCounter.count();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageThrottler::updateUserActivity()
</span><span class="lines">@@ -58,12 +60,27 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Allow throttling if there is no page activity, and the page is visually idle.
</span><del>- if (!m_pageActivityCounter.value() && m_hysteresis.state() == HysteresisState::Stopped && m_viewState & ViewState::IsVisuallyIdle)
</del><ins>+ if (!m_activityState && m_viewState & ViewState::IsVisuallyIdle)
</ins><span class="cx"> m_activity->stop();
</span><span class="cx"> else
</span><span class="cx"> m_activity->start();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void PageThrottler::setActivityFlag(PageActivityState::Flags flag, bool value)
+{
+ PageActivityState::Flags activityState = m_activityState;
+ if (value)
+ activityState |= flag;
+ else
+ activityState &= ~flag;
+
+ if (m_activityState == activityState)
+ return;
+ m_activityState = activityState;
+
+ updateUserActivity();
+}
+
</ins><span class="cx"> void PageThrottler::setViewState(ViewState::Flags viewState)
</span><span class="cx"> {
</span><span class="cx"> ViewState::Flags changed = m_viewState ^ viewState;
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageThrottlerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageThrottler.h (177377 => 177378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageThrottler.h 2014-12-16 19:28:57 UTC (rev 177377)
+++ trunk/Source/WebCore/page/PageThrottler.h 2014-12-16 19:50:36 UTC (rev 177378)
</span><span class="lines">@@ -36,6 +36,20 @@
</span><span class="cx">
</span><span class="cx"> typedef RefPtr<RefCounter::Count> PageActivityAssertionToken;
</span><span class="cx">
</span><ins>+struct PageActivityState {
+ enum {
+ UserInputActivity = 1 << 0,
+ AudiblePlugin = 1 << 1,
+ MediaActivity = 1 << 2,
+ PageLoadActivity = 1 << 3,
+ };
+
+ typedef unsigned Flags;
+
+ static const Flags NoFlags = 0;
+ static const Flags AllFlags = UserInputActivity | AudiblePlugin | MediaActivity | PageLoadActivity;
+};
+
</ins><span class="cx"> class PageThrottler {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><span class="lines">@@ -44,18 +58,22 @@
</span><span class="cx"> void createUserActivity();
</span><span class="cx"> void setViewState(ViewState::Flags);
</span><span class="cx">
</span><del>- void didReceiveUserInput() { m_hysteresis.impulse(); }
- void pluginDidEvaluateWhileAudioIsPlaying() { m_hysteresis.impulse(); }
</del><ins>+ void didReceiveUserInput() { m_userInputHysteresis.impulse(); }
+ void pluginDidEvaluateWhileAudioIsPlaying() { m_audiblePluginHysteresis.impulse(); }
</ins><span class="cx"> PageActivityAssertionToken mediaActivityToken();
</span><span class="cx"> PageActivityAssertionToken pageLoadActivityToken();
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void updateUserActivity();
</span><ins>+ void setActivityFlag(PageActivityState::Flags, bool);
</ins><span class="cx">
</span><span class="cx"> ViewState::Flags m_viewState;
</span><del>- HysteresisActivity m_hysteresis;
</del><ins>+ PageActivityState::Flags m_activityState { PageActivityState::NoFlags };
+ HysteresisActivity m_userInputHysteresis;
+ HysteresisActivity m_audiblePluginHysteresis;
+ RefCounter m_mediaActivityCounter;
+ RefCounter m_pageLoadActivityCounter;
</ins><span class="cx"> std::unique_ptr<UserActivity> m_activity;
</span><del>- RefCounter m_pageActivityCounter;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>