<!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>[197178] 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/197178">197178</a></dd>

<dt>Author</dt> <dd>barraclough@apple.com</dd>

<dt>Date</dt> <dd>2016-02-26 10:20:07 -0800 (Fri, 26 Feb 2016)</dd>

</dl>

<h3>Log Message</h3>

<pre>

Source/WebCore:

RefCounter value changed callback should be called on all changes (not just zero edge).

https://bugs.webkit.org/show_bug.cgi?id=154699

Reviewed by Anders Carlsson.

RefCounter currently only triggers a callback when the count goes from zero

to non-zero and vice-versa. Change that, to be useful to more clients.

* page/PageThrottler.cpp:

(WebCore::PageThrottler::PageThrottler):

    - Updated for change in RefCounter callback siganture.

* platform/VNodeTracker.cpp:

(WebCore::VNodeTracker::VNodeTracker):

    - Can now use RefCounter callback to trigger checkPressureState().

(WebCore::VNodeTracker::pressureWarningTimerFired):

    - RefCounter count is now a size_t (%d -&gt; %ul).

* platform/VNodeTracker.h:

    - simplified VNodeTracker::token() [no longer needs to call checkPressureState()].

Source/WebKit2:

RefCounter value changed callback should be called on all changes (not just zero edge).

https://bugs.webkit.org/show_bug.cgi?id=154699

Reviewed by Anders Carlsson.

RefCounter currently only triggers a callback when the count goes from zero

to non-zero and vice-versa. Change that, to be useful to more clients.

* UIProcess/Plugins/PluginProcessManager.cpp:

(WebKit::PluginProcessManager::PluginProcessManager):

    - Updated for change in RefCounter callback siganture.

* UIProcess/Plugins/PluginProcessManager.h:

    - Updated for change in RefCounter callback siganture.

* UIProcess/Plugins/mac/PluginProcessManagerMac.mm:

(WebKit::PluginProcessManager::updateProcessSuppressionDisabled):

    - updated logic for enabling process supression.

* UIProcess/ProcessThrottler.cpp:

(WebKit::ProcessThrottler::ProcessThrottler):

    - Updated for change in RefCounter callback siganture.

* UIProcess/WebProcessPool.cpp:

(WebKit::WebProcessPool::WebProcessPool):

    - Updated for change in RefCounter callback siganture.

Source/WTF:

Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/197168">r197168</a>.

https://bugs.webkit.org/show_bug.cgi?id=154728

crashing on some devices (Requested by kling on #webkit).

Reverted changeset:

&quot;[Darwin] Use vm_kernel_page_size for WTF::pageSize().&quot;

https://bugs.webkit.org/show_bug.cgi?id=154726

http://trac.webkit.org/changeset/197168

Patch by Commit Queue &lt;commit-queue@webkit.org&gt; on 2016-02-26

Tools:

RefCounter value changed callback should be called on all changes (not just zero edge).

https://bugs.webkit.org/show_bug.cgi?id=154699

Reviewed by Geoff Garen.

RefCounter currently only triggers a callback when the count goes from zero

to non-zero and vice-versa. Change that, to be useful to more clients.

* TestWebKitAPI/Tests/WTF/RefCounter.cpp:

(TestWebKitAPI::TEST):

    - Updated for change in RefCounter callback siganture &amp; behaviour.</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="#trunkSourceWebCoreplatformVNodeTrackerh">trunk/Source/WebCore/platform/VNodeTracker.h</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="#trunkSourceWebKit2UIProcessWebProcessPoolcpp">trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp</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 (197177 => 197178)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WTF/ChangeLog        2016-02-26 18:17:14 UTC (rev 197177)

+++ trunk/Source/WTF/ChangeLog        2016-02-26 18:20:07 UTC (rev 197178)

</span><span class="lines">@@ -27,6 +27,28 @@

</span><span class="cx"> 

</span><span class="cx"> 2016-02-25  Gavin Barraclough  &lt;barraclough@apple.com&gt;

</span><span class="cx"> 

<ins>+        RefCounter value changed callback should be called on all changes (not just zero edge).

+        https://bugs.webkit.org/show_bug.cgi?id=154699

+

+        Reviewed by Anders Carlsson.

+

+        RefCounter currently only triggers a callback when the count goes from zero

+        to non-zero and vice-versa. Change that, to be useful to more clients.

+

+        * wtf/RefCounter.h:

+        (WTF::RefCounter::Count::Count):

+        (WTF::RefCounter::RefCounter):

+            - Removed superfluous WTF_EXPORT_PRIVATE.

+        (WTF::RefCounter::value):

+            - Changed value() to a size_t.

+        (WTF::RefCounter&lt;T&gt;::Count::ref):

+        (WTF::RefCounter&lt;T&gt;::Count::deref):

+            - Trigger the callback on all increments/decrements.

+        (WTF::RefCounter&lt;T&gt;::RefCounter):

+            - Changed siganture of callback.

+

+2016-02-25  Gavin Barraclough  &lt;barraclough@apple.com&gt;

+

</ins><span class="cx">         Replace RefCounter::Token implementation with RefPtr

</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=154698

</span><span class="cx"> 

</span></span></pre></div>

<a id="trunkSourceWTFwtfRefCounterh"></a>

<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/RefCounter.h (197177 => 197178)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WTF/wtf/RefCounter.h        2016-02-26 18:17:14 UTC (rev 197177)

+++ trunk/Source/WTF/wtf/RefCounter.h        2016-02-26 18:20:07 UTC (rev 197178)

</span><span class="lines">@@ -52,13 +52,15 @@

</span><span class="cx">         }

