Attachment 347448 Details for Bug 188721 – Patch

[patch] Patch

bug-188721-20180818112616.patch (text/plain), 2.56 KB, created by Andy Estes on 2018-08-18 11:26:16 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Andy Estes

Created: 2018-08-18 11:26:16 PDT

Size: 2.56 KB

patch

obsolete

>Subversion Revision: 234970
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 95ee5af31ae12f636a72646bc09fe634950f7406..2e96cfc91d3f29c2d6900a74249c26d9ef8874ab 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,15 @@
>+2018-08-18  Andy Estes  <aestes@apple.com>
>+
>+        [watchOS] Add more assertions to NetworkProximityAssertion
>+        https://bugs.webkit.org/show_bug.cgi?id=188721
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * NetworkProcess/watchos/NetworkProximityAssertion.mm:
>+        (WebKit::NetworkProximityAssertion::hold):
>+        (WebKit::NetworkProximityAssertion::release):
>+        (WebKit::NetworkProximityAssertion::releaseTimerFired):
>+
> 2018-08-16  Sihui Liu  <sihui_liu@apple.com>
> 
>         Remove unused parentProcessName from NetworkProcessCreationParameters
>diff --git a/Source/WebKit/NetworkProcess/watchos/NetworkProximityAssertion.mm b/Source/WebKit/NetworkProcess/watchos/NetworkProximityAssertion.mm
>index 1e71c6cde27c11d63c2bd18348987ff7d8071de5..178f3b437ed1c18e76c8a85f588977359fc7ea41 100644
>--- a/Source/WebKit/NetworkProcess/watchos/NetworkProximityAssertion.mm
>+++ b/Source/WebKit/NetworkProcess/watchos/NetworkProximityAssertion.mm
>@@ -57,20 +57,27 @@ void NetworkProximityAssertion::hold()
>     }
> 
>     if (m_releaseTimer.isActive()) {
>+        ASSERT(m_isHoldingAssertion);
>         m_releaseTimer.stop();
>         return;
>     }
> 
>-    if (m_assertionCount == 1)
>+    if (m_assertionCount == 1) {
>+        ASSERT(!m_isHoldingAssertion);
>         holdNow();
>+    }
>+
>+    ASSERT(m_isHoldingAssertion);
> }
> 
> void NetworkProximityAssertion::release()
> {
>     ASSERT(m_assertionCount);
>-    if (!m_assertionCount || --m_assertionCount)
>+    if (!m_assertionCount)
>         return;
> 
>+    --m_assertionCount;
>+
>     if (m_state == State::Suspended) {
>         ASSERT(!m_isHoldingAssertion);
>         ASSERT(!m_releaseTimer.isActive());
>@@ -78,7 +85,10 @@ void NetworkProximityAssertion::release()
>         return;
>     }
> 
>-    m_releaseTimer.restart();
>+    ASSERT(m_isHoldingAssertion);
>+    ASSERT(!m_releaseTimer.isActive());
>+    if (!m_assertionCount)
>+        m_releaseTimer.restart();
> }
> 
> void NetworkProximityAssertion::resume(ResumptionReason)
>@@ -135,9 +145,10 @@ void NetworkProximityAssertion::suspendNow()
> 
> void NetworkProximityAssertion::releaseTimerFired()
> {
>-    ASSERT(!m_releaseTimer.isActive());
>-    ASSERT(!m_assertionCount);
>+    ASSERT(m_isHoldingAssertion);
>     ASSERT(m_state != State::Suspended);
>+    ASSERT(!m_assertionCount);
>+    ASSERT(!m_releaseTimer.isActive());
>     releaseNow();
> }
>

Actions: View | Formatted Diff | Diff

Attachments on bug 188721: 347448