<!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>[197480] 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/197480">197480</a></dd>
<dt>Author</dt> <dd>barraclough@apple.com</dd>
<dt>Date</dt> <dd>2016-03-02 17:19:51 -0800 (Wed, 02 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>PageThrottler should apply hysteresis to media activity
https://bugs.webkit.org/show_bug.cgi?id=154940
Reviewed by Ryosuke Niwa.
Currently PageThrottler keeps a track of audible plugin activity and HTML media element
activity separately. Audible plugin activity also gets an extra 5s hysteresis applied,
so that after audio playback has completed there is a chance to queue up more audio
before timer throttling kicks in. HTML audio does not get this grace. Funnel both
together into a single activity flag, such that the hysteresis is applied to both.
* page/PageThrottler.cpp:
(WebCore::PageThrottler::PageThrottler):
(WebCore::m_mediaActivityHysteresis):
- PageActivityState::AudiblePlugin -> PageActivityState::MediaActivity.
(WebCore::m_mediaActivityCounter):
- when m_mediaActivityCounter value changes call mediaActivityCounterChanged().
(WebCore::PageThrottler::mediaActivityCounterChanged):
- Drive PageActivityState::MediaActivity indirectly via m_mediaActivityHysteresis,
such that a 5s hysteresis is applied.
* page/PageThrottler.h:
- Removed AudiblePlugin (merged in with MediaActivity).
(WebCore::PageThrottler::pluginDidEvaluateWhileAudioIsPlaying):
- m_audiblePluginHysteresis.impulse -> m_mediaActivityHysteresis.impulse.</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 (197479 => 197480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-03 00:34:59 UTC (rev 197479)
+++ trunk/Source/WebCore/ChangeLog 2016-03-03 01:19:51 UTC (rev 197480)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2016-03-02 Gavin Barraclough <barraclough@apple.com>
+
+ PageThrottler should apply hysteresis to media activity
+ https://bugs.webkit.org/show_bug.cgi?id=154940
+
+ Reviewed by Ryosuke Niwa.
+
+ Currently PageThrottler keeps a track of audible plugin activity and HTML media element
+ activity separately. Audible plugin activity also gets an extra 5s hysteresis applied,
+ so that after audio playback has completed there is a chance to queue up more audio
+ before timer throttling kicks in. HTML audio does not get this grace. Funnel both
+ together into a single activity flag, such that the hysteresis is applied to both.
+
+ * page/PageThrottler.cpp:
+ (WebCore::PageThrottler::PageThrottler):
+ (WebCore::m_mediaActivityHysteresis):
+ - PageActivityState::AudiblePlugin -> PageActivityState::MediaActivity.
+ (WebCore::m_mediaActivityCounter):
+ - when m_mediaActivityCounter value changes call mediaActivityCounterChanged().
+ (WebCore::PageThrottler::mediaActivityCounterChanged):
+ - Drive PageActivityState::MediaActivity indirectly via m_mediaActivityHysteresis,
+ such that a 5s hysteresis is applied.
+ * page/PageThrottler.h:
+ - Removed AudiblePlugin (merged in with MediaActivity).
+ (WebCore::PageThrottler::pluginDidEvaluateWhileAudioIsPlaying):
+ - m_audiblePluginHysteresis.impulse -> m_mediaActivityHysteresis.impulse.
+
</ins><span class="cx"> 2016-03-01 Ada Chan <adachan@apple.com>
</span><span class="cx">
</span><span class="cx"> Update the media element's presentation mode properly after going in and out of full screen via the Full Screen API
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageThrottlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageThrottler.cpp (197479 => 197480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageThrottler.cpp 2016-03-03 00:34:59 UTC (rev 197479)
+++ trunk/Source/WebCore/page/PageThrottler.cpp 2016-03-03 01:19:51 UTC (rev 197480)
</span><span class="lines">@@ -33,8 +33,8 @@
</span><span class="cx"> PageThrottler::PageThrottler(Page& page)
</span><span class="cx"> : m_page(page)
</span><span class="cx"> , m_userInputHysteresis([this](HysteresisState state) { setActivityFlag(PageActivityState::UserInputActivity, state == HysteresisState::Started); })
</span><del>- , m_audiblePluginHysteresis([this](HysteresisState state) { setActivityFlag(PageActivityState::AudiblePlugin, state == HysteresisState::Started); })
- , m_mediaActivityCounter([this](RefCounterEvent) { setActivityFlag(PageActivityState::MediaActivity, m_mediaActivityCounter.value()); })
</del><ins>+ , m_mediaActivityHysteresis([this](HysteresisState state) { setActivityFlag(PageActivityState::MediaActivity, state == HysteresisState::Started); })
+ , m_mediaActivityCounter([this](RefCounterEvent) { mediaActivityCounterChanged(); })
</ins><span class="cx"> , m_pageLoadActivityCounter([this](RefCounterEvent) { setActivityFlag(PageActivityState::PageLoadActivity, m_pageLoadActivityCounter.value()); })
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -49,6 +49,14 @@
</span><span class="cx"> return m_pageLoadActivityCounter.count();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void PageThrottler::mediaActivityCounterChanged()
+{
+ if (m_mediaActivityCounter.value())
+ m_mediaActivityHysteresis.start();
+ else
+ m_mediaActivityHysteresis.stop();
+}
+
</ins><span class="cx"> void PageThrottler::setActivityFlag(PageActivityState::Flags flag, bool value)
</span><span class="cx"> {
</span><span class="cx"> PageActivityState::Flags activityState = m_activityState;
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageThrottlerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageThrottler.h (197479 => 197480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageThrottler.h 2016-03-03 00:34:59 UTC (rev 197479)
+++ trunk/Source/WebCore/page/PageThrottler.h 2016-03-03 01:19:51 UTC (rev 197480)
</span><span class="lines">@@ -43,15 +43,14 @@
</span><span class="cx"> struct PageActivityState {
</span><span class="cx"> enum {
</span><span class="cx"> UserInputActivity = 1 << 0,
</span><del>- AudiblePlugin = 1 << 1,
- MediaActivity = 1 << 2,
- PageLoadActivity = 1 << 3,
</del><ins>+ MediaActivity = 1 << 1,
+ PageLoadActivity = 1 << 2,
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> typedef unsigned Flags;
</span><span class="cx">
</span><span class="cx"> static const Flags NoFlags = 0;
</span><del>- static const Flags AllFlags = UserInputActivity | AudiblePlugin | MediaActivity | PageLoadActivity;
</del><ins>+ static const Flags AllFlags = UserInputActivity | MediaActivity | PageLoadActivity;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class PageThrottler {
</span><span class="lines">@@ -61,17 +60,18 @@
</span><span class="cx">
</span><span class="cx"> void didReceiveUserInput() { m_userInputHysteresis.impulse(); }
</span><span class="cx"> PageActivityState::Flags activityState() { return m_activityState; }
</span><del>- void pluginDidEvaluateWhileAudioIsPlaying() { m_audiblePluginHysteresis.impulse(); }
</del><ins>+ void pluginDidEvaluateWhileAudioIsPlaying() { m_mediaActivityHysteresis.impulse(); }
</ins><span class="cx"> PageActivityAssertionToken mediaActivityToken();
</span><span class="cx"> PageActivityAssertionToken pageLoadActivityToken();
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ void mediaActivityCounterChanged();
</ins><span class="cx"> void setActivityFlag(PageActivityState::Flags, bool);
</span><span class="cx">
</span><span class="cx"> Page& m_page;
</span><span class="cx"> PageActivityState::Flags m_activityState { PageActivityState::NoFlags };
</span><span class="cx"> HysteresisActivity m_userInputHysteresis;
</span><del>- HysteresisActivity m_audiblePluginHysteresis;
</del><ins>+ HysteresisActivity m_mediaActivityHysteresis;
</ins><span class="cx"> PageActivityCounter m_mediaActivityCounter;
</span><span class="cx"> PageActivityCounter m_pageLoadActivityCounter;
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>