</span><span class="cx"> 

</span><span class="cx">         RefCounter* m_refCounter;

</span><del>-        unsigned m_value;

</del><ins>+        size_t m_value;

</ins><span class="cx">     };

</span><span class="cx"> 

</span><span class="cx"> public:

</span><span class="cx">     using Token = RefPtr&lt;Count&gt;;

</span><ins>+    enum class Event { Decrement, Increment };

+    using ValueChangeFunction = std::function&lt;void (Event)&gt;;

</ins><span class="cx"> 

</span><del>-    RefCounter(std::function&lt;void(bool)&gt; = [](bool) { });

</del><ins>+    RefCounter(ValueChangeFunction = nullptr);

</ins><span class="cx">     ~RefCounter();

</span><span class="cx"> 

</span><span class="cx">     Token count() const

</span><span class="lines">@@ -66,47 +68,43 @@

</span><span class="cx">         return m_count;

</span><span class="cx">     }

</span><span class="cx"> 

</span><del>-    unsigned value() const

</del><ins>+    size_t value() const

</ins><span class="cx">     {

</span><span class="cx">         return m_count-&gt;m_value;

</span><span class="cx">     }

</span><span class="cx"> 

</span><span class="cx"> private:

</span><del>-    std::function&lt;void(bool)&gt; m_valueDidChange;

</del><ins>+    ValueChangeFunction m_valueDidChange;

</ins><span class="cx">     Count* m_count;

</span><span class="cx"> };

</span><span class="cx"> 

</span><span class="cx"> template&lt;typename T&gt;

</span><span class="cx"> inline void RefCounter&lt;T&gt;::Count::ref()

