<!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>[163591] 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/163591">163591</a></dd>
<dt>Author</dt> <dd>barraclough@apple.com</dd>
<dt>Date</dt> <dd>2014-02-06 17:57:37 -0800 (Thu, 06 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove ChildProcess::m_activeTasks
https://bugs.webkit.org/show_bug.cgi?id=128342
Reviewed by Anders Carlson.
Currently we funnel a number of different user activities
to a single UserActivity object, which requires a call down
from WebCore to WebKit2. Split these out so we can track
them separately.
Source/WebCore:
* page/ChromeClient.h:
- removed [inc|dec]rementActivePageCount
* page/PageThrottler.cpp:
(WebCore::PageThrottler::PageThrottler):
- incrementActivePageCount -> beginActivity
(WebCore::PageThrottler::~PageThrottler):
- decrementActivePageCount -> endActivity
(WebCore::PageThrottler::throttlePage):
- decrementActivePageCount -> endActivity
(WebCore::PageThrottler::unthrottlePage):
- incrementActivePageCount -> beginActivity
* page/PageThrottler.h:
- Added m_pageActivity.
Source/WebKit2:
* PluginProcess/PluginProcess.cpp:
(WebKit::PluginProcess::PluginProcess):
- added m_connectionActivity.
* PluginProcess/PluginProcess.h:
(WebKit::PluginProcess::connectionActivity):
- added m_connectionActivity.
* PluginProcess/WebProcessConnection.cpp:
(WebKit::WebProcessConnection::didReceiveSyncMessage):
(WebKit::WebProcessConnection::destroyPlugin):
(WebKit::WebProcessConnection::createPlugin):
- use connectionActivity
* PluginProcess/mac/PluginProcessMac.mm:
(WebKit::PluginProcess::platformInitializeProcess):
- use a separate UserActivity for Java.
* Shared/ActivityAssertion.cpp:
(WebKit::ActivityAssertion::ActivityAssertion):
(WebKit::ActivityAssertion::~ActivityAssertion):
* Shared/ActivityAssertion.h:
- ChildProcess -> UserActivity
* Shared/ChildProcess.cpp:
(WebKit::ChildProcess::ChildProcess):
* Shared/ChildProcess.h:
- remove m_activeTasks.
(WebKit::ChildProcess::processSuppressionEnabled):
* WebProcess/WebCoreSupport/WebChromeClient.cpp:
* WebProcess/WebCoreSupport/WebChromeClient.h:
- removed [inc|dec]rementActivePageCount</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageChromeClienth">trunk/Source/WebCore/page/ChromeClient.h</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>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PluginProcessPluginProcesscpp">trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2PluginProcessPluginProcessh">trunk/Source/WebKit2/PluginProcess/PluginProcess.h</a></li>
<li><a href="#trunkSourceWebKit2PluginProcessWebProcessConnectioncpp">trunk/Source/WebKit2/PluginProcess/WebProcessConnection.cpp</a></li>
<li><a href="#trunkSourceWebKit2PluginProcessmacPluginProcessMacmm">trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedActivityAssertioncpp">trunk/Source/WebKit2/Shared/ActivityAssertion.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedActivityAssertionh">trunk/Source/WebKit2/Shared/ActivityAssertion.h</a></li>
<li><a href="#trunkSourceWebKit2SharedChildProcesscpp">trunk/Source/WebKit2/Shared/ChildProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedChildProcessh">trunk/Source/WebKit2/Shared/ChildProcess.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163590 => 163591)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-07 01:56:45 UTC (rev 163590)
+++ trunk/Source/WebCore/ChangeLog 2014-02-07 01:57:37 UTC (rev 163591)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2014-02-06 Gavin Barraclough <barraclough@apple.com>
+
+ Remove ChildProcess::m_activeTasks
+ https://bugs.webkit.org/show_bug.cgi?id=128342
+
+ Reviewed by Anders Carlson.
+
+ Currently we funnel a number of different user activities
+ to a single UserActivity object, which requires a call down
+ from WebCore to WebKit2. Split these out so we can track
+ them separately.
+
+ * page/ChromeClient.h:
+ - removed [inc|dec]rementActivePageCount
+ * page/PageThrottler.cpp:
+ (WebCore::PageThrottler::PageThrottler):
+ - incrementActivePageCount -> beginActivity
+ (WebCore::PageThrottler::~PageThrottler):
+ - decrementActivePageCount -> endActivity
+ (WebCore::PageThrottler::throttlePage):
+ - decrementActivePageCount -> endActivity
+ (WebCore::PageThrottler::unthrottlePage):
+ - incrementActivePageCount -> beginActivity
+ * page/PageThrottler.h:
+ - Added m_pageActivity.
+
</ins><span class="cx"> 2014-02-06 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r163558.
</span></span></pre></div>
<a id="trunkSourceWebCorepageChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ChromeClient.h (163590 => 163591)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ChromeClient.h 2014-02-07 01:56:45 UTC (rev 163590)
+++ trunk/Source/WebCore/page/ChromeClient.h 2014-02-07 01:57:37 UTC (rev 163591)
</span><span class="lines">@@ -411,12 +411,6 @@
</span><span class="cx">
</span><span class="cx"> virtual bool shouldUseTiledBackingForFrameView(const FrameView*) const { return false; }
</span><span class="cx">
</span><del>- // These methods are used to report pages that are performing
- // some task that we consider to be "active", and so the user
- // would likely want the page to remain running uninterrupted.
- virtual void incrementActivePageCount() { }
- virtual void decrementActivePageCount() { }
-
</del><span class="cx"> protected:
</span><span class="cx"> virtual ~ChromeClient() { }
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageThrottlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageThrottler.cpp (163590 => 163591)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageThrottler.cpp 2014-02-07 01:56:45 UTC (rev 163590)
+++ trunk/Source/WebCore/page/PageThrottler.cpp 2014-02-07 01:57:37 UTC (rev 163591)
</span><span class="lines">@@ -42,8 +42,9 @@
</span><span class="cx"> , m_throttleState(PageNotThrottledState)
</span><span class="cx"> , m_throttleHysteresisTimer(this, &PageThrottler::throttleHysteresisTimerFired)
</span><span class="cx"> , m_visuallyNonIdle("Page is not visually idle.")
</span><ins>+ , m_pageActivity("Page is active.")
</ins><span class="cx"> {
</span><del>- m_page.chrome().client().incrementActivePageCount();
</del><ins>+ m_pageActivity.beginActivity();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PageThrottler::~PageThrottler()
</span><span class="lines">@@ -54,7 +55,7 @@
</span><span class="cx"> (*it)->invalidate();
</span><span class="cx">
</span><span class="cx"> if (m_throttleState != PageThrottledState)
</span><del>- m_page.chrome().client().decrementActivePageCount();
</del><ins>+ m_pageActivity.endActivity();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<PageActivityAssertionToken> PageThrottler::createActivityToken()
</span><span class="lines">@@ -66,7 +67,7 @@
</span><span class="cx"> {
</span><span class="cx"> m_throttleState = PageThrottledState;
</span><span class="cx">
</span><del>- m_page.chrome().client().decrementActivePageCount();
</del><ins>+ m_pageActivity.endActivity();
</ins><span class="cx">
</span><span class="cx"> for (Frame* frame = &m_page.mainFrame(); frame; frame = frame->tree().traverseNext()) {
</span><span class="cx"> if (frame->document())
</span><span class="lines">@@ -85,7 +86,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (oldState == PageThrottledState)
</span><del>- m_page.chrome().client().incrementActivePageCount();
</del><ins>+ m_pageActivity.beginActivity();
</ins><span class="cx">
</span><span class="cx"> for (Frame* frame = &m_page.mainFrame(); frame; frame = frame->tree().traverseNext()) {
</span><span class="cx"> if (frame->document())
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageThrottlerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageThrottler.h (163590 => 163591)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageThrottler.h 2014-02-07 01:56:45 UTC (rev 163590)
+++ trunk/Source/WebCore/page/PageThrottler.h 2014-02-07 01:57:37 UTC (rev 163591)
</span><span class="lines">@@ -75,6 +75,7 @@
</span><span class="cx"> Timer<PageThrottler> m_throttleHysteresisTimer;
</span><span class="cx"> HashSet<PageActivityAssertionToken*> m_activityTokens;
</span><span class="cx"> UserActivity m_visuallyNonIdle;
</span><ins>+ UserActivity m_pageActivity;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (163590 => 163591)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-07 01:56:45 UTC (rev 163590)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-07 01:57:37 UTC (rev 163591)
</span><span class="lines">@@ -1,3 +1,43 @@
</span><ins>+2014-02-06 Gavin Barraclough <barraclough@apple.com>
+
+ Remove ChildProcess::m_activeTasks
+ https://bugs.webkit.org/show_bug.cgi?id=128342
+
+ Reviewed by Anders Carlson.
+
+ Currently we funnel a number of different user activities
+ to a single UserActivity object, which requires a call down
+ from WebCore to WebKit2. Split these out so we can track
+ them separately.
+
+ * PluginProcess/PluginProcess.cpp:
+ (WebKit::PluginProcess::PluginProcess):
+ - added m_connectionActivity.
+ * PluginProcess/PluginProcess.h:
+ (WebKit::PluginProcess::connectionActivity):
+ - added m_connectionActivity.
+ * PluginProcess/WebProcessConnection.cpp:
+ (WebKit::WebProcessConnection::didReceiveSyncMessage):
+ (WebKit::WebProcessConnection::destroyPlugin):
+ (WebKit::WebProcessConnection::createPlugin):
+ - use connectionActivity
+ * PluginProcess/mac/PluginProcessMac.mm:
+ (WebKit::PluginProcess::platformInitializeProcess):
+ - use a separate UserActivity for Java.
+ * Shared/ActivityAssertion.cpp:
+ (WebKit::ActivityAssertion::ActivityAssertion):
+ (WebKit::ActivityAssertion::~ActivityAssertion):
+ * Shared/ActivityAssertion.h:
+ - ChildProcess -> UserActivity
+ * Shared/ChildProcess.cpp:
+ (WebKit::ChildProcess::ChildProcess):
+ * Shared/ChildProcess.h:
+ - remove m_activeTasks.
+ (WebKit::ChildProcess::processSuppressionEnabled):
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ * WebProcess/WebCoreSupport/WebChromeClient.h:
+ - removed [inc|dec]rementActivePageCount
+
</ins><span class="cx"> 2014-02-06 Pratik Solanki <psolanki@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] WebKit2 can't access the GPU
</span></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessPluginProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp (163590 => 163591)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp 2014-02-07 01:56:45 UTC (rev 163590)
+++ trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp 2014-02-07 01:57:37 UTC (rev 163591)
</span><span class="lines">@@ -60,6 +60,7 @@
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> , m_compositingRenderServerPort(MACH_PORT_NULL)
</span><span class="cx"> #endif
</span><ins>+ , m_connectionActivity("PluginProcess connection activity.")
</ins><span class="cx"> {
</span><span class="cx"> NetscapePlugin::setSetExceptionFunction(WebProcessConnection::setGlobalException);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessPluginProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PluginProcess/PluginProcess.h (163590 => 163591)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PluginProcess/PluginProcess.h 2014-02-07 01:56:45 UTC (rev 163590)
+++ trunk/Source/WebKit2/PluginProcess/PluginProcess.h 2014-02-07 01:57:37 UTC (rev 163591)
</span><span class="lines">@@ -63,6 +63,8 @@
</span><span class="cx"> bool openFile(const String& urlString);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ UserActivity& connectionActivity() { return m_connectionActivity; }
+
</ins><span class="cx"> private:
</span><span class="cx"> PluginProcess();
</span><span class="cx"> ~PluginProcess();
</span><span class="lines">@@ -117,6 +119,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> static void lowMemoryHandler(bool critical);
</span><ins>+ UserActivity m_connectionActivity;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessWebProcessConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PluginProcess/WebProcessConnection.cpp (163590 => 163591)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PluginProcess/WebProcessConnection.cpp 2014-02-07 01:56:45 UTC (rev 163590)
+++ trunk/Source/WebKit2/PluginProcess/WebProcessConnection.cpp 2014-02-07 01:57:37 UTC (rev 163591)
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx"> void WebProcessConnection::didReceiveSyncMessage(IPC::Connection* connection, IPC::MessageDecoder& decoder, std::unique_ptr<IPC::MessageEncoder>& replyEncoder)
</span><span class="cx"> {
</span><span class="cx"> // Force all timers to run at full speed when processing a synchronous message
</span><del>- ActivityAssertion activityAssertion(PluginProcess::shared());
</del><ins>+ ActivityAssertion activityAssertion(PluginProcess::shared().connectionActivity());
</ins><span class="cx">
</span><span class="cx"> ConnectionStack::CurrentConnectionPusher currentConnection(ConnectionStack::shared(), connection);
</span><span class="cx">
</span><span class="lines">@@ -181,7 +181,7 @@
</span><span class="cx"> void WebProcessConnection::destroyPlugin(uint64_t pluginInstanceID, bool asynchronousCreationIncomplete)
</span><span class="cx"> {
</span><span class="cx"> // Ensure we don't clamp any timers during destruction
</span><del>- ActivityAssertion activityAssertion(PluginProcess::shared());
</del><ins>+ ActivityAssertion activityAssertion(PluginProcess::shared().connectionActivity());
</ins><span class="cx">
</span><span class="cx"> PluginControllerProxy* pluginControllerProxy = m_pluginControllers.get(pluginInstanceID);
</span><span class="cx">
</span><span class="lines">@@ -230,7 +230,7 @@
</span><span class="cx"> void WebProcessConnection::createPlugin(const PluginCreationParameters& creationParameters, PassRefPtr<Messages::WebProcessConnection::CreatePlugin::DelayedReply> reply)
</span><span class="cx"> {
</span><span class="cx"> // Ensure we don't clamp any timers during initialization
</span><del>- ActivityAssertion activityAssertion(PluginProcess::shared());
</del><ins>+ ActivityAssertion activityAssertion(PluginProcess::shared().connectionActivity());
</ins><span class="cx">
</span><span class="cx"> PluginControllerProxy* pluginControllerProxy = m_pluginControllers.get(creationParameters.pluginInstanceID);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessmacPluginProcessMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm (163590 => 163591)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm 2014-02-07 01:56:45 UTC (rev 163590)
+++ trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm 2014-02-07 01:57:37 UTC (rev 163591)
</span><span class="lines">@@ -438,7 +438,7 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: Workaround for Java not liking its plugin process to be supressed - <rdar://problem/14267843>
</span><span class="cx"> if (m_pluginBundleIdentifier == "com.oracle.java.JavaAppletPlugin")
</span><del>- incrementActiveTaskCount();
</del><ins>+ (new UserActivity("com.oracle.java.JavaAppletPlugin"))->beginActivity();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PluginProcess::initializeProcessName(const ChildProcessInitializationParameters& parameters)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedActivityAssertioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ActivityAssertion.cpp (163590 => 163591)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ActivityAssertion.cpp 2014-02-07 01:56:45 UTC (rev 163590)
+++ trunk/Source/WebKit2/Shared/ActivityAssertion.cpp 2014-02-07 01:57:37 UTC (rev 163591)
</span><span class="lines">@@ -26,19 +26,17 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "ActivityAssertion.h"
</span><span class="cx">
</span><del>-#include "ChildProcess.h"
-
</del><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-ActivityAssertion::ActivityAssertion(ChildProcess& process)
- : m_process(process)
</del><ins>+ActivityAssertion::ActivityAssertion(UserActivity& activity)
+ : m_activity(activity)
</ins><span class="cx"> {
</span><del>- m_process.incrementActiveTaskCount();
</del><ins>+ m_activity.beginActivity();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ActivityAssertion::~ActivityAssertion()
</span><span class="cx"> {
</span><del>- m_process.decrementActiveTaskCount();
</del><ins>+ m_activity.endActivity();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedActivityAssertionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ActivityAssertion.h (163590 => 163591)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ActivityAssertion.h 2014-02-07 01:56:45 UTC (rev 163590)
+++ trunk/Source/WebKit2/Shared/ActivityAssertion.h 2014-02-07 01:57:37 UTC (rev 163591)
</span><span class="lines">@@ -26,20 +26,19 @@
</span><span class="cx"> #ifndef ActivityAssertion_h
</span><span class="cx"> #define ActivityAssertion_h
</span><span class="cx">
</span><ins>+#include <WebCore/UserActivity.h>
</ins><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-class ChildProcess;
-
</del><span class="cx"> class ActivityAssertion {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(ActivityAssertion);
</span><span class="cx"> public:
</span><del>- ActivityAssertion(ChildProcess&);
</del><ins>+ explicit ActivityAssertion(UserActivity&);
</ins><span class="cx"> ~ActivityAssertion();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- ChildProcess& m_process;
</del><ins>+ UserActivity& m_activity;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedChildProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ChildProcess.cpp (163590 => 163591)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ChildProcess.cpp 2014-02-07 01:56:45 UTC (rev 163590)
+++ trunk/Source/WebKit2/Shared/ChildProcess.cpp 2014-02-07 01:57:37 UTC (rev 163591)
</span><span class="lines">@@ -36,7 +36,6 @@
</span><span class="cx"> , m_terminationCounter(0)
</span><span class="cx"> , m_terminationTimer(RunLoop::main(), this, &ChildProcess::terminationTimerFired)
</span><span class="cx"> , m_processSuppressionDisabled("Process Suppression Disabled by UIProcess")
</span><del>- , m_activeTasks("Process Suppression Disabled by WebProcess")
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -85,16 +84,6 @@
</span><span class="cx"> m_processSuppressionDisabled.beginActivity();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ChildProcess::incrementActiveTaskCount()
-{
- m_activeTasks.beginActivity();
-}
-
-void ChildProcess::decrementActiveTaskCount()
-{
- m_activeTasks.endActivity();
-}
-
</del><span class="cx"> void ChildProcess::initializeProcess(const ChildProcessInitializationParameters&)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedChildProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ChildProcess.h (163590 => 163591)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ChildProcess.h 2014-02-07 01:56:45 UTC (rev 163590)
+++ trunk/Source/WebKit2/Shared/ChildProcess.h 2014-02-07 01:57:37 UTC (rev 163591)
</span><span class="lines">@@ -64,8 +64,6 @@
</span><span class="cx">
</span><span class="cx"> void setProcessSuppressionEnabled(bool);
</span><span class="cx"> bool processSuppressionEnabled() const { return !m_processSuppressionDisabled.isActive(); }
</span><del>- void incrementActiveTaskCount();
- void decrementActiveTaskCount();
</del><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> void setApplicationIsDaemon();
</span><span class="lines">@@ -119,7 +117,6 @@
</span><span class="cx"> IPC::MessageReceiverMap m_messageReceiverMap;
</span><span class="cx">
</span><span class="cx"> UserActivity m_processSuppressionDisabled;
</span><del>- UserActivity m_activeTasks;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (163590 => 163591)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2014-02-07 01:56:45 UTC (rev 163590)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2014-02-07 01:57:37 UTC (rev 163591)
</span><span class="lines">@@ -935,14 +935,4 @@
</span><span class="cx"> return m_page->drawingArea()->shouldUseTiledBackingForFrameView(frameView);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebChromeClient::incrementActivePageCount()
-{
- WebProcess::shared().incrementActiveTaskCount();
-}
-
-void WebChromeClient::decrementActivePageCount()
-{
- WebProcess::shared().decrementActiveTaskCount();
-}
-
</del><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h (163590 => 163591)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2014-02-07 01:56:45 UTC (rev 163590)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2014-02-07 01:57:37 UTC (rev 163591)
</span><span class="lines">@@ -272,9 +272,6 @@
</span><span class="cx">
</span><span class="cx"> virtual bool shouldUseTiledBackingForFrameView(const WebCore::FrameView*) const override;
</span><span class="cx">
</span><del>- virtual void incrementActivePageCount() override;
- virtual void decrementActivePageCount() override;
-
</del><span class="cx"> String m_cachedToolTip;
</span><span class="cx"> mutable RefPtr<WebFrame> m_cachedFrameSetLargestFrame;
</span><span class="cx"> mutable bool m_cachedMainFrameHasHorizontalScrollbar;
</span></span></pre>
</div>
</div>
</body>
</html>