Title: [235012] trunk/Source/WebKit
- Revision
- 235012
- Author
- [email protected]
- Date
- 2018-08-18 16:20:51 -0700 (Sat, 18 Aug 2018)
Log Message
[watchOS] Add more assertions to NetworkProximityAssertion
https://bugs.webkit.org/show_bug.cgi?id=188721
Reviewed by Wenson Hsieh.
* NetworkProcess/watchos/NetworkProximityAssertion.mm:
(WebKit::NetworkProximityAssertion::hold):
(WebKit::NetworkProximityAssertion::release):
(WebKit::NetworkProximityAssertion::releaseTimerFired):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (235011 => 235012)
--- trunk/Source/WebKit/ChangeLog 2018-08-18 22:59:20 UTC (rev 235011)
+++ trunk/Source/WebKit/ChangeLog 2018-08-18 23:20:51 UTC (rev 235012)
@@ -1,3 +1,15 @@
+2018-08-18 Andy Estes <[email protected]>
+
+ [watchOS] Add more assertions to NetworkProximityAssertion
+ https://bugs.webkit.org/show_bug.cgi?id=188721
+
+ Reviewed by Wenson Hsieh.
+
+ * NetworkProcess/watchos/NetworkProximityAssertion.mm:
+ (WebKit::NetworkProximityAssertion::hold):
+ (WebKit::NetworkProximityAssertion::release):
+ (WebKit::NetworkProximityAssertion::releaseTimerFired):
+
2018-08-18 Wenson Hsieh <[email protected]>
[iOS] Paste is missing from callout bar when pasteboard only contains custom data
Modified: trunk/Source/WebKit/NetworkProcess/watchos/NetworkProximityAssertion.mm (235011 => 235012)
--- trunk/Source/WebKit/NetworkProcess/watchos/NetworkProximityAssertion.mm 2018-08-18 22:59:20 UTC (rev 235011)
+++ trunk/Source/WebKit/NetworkProcess/watchos/NetworkProximityAssertion.mm 2018-08-18 23:20:51 UTC (rev 235012)
@@ -57,20 +57,27 @@
}
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 @@
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::releaseTimerFired()
{
+ ASSERT(m_isHoldingAssertion);
+ ASSERT(m_state != State::Suspended);
+ ASSERT(!m_assertionCount);
ASSERT(!m_releaseTimer.isActive());
- ASSERT(!m_assertionCount);
- ASSERT(m_state != State::Suspended);
releaseNow();
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
