Changeset 248641 in webkit

Timestamp:

Aug 13, 2019 4:03:44 PM (5 years ago)

Author:

Alan Bujtas

Message:

[ContentChangeObserver] adjustStateAndNotifyContentChangeIfNeeded should check isObservationTimeWindowActive()
​https://bugs.webkit.org/show_bug.cgi?id=200687
<rdar://problem/54271221>

Reviewed by Simon Fraser.

Move the check to adjustStateAndNotifyContentChangeIfNeeded.

• page/ios/ContentChangeObserver.cpp:

(WebCore::ContentChangeObserver::adjustObservedState):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/ios/ContentChangeObserver.cpp (modified) (6 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-08-13  Zalan Bujtas  <zalan@apple.com>
+
+        [ContentChangeObserver] adjustStateAndNotifyContentChangeIfNeeded should check isObservationTimeWindowActive()
+        https://bugs.webkit.org/show_bug.cgi?id=200687
+        <rdar://problem/54271221>
+
+        Reviewed by Simon Fraser.
+
+        Move the check to adjustStateAndNotifyContentChangeIfNeeded.
+
+        * page/ios/ContentChangeObserver.cpp:
+        (WebCore::ContentChangeObserver::adjustObservedState):
+
 2019-08-13  John Wilander  <wilander@apple.com>
 

trunk/Source/WebCore/page/ios/ContentChangeObserver.cpp

@@ -495 +495 @@
     };
 
-    auto adjustStateAndNotifyContentChangeIfNeeded = [&] {
-        // Demote to "no change" when there's no pending activity anymore.
+    auto notifyClientIfNeeded = [&] {
+        // First demote to "no change" if there's no pending activity anymore.
         if (observedContentChange() == WKContentIndeterminateChange && !hasPendingActivity())
             setHasNoChangeState();
 
-        // Do not notify the client unless we couldn't make the decision synchronously.
+        if (isBetweenTouchEndAndMouseMoved()) {
+            LOG(ContentObservation, "adjustStateAndNotifyContentChangeIfNeeded: Not reached mouseMoved yet. No need to notify the client.");
+            return;
+        }
         if (m_mouseMovedEventIsBeingDispatched) {
             LOG(ContentObservation, "adjustStateAndNotifyContentChangeIfNeeded: in mouseMoved call. No need to notify the client.");
             return;
         }
-        if (isBetweenTouchEndAndMouseMoved()) {
-            LOG(ContentObservation, "adjustStateAndNotifyContentChangeIfNeeded: Not reached mouseMoved yet. No need to notify the client.");
+        if (isObservationTimeWindowActive()) {
+            LOG(ContentObservation, "adjustStateAndNotifyContentChangeIfNeeded: Inside the fixed window observation. No need to notify the client.");
             return;
         }
@@ -552 +555 @@
         }
         if (event == Event::EndedFixedObservationTimeWindow) {
-            adjustStateAndNotifyContentChangeIfNeeded();
+            notifyClientIfNeeded();
             return;
         }
@@ -564 +567 @@
         }
         if (event == Event::RemovedDOMTimer || event == Event::CanceledTransition) {
-            if (!isObservationTimeWindowActive())
-                adjustStateAndNotifyContentChangeIfNeeded();
+            notifyClientIfNeeded();
             return;
         }
@@ -573 +575 @@
         }
         if (event == Event::EndedDOMTimerExecution) {
-            setShouldObserveNextStyleRecalc(m_document.hasPendingStyleRecalc());
-            if (!isObservationTimeWindowActive())
-                adjustStateAndNotifyContentChangeIfNeeded();
+            if (m_document.hasPendingStyleRecalc()) {
+                setShouldObserveNextStyleRecalc(true);
+                return;
+            }
+            notifyClientIfNeeded();
             return;
         }
@@ -584 +588 @@
                 // We need to start observing this style change synchronously.
                 m_isInObservedStyleRecalc = true;
-            } else
-                setShouldObserveNextStyleRecalc(true);
+                return;
+            }
+            setShouldObserveNextStyleRecalc(true);
             return;
         }
         if (event == Event::CompletedTransition) {
-            if (m_document.inStyleRecalc())
+            if (m_document.inStyleRecalc()) {
                 m_isInObservedStyleRecalc = true;
-            else if (!isObservationTimeWindowActive())
-                adjustStateAndNotifyContentChangeIfNeeded();
+                return;
+            }
+            notifyClientIfNeeded();
             return;
         }
@@ -601 +607 @@
         }
         if (event == Event::EndedStyleRecalc) {
-            if (!isObservationTimeWindowActive())
-                adjustStateAndNotifyContentChangeIfNeeded();
+            notifyClientIfNeeded();
             return;
         }