<!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>[197360] trunk</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/197360">197360</a></dd>
<dt>Author</dt> <dd>barraclough@apple.com</dd>
<dt>Date</dt> <dd>2016-02-29 10:55:21 -0800 (Mon, 29 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>RefCounter<T>::Event -> RefCounterEvent
https://bugs.webkit.org/show_bug.cgi?id=154767
Reviewed by Darin Adler.
RefCounter<T>::Event is kinda verbose to use, and there is no need for this
to be specific to a particular typeof RefCounter. Move the enum class up to
the top level & rename to RefCounterEvent.
Source/WebCore:
* page/PageThrottler.cpp:
(WebCore::PageThrottler::PageThrottler):
(WebCore::m_audiblePluginHysteresis):
(WebCore::m_mediaActivityCounter):
(WebCore::m_pageLoadActivityCounter):
* platform/VNodeTracker.cpp:
(WebCore::VNodeTracker::singleton):
(WebCore::VNodeTracker::VNodeTracker):
(WebCore::m_lastWarningTime):
Source/WebKit2:
Also remove UserObservablePageToken - this is vestigial & not really offering
anything over just using UserObservablePageCounter::Token directly.
* UIProcess/Plugins/PluginProcessManager.cpp:
(WebKit::PluginProcessManager::PluginProcessManager):
* UIProcess/Plugins/PluginProcessManager.h:
* UIProcess/Plugins/mac/PluginProcessManagerMac.mm:
(WebKit::PluginProcessManager::updateProcessSuppressionDisabled):
* UIProcess/ProcessThrottler.cpp:
(WebKit::ProcessThrottler::ProcessThrottler):
(WebKit::m_backgroundCounter):
(WebKit::m_suspendMessageCount):
* UIProcess/ProcessThrottler.h:
* UIProcess/WebPageProxy.h:
* UIProcess/WebProcessPool.cpp:
(WebKit::WebProcessPool::WebProcessPool):
(WebKit::m_processSuppressionDisabledForPageCounter):
(WebKit::m_hiddenPageThrottlingAutoIncreasesCounter):
* UIProcess/WebProcessPool.h:
Source/WTF:
* wtf/RefCounter.h:
(WTF::RefCounter<T>::Count::ref):
(WTF::RefCounter<T>::Count::deref):
Tools:
* TestWebKitAPI/Tests/WTF/RefCounter.cpp:
(TestWebKitAPI::TEST):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfRefCounterh">trunk/Source/WTF/wtf/RefCounter.h</a></li>
<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="#trunkSourceWebCoreplatformVNodeTrackercpp">trunk/Source/WebCore/platform/VNodeTracker.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsPluginProcessManagercpp">trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsPluginProcessManagerh">trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsmacPluginProcessManagerMacmm">trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessManagerMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessProcessThrottlercpp">trunk/Source/WebKit2/UIProcess/ProcessThrottler.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessProcessThrottlerh">trunk/Source/WebKit2/UIProcess/ProcessThrottler.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolcpp">trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolh">trunk/Source/WebKit2/UIProcess/WebProcessPool.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFRefCountercpp">trunk/Tools/TestWebKitAPI/Tests/WTF/RefCounter.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (197359 => 197360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-02-29 18:51:28 UTC (rev 197359)
+++ trunk/Source/WTF/ChangeLog 2016-02-29 18:55:21 UTC (rev 197360)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-02-29 Gavin Barraclough <barraclough@apple.com>
+
+ RefCounter<T>::Event -> RefCounterEvent
+ https://bugs.webkit.org/show_bug.cgi?id=154767
+
+ Reviewed by Darin Adler.
+
+ RefCounter<T>::Event is kinda verbose to use, and there is no need for this
+ to be specific to a particular typeof RefCounter. Move the enum class up to
+ the top level & rename to RefCounterEvent.
+
+ * wtf/RefCounter.h:
+ (WTF::RefCounter<T>::Count::ref):
+ (WTF::RefCounter<T>::Count::deref):
+
</ins><span class="cx"> 2016-02-26 Oliver Hunt <oliver@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove the on demand executable allocator
</span></span></pre></div>
<a id="trunkSourceWTFwtfRefCounterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/RefCounter.h (197359 => 197360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/RefCounter.h 2016-02-29 18:51:28 UTC (rev 197359)
+++ trunk/Source/WTF/wtf/RefCounter.h 2016-02-29 18:55:21 UTC (rev 197360)
</span><span class="lines">@@ -32,6 +32,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span><ins>+enum class RefCounterEvent { Decrement, Increment };
+
</ins><span class="cx"> template<typename T>
</span><span class="cx"> class RefCounter {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(RefCounter);
</span><span class="lines">@@ -57,8 +59,7 @@
</span><span class="cx">
</span><span class="cx"> public:
</span><span class="cx"> using Token = RefPtr<Count>;
</span><del>- enum class Event { Decrement, Increment };
- using ValueChangeFunction = std::function<void (Event)>;
</del><ins>+ using ValueChangeFunction = std::function<void (RefCounterEvent)>;
</ins><span class="cx">
</span><span class="cx"> RefCounter(ValueChangeFunction = nullptr);
</span><span class="cx"> ~RefCounter();
</span><span class="lines">@@ -83,7 +84,7 @@
</span><span class="cx"> {
</span><span class="cx"> ++m_value;
</span><span class="cx"> if (m_refCounter && m_refCounter->m_valueDidChange)
</span><del>- m_refCounter->m_valueDidChange(Event::Increment);
</del><ins>+ m_refCounter->m_valueDidChange(RefCounterEvent::Increment);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T>
</span><span class="lines">@@ -93,7 +94,7 @@
</span><span class="cx">
</span><span class="cx"> --m_value;
</span><span class="cx"> if (m_refCounter && m_refCounter->m_valueDidChange)
</span><del>- m_refCounter->m_valueDidChange(Event::Decrement);
</del><ins>+ m_refCounter->m_valueDidChange(RefCounterEvent::Decrement);
</ins><span class="cx">
</span><span class="cx"> // The Count object is kept alive so long as either the RefCounter that created it remains
</span><span class="cx"> // allocated, or so long as its reference count is non-zero.
</span><span class="lines">@@ -126,5 +127,6 @@
</span><span class="cx"> } // namespace WTF
</span><span class="cx">
</span><span class="cx"> using WTF::RefCounter;
</span><ins>+using WTF::RefCounterEvent;
</ins><span class="cx">
</span><span class="cx"> #endif // RefCounter_h
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (197359 => 197360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-02-29 18:51:28 UTC (rev 197359)
+++ trunk/Source/WebCore/ChangeLog 2016-02-29 18:55:21 UTC (rev 197360)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-02-29 Gavin Barraclough <barraclough@apple.com>
+
+ RefCounter<T>::Event -> RefCounterEvent
+ https://bugs.webkit.org/show_bug.cgi?id=154767
+
+ Reviewed by Darin Adler.
+
+ RefCounter<T>::Event is kinda verbose to use, and there is no need for this
+ to be specific to a particular typeof RefCounter. Move the enum class up to
+ the top level & rename to RefCounterEvent.
+
+ * page/PageThrottler.cpp:
+ (WebCore::PageThrottler::PageThrottler):
+ (WebCore::m_audiblePluginHysteresis):
+ (WebCore::m_mediaActivityCounter):
+ (WebCore::m_pageLoadActivityCounter):
+ * platform/VNodeTracker.cpp:
+ (WebCore::VNodeTracker::singleton):
+ (WebCore::VNodeTracker::VNodeTracker):
+ (WebCore::m_lastWarningTime):
+
</ins><span class="cx"> 2016-02-29 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Use HTML parsing rules for textarea.maxLength
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageThrottlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageThrottler.cpp (197359 => 197360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageThrottler.cpp 2016-02-29 18:51:28 UTC (rev 197359)
+++ trunk/Source/WebCore/page/PageThrottler.cpp 2016-02-29 18:55:21 UTC (rev 197360)
</span><span class="lines">@@ -34,8 +34,8 @@
</span><span class="cx"> : m_page(page)
</span><span class="cx"> , m_userInputHysteresis([this](HysteresisState state) { setActivityFlag(PageActivityState::UserInputActivity, state == HysteresisState::Started); })
</span><span class="cx"> , m_audiblePluginHysteresis([this](HysteresisState state) { setActivityFlag(PageActivityState::AudiblePlugin, state == HysteresisState::Started); })
</span><del>- , m_mediaActivityCounter([this](PageActivityCounter::Event) { setActivityFlag(PageActivityState::MediaActivity, m_mediaActivityCounter.value()); })
- , m_pageLoadActivityCounter([this](PageActivityCounter::Event) { setActivityFlag(PageActivityState::PageLoadActivity, m_pageLoadActivityCounter.value()); })
</del><ins>+ , m_mediaActivityCounter([this](RefCounterEvent) { setActivityFlag(PageActivityState::MediaActivity, m_mediaActivityCounter.value()); })
+ , m_pageLoadActivityCounter([this](RefCounterEvent) { setActivityFlag(PageActivityState::PageLoadActivity, m_pageLoadActivityCounter.value()); })
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformVNodeTrackercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/VNodeTracker.cpp (197359 => 197360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/VNodeTracker.cpp 2016-02-29 18:51:28 UTC (rev 197359)
+++ trunk/Source/WebCore/platform/VNodeTracker.cpp 2016-02-29 18:55:21 UTC (rev 197360)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> VNodeTracker::VNodeTracker()
</span><del>- : m_vnodeCounter([this](VNodeCounter::Event event) { if (event == VNodeCounter::Event::Increment) checkPressureState(); })
</del><ins>+ : m_vnodeCounter([this](RefCounterEvent event) { if (event == RefCounterEvent::Increment) checkPressureState(); })
</ins><span class="cx"> , m_pressureWarningTimer(*this, &VNodeTracker::pressureWarningTimerFired)
</span><span class="cx"> , m_lastWarningTime(std::chrono::steady_clock::now())
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (197359 => 197360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-02-29 18:51:28 UTC (rev 197359)
+++ trunk/Source/WebKit2/ChangeLog 2016-02-29 18:55:21 UTC (rev 197360)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2016-02-29 Gavin Barraclough <barraclough@apple.com>
+
+ RefCounter<T>::Event -> RefCounterEvent
+ https://bugs.webkit.org/show_bug.cgi?id=154767
+
+ Reviewed by Darin Adler.
+
+ RefCounter<T>::Event is kinda verbose to use, and there is no need for this
+ to be specific to a particular typeof RefCounter. Move the enum class up to
+ the top level & rename to RefCounterEvent.
+
+ Also remove UserObservablePageToken - this is vestigial & not really offering
+ anything over just using UserObservablePageCounter::Token directly.
+
+ * UIProcess/Plugins/PluginProcessManager.cpp:
+ (WebKit::PluginProcessManager::PluginProcessManager):
+ * UIProcess/Plugins/PluginProcessManager.h:
+ * UIProcess/Plugins/mac/PluginProcessManagerMac.mm:
+ (WebKit::PluginProcessManager::updateProcessSuppressionDisabled):
+ * UIProcess/ProcessThrottler.cpp:
+ (WebKit::ProcessThrottler::ProcessThrottler):
+ (WebKit::m_backgroundCounter):
+ (WebKit::m_suspendMessageCount):
+ * UIProcess/ProcessThrottler.h:
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::WebProcessPool::WebProcessPool):
+ (WebKit::m_processSuppressionDisabledForPageCounter):
+ (WebKit::m_hiddenPageThrottlingAutoIncreasesCounter):
+ * UIProcess/WebProcessPool.h:
+
</ins><span class="cx"> 2016-02-29 Konstantin Tokarev <annulen@yandex.ru>
</span><span class="cx">
</span><span class="cx"> Fixed compilation with !ENABLE(DATABASE_PROCESS).
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsPluginProcessManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp (197359 => 197360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp 2016-02-29 18:51:28 UTC (rev 197359)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp 2016-02-29 18:55:21 UTC (rev 197360)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx">
</span><span class="cx"> PluginProcessManager::PluginProcessManager()
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>- : m_processSuppressionDisabledForPageCounter([this](ProcessSuppressionDisabledCounter::Event event) { updateProcessSuppressionDisabled(event); })
</del><ins>+ : m_processSuppressionDisabledForPageCounter([this](RefCounterEvent event) { updateProcessSuppressionDisabled(event); })
</ins><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsPluginProcessManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h (197359 => 197360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h 2016-02-29 18:51:28 UTC (rev 197359)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h 2016-02-29 18:55:21 UTC (rev 197360)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> inline ProcessSuppressionDisabledToken processSuppressionDisabledToken();
</span><span class="cx"> inline bool processSuppressionDisabled() const;
</span><del>- void updateProcessSuppressionDisabled(ProcessSuppressionDisabledCounter::Event);
</del><ins>+ void updateProcessSuppressionDisabled(RefCounterEvent);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsmacPluginProcessManagerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessManagerMac.mm (197359 => 197360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessManagerMac.mm 2016-02-29 18:51:28 UTC (rev 197359)
+++ trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessManagerMac.mm 2016-02-29 18:55:21 UTC (rev 197360)
</span><span class="lines">@@ -32,15 +32,15 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-void PluginProcessManager::updateProcessSuppressionDisabled(ProcessSuppressionDisabledCounter::Event event)
</del><ins>+void PluginProcessManager::updateProcessSuppressionDisabled(RefCounterEvent event)
</ins><span class="cx"> {
</span><span class="cx"> size_t disableCount = m_processSuppressionDisabledForPageCounter.value();
</span><span class="cx">
</span><span class="cx"> // We only care about zero/non-zero edge changes; ignore cases where the count was previously non-zero, and still is.
</span><del>- if (disableCount >= 2 || (disableCount == 1 && event == ProcessSuppressionDisabledCounter::Event::Decrement))
</del><ins>+ if (disableCount >= 2 || (disableCount == 1 && event == RefCounterEvent::Decrement))
</ins><span class="cx"> return;
</span><del>- ASSERT((event == ProcessSuppressionDisabledCounter::Event::Increment && disableCount == 1)
- || (event == ProcessSuppressionDisabledCounter::Event::Decrement && !disableCount));
</del><ins>+ ASSERT((event == RefCounterEvent::Increment && disableCount == 1)
+ || (event == RefCounterEvent::Decrement && !disableCount));
</ins><span class="cx">
</span><span class="cx"> bool enabled = !disableCount;
</span><span class="cx"> for (auto& pluginProcess : m_pluginProcesses)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessProcessThrottlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ProcessThrottler.cpp (197359 => 197360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ProcessThrottler.cpp 2016-02-29 18:51:28 UTC (rev 197359)
+++ trunk/Source/WebKit2/UIProcess/ProcessThrottler.cpp 2016-02-29 18:55:21 UTC (rev 197360)
</span><span class="lines">@@ -35,8 +35,8 @@
</span><span class="cx"> ProcessThrottler::ProcessThrottler(ProcessThrottlerClient& process)
</span><span class="cx"> : m_process(process)
</span><span class="cx"> , m_suspendTimer(RunLoop::main(), this, &ProcessThrottler::suspendTimerFired)
</span><del>- , m_foregroundCounter([this](ForegroundActivityCounter::Event) { updateAssertion(); })
- , m_backgroundCounter([this](BackgroundActivityCounter::Event) { updateAssertion(); })
</del><ins>+ , m_foregroundCounter([this](RefCounterEvent) { updateAssertion(); })
+ , m_backgroundCounter([this](RefCounterEvent) { updateAssertion(); })
</ins><span class="cx"> , m_suspendMessageCount(0)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessProcessThrottlerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ProcessThrottler.h (197359 => 197360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ProcessThrottler.h 2016-02-29 18:51:28 UTC (rev 197359)
+++ trunk/Source/WebKit2/UIProcess/ProcessThrottler.h 2016-02-29 18:55:21 UTC (rev 197360)
</span><span class="lines">@@ -36,7 +36,6 @@
</span><span class="cx">
</span><span class="cx"> enum UserObservablePageCounterType { };
</span><span class="cx"> typedef RefCounter<UserObservablePageCounterType> UserObservablePageCounter;
</span><del>-typedef UserObservablePageCounter::Token UserObservablePageToken;
</del><span class="cx"> enum ProcessSuppressionDisabledCounterType { };
</span><span class="cx"> typedef RefCounter<ProcessSuppressionDisabledCounterType> ProcessSuppressionDisabledCounter;
</span><span class="cx"> typedef ProcessSuppressionDisabledCounter::Token ProcessSuppressionDisabledToken;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (197359 => 197360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2016-02-29 18:51:28 UTC (rev 197359)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2016-02-29 18:55:21 UTC (rev 197360)
</span><span class="lines">@@ -1764,7 +1764,7 @@
</span><span class="cx"> std::unique_ptr<RemoteLayerTreeScrollingPerformanceData> m_scrollingPerformanceData;
</span><span class="cx"> bool m_scrollPerformanceDataCollectionEnabled;
</span><span class="cx"> #endif
</span><del>- UserObservablePageToken m_pageIsUserObservableCount;
</del><ins>+ UserObservablePageCounter::Token m_pageIsUserObservableCount;
</ins><span class="cx"> ProcessSuppressionDisabledToken m_preventProcessSuppressionCount;
</span><span class="cx"> HiddenPageThrottlingAutoIncreasesCounter::Token m_hiddenPageDOMTimerThrottlingAutoIncreasesCount;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (197359 => 197360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2016-02-29 18:51:28 UTC (rev 197359)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2016-02-29 18:55:21 UTC (rev 197360)
</span><span class="lines">@@ -158,9 +158,9 @@
</span><span class="cx"> , m_canHandleHTTPSServerTrustEvaluation(true)
</span><span class="cx"> , m_didNetworkProcessCrash(false)
</span><span class="cx"> , m_memoryCacheDisabled(false)
</span><del>- , m_userObservablePageCounter([this](UserObservablePageCounter::Event) { updateProcessSuppressionState(); })
- , m_processSuppressionDisabledForPageCounter([this](ProcessSuppressionDisabledCounter::Event) { updateProcessSuppressionState(); })
- , m_hiddenPageThrottlingAutoIncreasesCounter([this](HiddenPageThrottlingAutoIncreasesCounter::Event) { updateHiddenPageThrottlingAutoIncreaseLimit(); })
</del><ins>+ , m_userObservablePageCounter([this](RefCounterEvent) { updateProcessSuppressionState(); })
+ , m_processSuppressionDisabledForPageCounter([this](RefCounterEvent) { updateProcessSuppressionState(); })
+ , m_hiddenPageThrottlingAutoIncreasesCounter([this](RefCounterEvent) { updateHiddenPageThrottlingAutoIncreaseLimit(); })
</ins><span class="cx"> {
</span><span class="cx"> for (auto& scheme : m_configuration->alwaysRevalidatedURLSchemes())
</span><span class="cx"> m_schemesToRegisterAsAlwaysRevalidated.add(scheme);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.h (197359 => 197360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2016-02-29 18:51:28 UTC (rev 197359)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2016-02-29 18:55:21 UTC (rev 197360)
</span><span class="lines">@@ -339,7 +339,7 @@
</span><span class="cx"> void setMemoryCacheDisabled(bool);
</span><span class="cx"> void setFontWhitelist(API::Array*);
</span><span class="cx">
</span><del>- UserObservablePageToken userObservablePageCount()
</del><ins>+ UserObservablePageCounter::Token userObservablePageCount()
</ins><span class="cx"> {
</span><span class="cx"> return m_userObservablePageCounter.count();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (197359 => 197360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-02-29 18:51:28 UTC (rev 197359)
+++ trunk/Tools/ChangeLog 2016-02-29 18:55:21 UTC (rev 197360)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-02-29 Gavin Barraclough <barraclough@apple.com>
+
+ RefCounter<T>::Event -> RefCounterEvent
+ https://bugs.webkit.org/show_bug.cgi?id=154767
+
+ Reviewed by Darin Adler.
+
+ RefCounter<T>::Event is kinda verbose to use, and there is no need for this
+ to be specific to a particular typeof RefCounter. Move the enum class up to
+ the top level & rename to RefCounterEvent.
+
+ * TestWebKitAPI/Tests/WTF/RefCounter.cpp:
+ (TestWebKitAPI::TEST):
+
</ins><span class="cx"> 2016-02-29 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove more LLVM related cruft
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFRefCountercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/RefCounter.cpp (197359 => 197360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/RefCounter.cpp 2016-02-29 18:51:28 UTC (rev 197359)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/RefCounter.cpp 2016-02-29 18:55:21 UTC (rev 197360)
</span><span class="lines">@@ -80,11 +80,11 @@
</span><span class="cx"> {
</span><span class="cx"> // Testing (1a) - Construction with a callback.
</span><span class="cx"> TestCounter* counterPtr = nullptr;
</span><del>- TestCounter counter([&](TestCounter::Event event) {
</del><ins>+ TestCounter counter([&](RefCounterEvent event) {
</ins><span class="cx"> // Check that the callback is called at the expected times, and the correct number of times.
</span><del>- if (TestCounter::Event::Increment == event)
</del><ins>+ if (RefCounterEvent::Increment == event)
</ins><span class="cx"> EXPECT_EQ(callbackValue, IncrementExpected);
</span><del>- if (TestCounter::Event::Decrement == event)
</del><ins>+ if (RefCounterEvent::Decrement == event)
</ins><span class="cx"> EXPECT_EQ(callbackValue, DecrementExpected);
</span><span class="cx"> // return the value of the counter in the callback.
</span><span class="cx"> callbackValue = counterPtr->value();
</span></span></pre>
</div>
</div>
</body>
</html>