</span><span class="cx"> {

</span><del>-    bool valueWasZero = !m_value;

</del><span class="cx">     ++m_value;

</span><del>-    

-    if (valueWasZero &amp;&amp; m_refCounter)

-        m_refCounter-&gt;m_valueDidChange(true);

</del><ins>+    if (m_refCounter &amp;&amp; m_refCounter-&gt;m_valueDidChange)

+        m_refCounter-&gt;m_valueDidChange(Event::Increment);

</ins><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> template&lt;typename T&gt;

</span><span class="cx"> inline void RefCounter&lt;T&gt;::Count::deref()

</span><span class="cx"> {

</span><span class="cx">     ASSERT(m_value);

</span><ins>+

</ins><span class="cx">     --m_value;

</span><ins>+    if (m_refCounter &amp;&amp; m_refCounter-&gt;m_valueDidChange)

+        m_refCounter-&gt;m_valueDidChange(Event::Decrement);

</ins><span class="cx"> 

</span><del>-    if (m_value)

-        return;

-

</del><span class="cx">     // The Count object is kept alive so long as either the RefCounter that created it remains

<span class="cx">     // allocated, or so long as its reference count is non-zero.

</span><span class="cx">     // If the RefCounter has already been deallocted then delete the Count when its reference

<span class="cx">     // count reaches zero.

</span><del>-    if (m_refCounter)

-        m_refCounter-&gt;m_valueDidChange(false);

-    else

</del><ins>+    if (!m_refCounter &amp;&amp; !m_value)

</ins><span class="cx">         delete this;

</span><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> template&lt;typename T&gt;

</span><del>-inline RefCounter&lt;T&gt;::RefCounter(std::function&lt;void(bool)&gt; valueDidChange)

</del><ins>+inline RefCounter&lt;T&gt;::RefCounter(ValueChangeFunction valueDidChange)

</ins><span class="cx">     : m_valueDidChange(valueDidChange)

</span><span class="cx">     , m_count(new Count(*this))

</span><span class="cx"> {

</span></span></pre></div>

<a id="trunkSourceWebCoreChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (197177 => 197178)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-02-26 18:17:14 UTC (rev 197177)

+++ trunk/Source/WebCore/ChangeLog        2016-02-26 18:20:07 UTC (rev 197178)

</span><span class="lines">@@ -1,3 +1,24 @@

</span><ins>+2016-02-25  Gavin Barraclough  &lt;barraclough@apple.com&gt;

+

+        RefCounter value changed callback should be called on all changes (not just zero edge).

+        https://bugs.webkit.org/show_bug.cgi?id=154699

+

+        Reviewed by Anders Carlsson.

+

+        RefCounter currently only triggers a callback when the count goes from zero

+        to non-zero and vice-versa. Change that, to be useful to more clients.

+

+        * page/PageThrottler.cpp:

+        (WebCore::PageThrottler::PageThrottler):

+            - Updated for change in RefCounter callback siganture.

+        * platform/VNodeTracker.cpp:

+        (WebCore::VNodeTracker::VNodeTracker):

+            - Can now use RefCounter callback to trigger checkPressureState().

+        (WebCore::VNodeTracker::pressureWarningTimerFired):

+            - RefCounter count is now a size_t (%d -&gt; %ul).

+        * platform/VNodeTracker.h:

+            - simplified VNodeTracker::token() [no longer needs to call checkPressureState()].

+

</ins><span class="cx"> 2016-02-26  Andreas Kling  &lt;akling@apple.com&gt;

</span><span class="cx"> 

<span class="cx">         Remove unused CFNetwork disk cache mmap optimization in WebKit2.

</span></span></pre></div>

<a id="trunkSourceWebCorepagePageThrottlercpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageThrottler.cpp (197177 => 197178)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/page/PageThrottler.cpp        2016-02-26 18:17:14 UTC (rev 197177)

+++ trunk/Source/WebCore/page/PageThrottler.cpp        2016-02-26 18:20:07 UTC (rev 197178)

</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](bool value) { setActivityFlag(PageActivityState::MediaActivity, value); })

-    , m_pageLoadActivityCounter([this](bool value) { setActivityFlag(PageActivityState::PageLoadActivity, value); })

</del><ins>+    , m_mediaActivityCounter([this](PageActivityCounter::Event) { setActivityFlag(PageActivityState::MediaActivity, m_mediaActivityCounter.value()); })

+    , m_pageLoadActivityCounter([this](PageActivityCounter::Event) { 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 (197177 => 197178)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/platform/VNodeTracker.cpp        2016-02-26 18:17:14 UTC (rev 197177)

+++ trunk/Source/WebCore/platform/VNodeTracker.cpp        2016-02-26 18:20:07 UTC (rev 197178)

</span><span class="lines">@@ -39,7 +39,8 @@

</span><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> VNodeTracker::VNodeTracker()

</span><del>-    : m_pressureWarningTimer(*this, &amp;VNodeTracker::pressureWarningTimerFired)

</del><ins>+    : m_vnodeCounter([this](VNodeCounter::Event event) { if (event == VNodeCounter::Event::Increment) checkPressureState(); })

+    , m_pressureWarningTimer(*this, &amp;VNodeTracker::pressureWarningTimerFired)

</ins><span class="cx">     , m_lastWarningTime(std::chrono::steady_clock::now())

</span><span class="cx"> {

</span><span class="cx">     platformInitialize();

</span><span class="lines">@@ -67,7 +68,7 @@

</span><span class="cx">     unsigned vnodeCount = m_vnodeCounter.value();

</span><span class="cx">     auto critical = vnodeCount &gt; m_hardVNodeLimit ? Critical::Yes : Critical::No;

</span><span class="cx">     m_pressureHandler(critical);

</span><del>-    LOG(MemoryPressure, &quot;vnode pressure handler freed %d vnodes out of %u (critical pressure: %s)&quot;, vnodeCount - m_vnodeCounter.value(), vnodeCount, critical == Critical::Yes ? &quot;Yes&quot; : &quot;No&quot;);

</del><ins>+    LOG(MemoryPressure, &quot;vnode pressure handler freed %lu vnodes out of %u (critical pressure: %s)&quot;, vnodeCount - m_vnodeCounter.value(), vnodeCount, critical == Critical::Yes ? &quot;Yes&quot; : &quot;No&quot;);

</ins><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> std::chrono::milliseconds VNodeTracker::nextPressureWarningInterval() const

</span></span></pre></div>

<a id="trunkSourceWebCoreplatformVNodeTrackerh"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/VNodeTracker.h (197177 => 197178)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/platform/VNodeTracker.h        2016-02-26 18:17:14 UTC (rev 197177)

+++ trunk/Source/WebCore/platform/VNodeTracker.h        2016-02-26 18:20:07 UTC (rev 197178)

</span><span class="lines">@@ -72,12 +72,7 @@

</span><span class="cx"> 

</span><span class="cx"> inline auto VNodeTracker::token() -&gt; Token

</span><span class="cx"> {

</span><del>-    if (!m_pressureHandler)

-        return Token();

-

-    Token token(m_vnodeCounter.count());

-    checkPressureState();

-    return token;

</del><ins>+    return m_pressureHandler ? m_vnodeCounter.count() : Token();

</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 (197177 => 197178)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/ChangeLog        2016-02-26 18:17:14 UTC (rev 197177)

+++ trunk/Source/WebKit2/ChangeLog        2016-02-26 18:20:07 UTC (rev 197178)

</span><span class="lines">@@ -1,3 +1,28 @@

</span><ins>+2016-02-25  Gavin Barraclough  &lt;barraclough@apple.com&gt;

+

+        RefCounter value changed callback should be called on all changes (not just zero edge).

+        https://bugs.webkit.org/show_bug.cgi?id=154699

+

+        Reviewed by Anders Carlsson.

+

+        RefCounter currently only triggers a callback when the count goes from zero

+        to non-zero and vice-versa. Change that, to be useful to more clients.

+

+        * UIProcess/Plugins/PluginProcessManager.cpp:

+        (WebKit::PluginProcessManager::PluginProcessManager):

+            - Updated for change in RefCounter callback siganture.

+        * UIProcess/Plugins/PluginProcessManager.h:

+            - Updated for change in RefCounter callback siganture.

+        * UIProcess/Plugins/mac/PluginProcessManagerMac.mm:

+        (WebKit::PluginProcessManager::updateProcessSuppressionDisabled):

+            - updated logic for enabling process supression.

+        * UIProcess/ProcessThrottler.cpp:

+        (WebKit::ProcessThrottler::ProcessThrottler):

+            - Updated for change in RefCounter callback siganture.

+        * UIProcess/WebProcessPool.cpp:

+        (WebKit::WebProcessPool::WebProcessPool):

+            - Updated for change in RefCounter callback siganture.

+

</ins><span class="cx"> 2016-02-26  Andreas Kling  &lt;akling@apple.com&gt;

</span><span class="cx"> 

<span class="cx">         Remove unused CFNetwork disk cache mmap optimization in WebKit2.

</span></span></pre></div>

<a id="trunkSourceWebKit2UIProcessPluginsPluginProcessManagercpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp (197177 => 197178)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp        2016-02-26 18:17:14 UTC (rev 197177)

+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp        2016-02-26 18:20:07 UTC (rev 197178)

</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](bool value) { updateProcessSuppressionDisabled(value); })

</del><ins>+    : m_processSuppressionDisabledForPageCounter([this](ProcessSuppressionDisabledCounter::Event 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 (197177 => 197178)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h        2016-02-26 18:17:14 UTC (rev 197177)

+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h        2016-02-26 18:20:07 UTC (rev 197178)

</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(bool);

</del><ins>+    void updateProcessSuppressionDisabled(ProcessSuppressionDisabledCounter::Event);

</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 (197177 => 197178)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessManagerMac.mm        2016-02-26 18:17:14 UTC (rev 197177)

+++ trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessManagerMac.mm        2016-02-26 18:20:07 UTC (rev 197178)

</span><span class="lines">@@ -32,10 +32,17 @@

</span><span class="cx"> 

</span><span class="cx"> namespace WebKit {

</span><span class="cx"> 

</span><del>-void PluginProcessManager::updateProcessSuppressionDisabled(bool disabled)

</del><ins>+void PluginProcessManager::updateProcessSuppressionDisabled(ProcessSuppressionDisabledCounter::Event event)

</ins><span class="cx"> {

</span><del>-    bool enabled = !disabled;

</del><ins>+    size_t disableCount = m_processSuppressionDisabledForPageCounter.value();

</ins><span class="cx"> 

<ins>+    // We only care about zero/non-zero edge changes; ignore cases where the count was previously non-zero, and still is.

+    if (disableCount &gt;= 2 || (disableCount == 1 &amp;&amp; event == ProcessSuppressionDisabledCounter::Event::Decrement))

+        return;

+    ASSERT((event == ProcessSuppressionDisabledCounter::Event::Increment &amp;&amp; disableCount == 1)

+        || (event == ProcessSuppressionDisabledCounter::Event::Decrement &amp;&amp; !disableCount));

+

+    bool enabled = !disableCount;

</ins><span class="cx">     for (auto&amp; pluginProcess : m_pluginProcesses)

</span><span class="cx">         pluginProcess-&gt;setProcessSuppressionEnabled(enabled);

</span><span class="cx"> }

</span></span></pre></div>

<a id="trunkSourceWebKit2UIProcessProcessThrottlercpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ProcessThrottler.cpp (197177 => 197178)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/UIProcess/ProcessThrottler.cpp        2016-02-26 18:17:14 UTC (rev 197177)

+++ trunk/Source/WebKit2/UIProcess/ProcessThrottler.cpp        2016-02-26 18:20:07 UTC (rev 197178)

</span><span class="lines">@@ -35,8 +35,8 @@

</span><span class="cx"> ProcessThrottler::ProcessThrottler(ProcessThrottlerClient&amp; process)

</span><span class="cx">     : m_process(process)

</span><span class="cx">     , m_suspendTimer(RunLoop::main(), this, &amp;ProcessThrottler::suspendTimerFired)

</span><del>-    , m_foregroundCounter([this](bool) { updateAssertion(); })

-    , m_backgroundCounter([this](bool) { updateAssertion(); })

</del><ins>+    , m_foregroundCounter([this](ForegroundActivityCounter::Event) { updateAssertion(); })

+    , m_backgroundCounter([this](BackgroundActivityCounter::Event) { updateAssertion(); })

</ins><span class="cx">     , m_suspendMessageCount(0)

</span><span class="cx"> {

</span><span class="cx"> }

</span></span></pre></div>

<a id="trunkSourceWebKit2UIProcessWebProcessPoolcpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (197177 => 197178)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp        2016-02-26 18:17:14 UTC (rev 197177)

+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp        2016-02-26 18:20:07 UTC (rev 197178)

</span><span class="lines">@@ -158,8 +158,8 @@

</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](bool) { updateProcessSuppressionState(); })

-    , m_processSuppressionDisabledForPageCounter([this](bool) { updateProcessSuppressionState(); })

</del><ins>+    , m_userObservablePageCounter([this](UserObservablePageCounter::Event) { updateProcessSuppressionState(); })

+    , m_processSuppressionDisabledForPageCounter([this](ProcessSuppressionDisabledCounter::Event) { updateProcessSuppressionState(); })

</ins><span class="cx"> {

</span><span class="cx">     for (auto&amp; scheme : m_configuration-&gt;alwaysRevalidatedURLSchemes())

</span><span class="cx">         m_schemesToRegisterAsAlwaysRevalidated.add(scheme);

</span></span></pre></div>

<a id="trunkToolsChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (197177 => 197178)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Tools/ChangeLog        2016-02-26 18:17:14 UTC (rev 197177)

+++ trunk/Tools/ChangeLog        2016-02-26 18:20:07 UTC (rev 197178)

</span><span class="lines">@@ -1,3 +1,17 @@

</span><ins>+2016-02-25  Gavin Barraclough  &lt;barraclough@apple.com&gt;

+

+        RefCounter value changed callback should be called on all changes (not just zero edge).

+        https://bugs.webkit.org/show_bug.cgi?id=154699

+

+        Reviewed by Geoff Garen.

+

+        RefCounter currently only triggers a callback when the count goes from zero

+        to non-zero and vice-versa. Change that, to be useful to more clients.

+

+        * TestWebKitAPI/Tests/WTF/RefCounter.cpp:

+        (TestWebKitAPI::TEST):

+            - Updated for change in RefCounter callback siganture &amp; behaviour.

+

</ins><span class="cx"> 2016-02-25  Sam Weinig  &lt;sam@webkit.org&gt;

</span><span class="cx"> 

</span><span class="cx">         Allow WKUserScripts to be run in isolated worlds

</span></span></pre></div>

<a id="trunkToolsTestWebKitAPITestsWTFRefCountercpp"></a>

<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/RefCounter.cpp (197177 => 197178)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/RefCounter.cpp        2016-02-26 18:17:14 UTC (rev 197177)

+++ trunk/Tools/TestWebKitAPI/Tests/WTF/RefCounter.cpp        2016-02-26 18:20:07 UTC (rev 197178)

</span><span class="lines">@@ -31,7 +31,8 @@

</span><span class="cx"> 

</span><span class="cx"> namespace TestWebKitAPI {

</span><span class="cx"> 

</span><del>-static const int CallbackExpected = 0xC0FFEE;

</del><ins>+static const int IncrementExpected = 0xC0FFEE1;

+static const int DecrementExpected = 0xC0FFEE2;

</ins><span class="cx"> static const int CallbackNotExpected = 0xDECAF;

</span><span class="cx"> 

</span><span class="cx"> enum TestCounterType { };

</span><span class="lines">@@ -79,54 +80,64 @@

</span><span class="cx">     {

<span class="cx">         // Testing (1a) - Construction with a callback.

</span><span class="cx">         TestCounter* counterPtr = nullptr;

</span><del>-        TestCounter counter([&amp;](bool value) {

</del><ins>+        TestCounter counter([&amp;](TestCounter::Event event) {

</ins><span class="cx">             // Check that the callback is called at the expected times, and the correct number of times.

</span><del>-            EXPECT_EQ(callbackValue, CallbackExpected);

-            // Value provided should be equal to the counter value.

-            EXPECT_EQ(value, counterPtr-&gt;value());

</del><ins>+            if (TestCounter::Event::Increment == event)

+                EXPECT_EQ(callbackValue, IncrementExpected);

+            if (TestCounter::Event::Decrement == event)

+                EXPECT_EQ(callbackValue, DecrementExpected);

</ins><span class="cx">             // return the value of the counter in the callback.

</span><del>-            callbackValue = value;

</del><ins>+            callbackValue = counterPtr-&gt;value();

</ins><span class="cx">         });

</span><span class="cx">         counterPtr = &amp;counter;

</span><span class="cx">         // Testing (4a) - after construction value() is 0.

</span><span class="cx">         EXPECT_EQ(0, static_cast&lt;int&gt;(counter.value()));

</span><span class="cx"> 

</span><span class="cx">         // Testing (3a) - ref with callback from 0 -&gt; 1.

</span><del>-        callbackValue = CallbackExpected;

</del><ins>+        callbackValue = IncrementExpected;

</ins><span class="cx">         TokenType incTo1(counter.count());

</span><span class="cx">         // Testing (4b) &amp; (4c) - values within &amp; after callback.

</span><del>-        EXPECT_EQ(true, callbackValue);

</del><ins>+        EXPECT_EQ(1, callbackValue);

</ins><span class="cx">         EXPECT_EQ(1, static_cast&lt;int&gt;(counter.value()));

</span><span class="cx"> 

</span><span class="cx">         // Testing (3b) - ref with callback from 1 -&gt; 2.

</span><ins>+        callbackValue = IncrementExpected;

</ins><span class="cx">         TokenType incTo2(incTo1);

</span><span class="cx">         // Testing (4b) &amp; (4c) - values within &amp; after callback.

</span><ins>+        EXPECT_EQ(2, callbackValue);

</ins><span class="cx">         EXPECT_EQ(2, static_cast&lt;int&gt;(counter.value()));

</span><span class="cx"> 

</span><span class="cx">         // Testing (3c) - deref with callback from &gt;1 -&gt; 1.

</span><ins>+        callbackValue = DecrementExpected;

</ins><span class="cx">         incTo1 = nullptr;

</span><span class="cx">         // Testing (4b) &amp; (4c) - values within &amp; after callback.

</span><ins>+        EXPECT_EQ(1, callbackValue);

</ins><span class="cx">         EXPECT_EQ(1, static_cast&lt;int&gt;(counter.value()));

</span><span class="cx"> 

</span><span class="cx">         {

<span class="cx">             // Testing (3j) - ref using a Ref rather than a RefPtr.

</span><ins>+            callbackValue = IncrementExpected;

</ins><span class="cx">             TokenType incTo2Again(counter.count());

</span><span class="cx">             // Testing (4b) &amp; (4c) - values within &amp; after callback.

</span><ins>+            EXPECT_EQ(2, callbackValue);

</ins><span class="cx">             EXPECT_EQ(2, static_cast&lt;int&gt;(counter.value()));

<span class="cx">             // Testing (3k) - deref using a Ref rather than a RefPtr.

</span><ins>+

+            callbackValue = DecrementExpected;

</ins><span class="cx">         }

</span><ins>+        EXPECT_EQ(1, callbackValue);

</ins><span class="cx">         EXPECT_EQ(1, static_cast&lt;int&gt;(counter.value()));

</span><span class="cx">         // Testing (4b) &amp; (4c) - values within &amp; after callback.

</span><span class="cx"> 

</span><span class="cx">         // Testing (3d) - deref with callback from 1 -&gt; 0.

</span><del>-        callbackValue = CallbackExpected;

</del><ins>+        callbackValue = DecrementExpected;

</ins><span class="cx">         incTo2 = nullptr;

</span><span class="cx">         // Testing (4b) &amp; (4c) - values within &amp; after callback.

</span><span class="cx">         EXPECT_EQ(0, callbackValue);

</span><span class="cx">         EXPECT_EQ(0, static_cast&lt;int&gt;(counter.value()));

</span><span class="cx"> 

<span class="cx">         // Testing (2a) - Destruction where the TestCounter::Count has a non-zero reference count.

</span><del>-        callbackValue = CallbackExpected;

</del><ins>+        callbackValue = IncrementExpected;

</ins><span class="cx">         incTo1Again = counter.count();

</span><span class="cx">         EXPECT_EQ(1, callbackValue);

</span><span class="cx">         EXPECT_EQ(1, static_cast&lt;int&gt;(counter.value()));

</span></span></pre>

</div>

</div>

</body>

</html>