<!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>[208237] trunk/Source</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/208237">208237</a></dd>
<dt>Author</dt> <dd>barraclough@apple.com</dd>
<dt>Date</dt> <dd>2016-11-01 13:38:39 -0700 (Tue, 01 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add IsAudible, IsLoading to ActivityState
https://bugs.webkit.org/show_bug.cgi?id=164286
Reviewed by Geoff Garen.
By computing these values in the UIProcess and passing them to WebContent we can
more closely unify iOS & macOS throttling, and remove the PageThrottler class.
Source/WebCore:
* page/ActivityState.h:
- added IsAudible, IsLoading
Source/WebKit2:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::updateActivityState):
- Added update for IsAudible, IsLoading flags.
(WebKit::WebPageProxy::updateThrottleState):
- Read IsAudible, IsLoading flags from ActivityState.
(WebKit::WebPageProxy::setMuted):
- call activityStateDidChange to trigger update.
(WebKit::WebPageProxy::isPlayingMediaDidChange):
- call activityStateDidChange to trigger update.
* UIProcess/WebPageProxy.h:
(WebKit::WebPageProxy::isLoadingChanged):
- call activityStateDidChange to trigger update.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageActivityStateh">trunk/Source/WebCore/page/ActivityState.h</a></li>
<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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208236 => 208237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-01 20:37:48 UTC (rev 208236)
+++ trunk/Source/WebCore/ChangeLog 2016-11-01 20:38:39 UTC (rev 208237)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-11-01 Gavin Barraclough <barraclough@apple.com>
+
+ Add IsAudible, IsLoading to ActivityState
+ https://bugs.webkit.org/show_bug.cgi?id=164286
+
+ Reviewed by Geoff Garen.
+
+ By computing these values in the UIProcess and passing them to WebContent we can
+ more closely unify iOS & macOS throttling, and remove the PageThrottler class.
+
+ * page/ActivityState.h:
+ - added IsAudible, IsLoading
+
</ins><span class="cx"> 2016-10-31 Gavin Barraclough <barraclough@apple.com>
</span><span class="cx">
</span><span class="cx"> Rename ViewState to ActivityState
</span></span></pre></div>
<a id="trunkSourceWebCorepageActivityStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ActivityState.h (208236 => 208237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ActivityState.h 2016-11-01 20:37:48 UTC (rev 208236)
+++ trunk/Source/WebCore/page/ActivityState.h 2016-11-01 20:38:39 UTC (rev 208237)
</span><span class="lines">@@ -35,12 +35,14 @@
</span><span class="cx"> IsVisibleOrOccluded = 1 << 3,
</span><span class="cx"> IsInWindow = 1 << 4,
</span><span class="cx"> IsVisuallyIdle = 1 << 5,
</span><ins>+ IsAudible = 1 << 6,
+ IsLoading = 1 << 7,
</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 = WindowIsActive | IsFocused | IsVisible | IsVisibleOrOccluded | IsInWindow | IsVisuallyIdle;
</del><ins>+ static const Flags AllFlags = WindowIsActive | IsFocused | IsVisible | IsVisibleOrOccluded | IsInWindow | IsVisuallyIdle | IsAudible | IsLoading;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (208236 => 208237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-11-01 20:37:48 UTC (rev 208236)
+++ trunk/Source/WebKit2/ChangeLog 2016-11-01 20:38:39 UTC (rev 208237)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-11-01 Gavin Barraclough <barraclough@apple.com>
+
+ Add IsAudible, IsLoading to ActivityState
+ https://bugs.webkit.org/show_bug.cgi?id=164286
+
+ Reviewed by Geoff Garen.
+
+ By computing these values in the UIProcess and passing them to WebContent we can
+ more closely unify iOS & macOS throttling, and remove the PageThrottler class.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::updateActivityState):
+ - Added update for IsAudible, IsLoading flags.
+ (WebKit::WebPageProxy::updateThrottleState):
+ - Read IsAudible, IsLoading flags from ActivityState.
+ (WebKit::WebPageProxy::setMuted):
+ - call activityStateDidChange to trigger update.
+ (WebKit::WebPageProxy::isPlayingMediaDidChange):
+ - call activityStateDidChange to trigger update.
+ * UIProcess/WebPageProxy.h:
+ (WebKit::WebPageProxy::isLoadingChanged):
+ - call activityStateDidChange to trigger update.
+
</ins><span class="cx"> 2016-10-31 Gavin Barraclough <barraclough@apple.com>
</span><span class="cx">
</span><span class="cx"> Rename ViewState to ActivityState
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (208236 => 208237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-11-01 20:37:48 UTC (rev 208236)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-11-01 20:38:39 UTC (rev 208237)
</span><span class="lines">@@ -1464,6 +1464,10 @@
</span><span class="cx"> m_activityState |= ActivityState::IsInWindow;
</span><span class="cx"> if (flagsToUpdate & ActivityState::IsVisuallyIdle && m_pageClient.isVisuallyIdle())
</span><span class="cx"> m_activityState |= ActivityState::IsVisuallyIdle;
</span><ins>+ if (flagsToUpdate & ActivityState::IsAudible && m_mediaState & MediaProducer::IsPlayingAudio && !(m_mutedState & MediaProducer::AudioIsMuted))
+ m_activityState |= ActivityState::IsAudible;
+ if (flagsToUpdate & ActivityState::IsLoading && m_pageLoadState.isLoading())
+ m_activityState |= ActivityState::IsLoading;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::activityStateDidChange(ActivityState::Flags mayHaveChanged, bool wantsSynchronousReply, ActivityStateChangeDispatchMode dispatchMode)
</span><span class="lines">@@ -1590,8 +1594,8 @@
</span><span class="cx"> m_preventProcessSuppressionCount = nullptr;
</span><span class="cx">
</span><span class="cx"> // We should suppress if the page is not active, is visually idle, and supression is enabled.
</span><del>- bool isLoading = m_pageLoadState.isLoading();
- bool isPlayingAudio = m_mediaState & MediaProducer::IsPlayingAudio && !(m_mutedState & MediaProducer::AudioIsMuted);
</del><ins>+ bool isLoading = m_activityState & ActivityState::IsLoading;
+ bool isPlayingAudio = m_activityState & ActivityState::IsAudible;
</ins><span class="cx"> bool pageShouldBeSuppressed = !isLoading && !isPlayingAudio && processSuppressionEnabled && (m_activityState & ActivityState::IsVisuallyIdle);
</span><span class="cx"> if (m_pageSuppressed != pageShouldBeSuppressed) {
</span><span class="cx"> m_pageSuppressed = pageShouldBeSuppressed;
</span><span class="lines">@@ -4167,7 +4171,7 @@
</span><span class="cx">
</span><span class="cx"> m_process->send(Messages::WebPage::SetMuted(state), m_pageID);
</span><span class="cx">
</span><del>- updateThrottleState();
</del><ins>+ activityStateDidChange(ActivityState::IsAudible);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_SESSION)
</span><span class="lines">@@ -6359,7 +6363,7 @@
</span><span class="cx"> MediaProducer::MediaStateFlags oldState = m_mediaState;
</span><span class="cx"> m_mediaState = state;
</span><span class="cx">
</span><del>- updateThrottleState();
</del><ins>+ activityStateDidChange(ActivityState::IsAudible);
</ins><span class="cx">
</span><span class="cx"> playingMediaMask |= MediaProducer::HasActiveMediaCaptureDevice;
</span><span class="cx"> if ((oldState & playingMediaMask) != (m_mediaState & playingMediaMask))
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (208236 => 208237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2016-11-01 20:37:48 UTC (rev 208236)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2016-11-01 20:38:39 UTC (rev 208237)
</span><span class="lines">@@ -1142,7 +1142,7 @@
</span><span class="cx">
</span><span class="cx"> WeakPtr<WebPageProxy> createWeakPtr() const { return m_weakPtrFactory.createWeakPtr(); }
</span><span class="cx">
</span><del>- void isLoadingChanged() { updateThrottleState(); }
</del><ins>+ void isLoadingChanged() { activityStateDidChange(WebCore::ActivityState::IsLoading); }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> WebPageProxy(PageClient&, WebProcessProxy&, uint64_t pageID, Ref<API::PageConfiguration>&&);
</span></span></pre>
</div>
</div>
</body>
</html>