Changeset 243315 in webkit

Timestamp:

Mar 21, 2019 12:52:18 PM (5 years ago)

Author:

Alan Bujtas

Message:

[ContentChangeObserver] Cleanup reset state.
​https://bugs.webkit.org/show_bug.cgi?id=196076
<rdar://problem/49107931>

Reviewed by Simon Fraser.

stopObservingPendingActivities() is a subset of reset() and call it when we've observed a visible change.

• page/ios/ContentChangeObserver.cpp:

(WebCore::ContentChangeObserver::willNotProceedWithClick):
(WebCore::ContentChangeObserver::stopObservingPendingActivities):
(WebCore::ContentChangeObserver::reset):
(WebCore::ContentChangeObserver::didSuspendActiveDOMObjects):
(WebCore::ContentChangeObserver::willDetachPage):
(WebCore::ContentChangeObserver::adjustObservedState):
(WebCore::ContentChangeObserver::cancelPendingActivities): Deleted.

• page/ios/ContentChangeObserver.h:

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-03-21  Zalan Bujtas  <zalan@apple.com>
+
+        [ContentChangeObserver] Cleanup reset state.
+        https://bugs.webkit.org/show_bug.cgi?id=196076
+        <rdar://problem/49107931>
+
+        Reviewed by Simon Fraser.
+
+        stopObservingPendingActivities() is a subset of reset() and call it when we've observed a visible change.
+
+        * page/ios/ContentChangeObserver.cpp:
+        (WebCore::ContentChangeObserver::willNotProceedWithClick):
+        (WebCore::ContentChangeObserver::stopObservingPendingActivities):
+        (WebCore::ContentChangeObserver::reset):
+        (WebCore::ContentChangeObserver::didSuspendActiveDOMObjects):
+        (WebCore::ContentChangeObserver::willDetachPage):
+        (WebCore::ContentChangeObserver::adjustObservedState):
+        (WebCore::ContentChangeObserver::cancelPendingActivities): Deleted.
+        * page/ios/ContentChangeObserver.h:
+
 2019-03-21  Zalan Bujtas  <zalan@apple.com>
 

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

@@ -199 +199 @@
     LOG(ContentObservation, "willNotProceedWithClick: click will not happen.");
     adjustObservedState(Event::WillNotProceedWithClick);
-    // FIXME: Add support for preventDefault().
 }
 
@@ -243 +242 @@
 }
 
-void ContentChangeObserver::cancelPendingActivities()
-{
+void ContentChangeObserver::stopObservingPendingActivities()
+{
+    setShouldObserveNextStyleRecalc(false);
+    setShouldObserveDOMTimerScheduling(false);
+    setShouldObserveTransitions(false);
     clearObservedDOMTimers();
+    clearObservedTransitions();
+}
+
+void ContentChangeObserver::reset()
+{
+    stopObservingPendingActivities();
+    setHasNoChangeState();
+    setIsBetweenTouchEndAndMouseMoved(false);
+
+    m_touchEventIsBeingDispatched = false;
+    m_isInObservedStyleRecalc = false;
+    m_observedDomTimerIsBeingExecuted = false;
+    m_mouseMovedEventIsBeingDispatched = false;
+
     m_contentObservationTimer.stop();
 }
@@ -252 +268 @@
 {
     LOG(ContentObservation, "didSuspendActiveDOMObjects");
-    cancelPendingActivities();
+    reset();
 }
 
@@ -258 +274 @@
 {
     LOG(ContentObservation, "willDetachPage");
-    cancelPendingActivities();
+    reset();
 }
 
@@ -334 +350 @@
 void ContentChangeObserver::adjustObservedState(Event event)
 {
-    auto reset = [&] {
+    auto resetToStartObserving = [&] {
         setHasNoChangeState();
         clearObservedDOMTimers();
         clearObservedTransitions();
         setIsBetweenTouchEndAndMouseMoved(false);
-        ASSERT(!m_isObservingDOMTimerScheduling);
-        ASSERT(!m_isWaitingForStyleRecalc);
+        setShouldObserveNextStyleRecalc(false);
+        setShouldObserveDOMTimerScheduling(false);
+        setShouldObserveTransitions(false);
         ASSERT(!m_isInObservedStyleRecalc);
         ASSERT(!m_observedDomTimerIsBeingExecuted);
@@ -371 +388 @@
     switch (event) {
     case Event::StartedTouchStartEventDispatching:
-        reset();
+        resetToStartObserving();
         setShouldObserveDOMTimerScheduling(true);
         setShouldObserveTransitions(true);
@@ -386 +403 @@
         ASSERT(!m_document.hasPendingStyleRecalc());
         if (!isBetweenTouchEndAndMouseMoved())
-            reset();
+            resetToStartObserving();
         setIsBetweenTouchEndAndMouseMoved(false);
         setShouldObserveDOMTimerScheduling(!hasVisibleChangeState());
@@ -430 +447 @@
     case Event::ContentVisibilityChanged:
         setHasVisibleChangeState();
-        // Remove pending activities. We don't need to observe them anymore.
-        setShouldObserveNextStyleRecalc(false);
-        clearObservedDOMTimers();
-        clearObservedTransitions();
+        // Stop pending activities. We don't need to observe them anymore.
+        stopObservingPendingActivities();
         break;
     }

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

@@ -140 +140 @@
     bool isObservingContentChanges() const;
 
-    void cancelPendingActivities();
+    void stopObservingPendingActivities();
+    void reset();
 
     void setHasIndeterminateState();