Changeset 238699 in webkit

Timestamp:

Nov 29, 2018 3:08:21 PM (5 years ago)

Author:

Alan Bujtas

Message:

[ContentObservation] Make WKSetObservedContentChange logic more explicit.
​https://bugs.webkit.org/show_bug.cgi?id=192183

Reviewed by Simon Fraser.

• platform/ios/wak/WKContentObservation.cpp:

(WKSetObservedContentChange):
(WebThreadRemoveObservedDOMTimer):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/ios/wak/WKContentObservation.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-11-29  Zalan Bujtas  <zalan@apple.com>
+
+        [ContentObservation] Make WKSetObservedContentChange logic more explicit.
+        https://bugs.webkit.org/show_bug.cgi?id=192183
+
+        Reviewed by Simon Fraser.
+
+        * platform/ios/wak/WKContentObservation.cpp:
+        (WKSetObservedContentChange):
+        (WebThreadRemoveObservedDOMTimer):
+
 2018-11-29  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/platform/ios/wak/WKContentObservation.cpp

@@ -56 +56 @@
 }
 
-
 void WKStartObservingDOMTimerScheduling(void)
 {
@@ -78 +77 @@
 }
 
-void WKSetObservedContentChange(WKContentChange aChange)
+void WKSetObservedContentChange(WKContentChange change)
 {
-    if (aChange > _WKContentChange && (_WKObservingDOMTimerScheduling || aChange != WKContentIndeterminateChange)) {
-        _WKContentChange = aChange;
-        if (_WKContentChange == WKContentVisibilityChange)
-            WebThreadClearObservedDOMTimers();
+    // We've already have a definite answer.
+    if (_WKContentChange == WKContentVisibilityChange)
+        return;
+
+    if (change == WKContentVisibilityChange) {
+        _WKContentChange = change;
+        // Don't need to listen to DOM timers anymore.
+        WebThreadClearObservedDOMTimers();
+        return;
     }
+
+    if (change == WKContentIndeterminateChange) {
+        _WKContentChange = change;
+        return;
+    }
+    ASSERT_NOT_REACHED();
 }