<!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>[164914] 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/164914">164914</a></dd>
<dt>Author</dt> <dd>barraclough@apple.com</dd>
<dt>Date</dt> <dd>2014-03-01 01:01:58 -0800 (Sat, 01 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Change PageActivityAssertionToken to use a WeakPtr
https://bugs.webkit.org/show_bug.cgi?id=129526
Reviewed by Sam Weinig.
PageThrottler effectively implements a bespoke weak pointer mechanism; remove this & just use WeakPtr.
* page/PageActivityAssertionToken.cpp:
(WebCore::PageActivityAssertionToken::PageActivityAssertionToken):
(WebCore::PageActivityAssertionToken::~PageActivityAssertionToken):
- addActivityToken->incrementActivityCount, removeActivityToken->decrementActivityCount
* page/PageActivityAssertionToken.h:
- removed invalidate, made m_throttler a WeakPtr
* page/PageThrottler.cpp:
(WebCore::PageThrottler::PageThrottler):
- initialize m_weakPtrFactory, m_activityCount.
(WebCore::PageThrottler::~PageThrottler):
- removed called to invalidate.
(WebCore::PageThrottler::startThrottleHysteresisTimer):
- m_activityTokens.size()->m_activityCount
(WebCore::PageThrottler::throttleHysteresisTimerFired):
- m_activityTokens.size()->m_activityCount
(WebCore::PageThrottler::incrementActivityCount):
- m_activityTokens.add->++
(WebCore::PageThrottler::decrementActivityCount):
- m_activityTokens.remove->--
* page/PageThrottler.h:
(WebCore::PageThrottler::weakPtr):
- replaced HashSet with WeakPtrFactory & count.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagePageActivityAssertionTokencpp">trunk/Source/WebCore/page/PageActivityAssertionToken.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageActivityAssertionTokenh">trunk/Source/WebCore/page/PageActivityAssertionToken.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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164913 => 164914)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-01 08:49:34 UTC (rev 164913)
+++ trunk/Source/WebCore/ChangeLog 2014-03-01 09:01:58 UTC (rev 164914)
</span><span class="lines">@@ -1,5 +1,37 @@
</span><span class="cx"> 2014-03-01 Gavin Barraclough <barraclough@apple.com>
</span><span class="cx">
</span><ins>+ Change PageActivityAssertionToken to use a WeakPtr
+ https://bugs.webkit.org/show_bug.cgi?id=129526
+
+ Reviewed by Sam Weinig.
+
+ PageThrottler effectively implements a bespoke weak pointer mechanism; remove this & just use WeakPtr.
+
+ * page/PageActivityAssertionToken.cpp:
+ (WebCore::PageActivityAssertionToken::PageActivityAssertionToken):
+ (WebCore::PageActivityAssertionToken::~PageActivityAssertionToken):
+ - addActivityToken->incrementActivityCount, removeActivityToken->decrementActivityCount
+ * page/PageActivityAssertionToken.h:
+ - removed invalidate, made m_throttler a WeakPtr
+ * page/PageThrottler.cpp:
+ (WebCore::PageThrottler::PageThrottler):
+ - initialize m_weakPtrFactory, m_activityCount.
+ (WebCore::PageThrottler::~PageThrottler):
+ - removed called to invalidate.
+ (WebCore::PageThrottler::startThrottleHysteresisTimer):
+ - m_activityTokens.size()->m_activityCount
+ (WebCore::PageThrottler::throttleHysteresisTimerFired):
+ - m_activityTokens.size()->m_activityCount
+ (WebCore::PageThrottler::incrementActivityCount):
+ - m_activityTokens.add->++
+ (WebCore::PageThrottler::decrementActivityCount):
+ - m_activityTokens.remove->--
+ * page/PageThrottler.h:
+ (WebCore::PageThrottler::weakPtr):
+ - replaced HashSet with WeakPtrFactory & count.
+
+2014-03-01 Gavin Barraclough <barraclough@apple.com>
+
</ins><span class="cx"> Split UserActivity/CountedUserActivity
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=129520
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageActivityAssertionTokencpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageActivityAssertionToken.cpp (164913 => 164914)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageActivityAssertionToken.cpp 2014-03-01 08:49:34 UTC (rev 164913)
+++ trunk/Source/WebCore/page/PageActivityAssertionToken.cpp 2014-03-01 09:01:58 UTC (rev 164914)
</span><span class="lines">@@ -31,22 +31,17 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> PageActivityAssertionToken::PageActivityAssertionToken(PageThrottler& throttler)
</span><del>- : m_throttler(&throttler)
</del><ins>+ : m_throttler(throttler.weakPtr())
</ins><span class="cx"> {
</span><del>- m_throttler->addActivityToken(*this);
</del><ins>+ throttler.incrementActivityCount();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PageActivityAssertionToken::~PageActivityAssertionToken()
</span><span class="cx"> {
</span><del>- if (m_throttler)
- m_throttler->removeActivityToken(*this);
</del><ins>+ if (PageThrottler* throttler = m_throttler.get())
+ throttler->decrementActivityCount();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void PageActivityAssertionToken::invalidate()
-{
- m_throttler = 0;
-}
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageActivityAssertionTokenh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageActivityAssertionToken.h (164913 => 164914)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageActivityAssertionToken.h 2014-03-01 08:49:34 UTC (rev 164913)
+++ trunk/Source/WebCore/page/PageActivityAssertionToken.h 2014-03-01 09:01:58 UTC (rev 164914)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #define PageActivityAssertionToken_h
</span><span class="cx">
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><ins>+#include <wtf/WeakPtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -38,10 +39,8 @@
</span><span class="cx"> PageActivityAssertionToken(PageThrottler&);
</span><span class="cx"> ~PageActivityAssertionToken();
</span><span class="cx">
</span><del>- void invalidate();
-
</del><span class="cx"> private:
</span><del>- PageThrottler* m_throttler;
</del><ins>+ WeakPtr<PageThrottler> m_throttler;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageThrottlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageThrottler.cpp (164913 => 164914)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageThrottler.cpp 2014-03-01 08:49:34 UTC (rev 164913)
+++ trunk/Source/WebCore/page/PageThrottler.cpp 2014-03-01 09:01:58 UTC (rev 164914)
</span><span class="lines">@@ -42,6 +42,8 @@
</span><span class="cx"> , m_viewState(viewState)
</span><span class="cx"> , m_throttleState(PageNotThrottledState)
</span><span class="cx"> , m_throttleHysteresisTimer(this, &PageThrottler::throttleHysteresisTimerFired)
</span><ins>+ , m_weakPtrFactory(this)
+ , m_activityCount(0)
</ins><span class="cx"> , m_visuallyNonIdle("Page is not visually idle.")
</span><span class="cx"> , m_pageActivity("Page is active.")
</span><span class="cx"> {
</span><span class="lines">@@ -54,9 +56,6 @@
</span><span class="cx"> {
</span><span class="cx"> m_page.setTimerThrottlingEnabled(false);
</span><span class="cx">
</span><del>- for (auto it = m_activityTokens.begin(), end = m_activityTokens.end(); it != end; ++it)
- (*it)->invalidate();
-
</del><span class="cx"> if (m_throttleState != PageThrottledState)
</span><span class="cx"> m_pageActivity.decrement();
</span><span class="cx"> }
</span><span class="lines">@@ -150,24 +149,20 @@
</span><span class="cx"> {
</span><span class="cx"> if (m_throttleHysteresisTimer.isActive())
</span><span class="cx"> m_throttleHysteresisTimer.stop();
</span><del>- if (!m_activityTokens.size())
</del><ins>+ if (!m_activityCount)
</ins><span class="cx"> m_throttleHysteresisTimer.startOneShot(kThrottleHysteresisSeconds);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageThrottler::throttleHysteresisTimerFired(Timer<PageThrottler>&)
</span><span class="cx"> {
</span><del>- ASSERT(!m_activityTokens.size());
</del><ins>+ ASSERT(!m_activityCount);
</ins><span class="cx"> throttlePage();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PageThrottler::addActivityToken(PageActivityAssertionToken& token)
</del><ins>+void PageThrottler::incrementActivityCount()
</ins><span class="cx"> {
</span><del>- ASSERT(!m_activityTokens.contains(&token));
-
- m_activityTokens.add(&token);
-
</del><span class="cx"> // If we've already got events that block throttling we can return early
</span><del>- if (m_activityTokens.size() > 1)
</del><ins>+ if (m_activityCount++)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (m_throttleState == PageNotThrottledState)
</span><span class="lines">@@ -180,13 +175,9 @@
</span><span class="cx"> stopThrottleHysteresisTimer();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PageThrottler::removeActivityToken(PageActivityAssertionToken& token)
</del><ins>+void PageThrottler::decrementActivityCount()
</ins><span class="cx"> {
</span><del>- ASSERT(m_activityTokens.contains(&token));
-
- m_activityTokens.remove(&token);
-
- if (m_activityTokens.size())
</del><ins>+ if (--m_activityCount)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (m_throttleState == PageNotThrottledState)
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageThrottlerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageThrottler.h (164913 => 164914)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageThrottler.h 2014-03-01 08:49:34 UTC (rev 164913)
+++ trunk/Source/WebCore/page/PageThrottler.h 2014-03-01 09:01:58 UTC (rev 164914)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/OwnPtr.h>
</span><span class="cx"> #include <wtf/PassOwnPtr.h>
</span><ins>+#include <wtf/WeakPtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -61,8 +62,9 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> friend class PageActivityAssertionToken;
</span><del>- void addActivityToken(PageActivityAssertionToken&);
- void removeActivityToken(PageActivityAssertionToken&);
</del><ins>+ WeakPtr<PageThrottler> weakPtr() { return m_weakPtrFactory.createWeakPtr(); }
+ void incrementActivityCount();
+ void decrementActivityCount();
</ins><span class="cx">
</span><span class="cx"> void reportInterestingEvent();
</span><span class="cx">
</span><span class="lines">@@ -80,7 +82,8 @@
</span><span class="cx"> ViewState::Flags m_viewState;
</span><span class="cx"> PageThrottleState m_throttleState;
</span><span class="cx"> Timer<PageThrottler> m_throttleHysteresisTimer;
</span><del>- HashSet<PageActivityAssertionToken*> m_activityTokens;
</del><ins>+ WeakPtrFactory<PageThrottler> m_weakPtrFactory;
+ size_t m_activityCount;
</ins><span class="cx"> UserActivity m_visuallyNonIdle;
</span><span class="cx"> CountedUserActivity m_pageActivity;
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>