Changeset 242654 in webkit

Timestamp:

Mar 8, 2019, 1:11:41 PM (7 years ago)

Author:

Alan Bujtas

Message:

[ContentChangeObserver] Add StartedDOMTimerExecution and StartedStyleRecalc
​https://bugs.webkit.org/show_bug.cgi?id=195463
<rdar://problem/48714762>

Reviewed by Simon Fraser.

This is in preparation for introducing m_isObservingContentChanges flag to track observing state across events (touchStart -> mouseMoved).

• page/ios/ContentChangeObserver.cpp:

(WebCore::ContentChangeObserver::domTimerExecuteDidStart):
(WebCore::ContentChangeObserver::styleRecalcDidStart):
(WebCore::ContentChangeObserver::styleRecalcDidFinish):
(WebCore::ContentChangeObserver::setShouldObserveNextStyleRecalc):
(WebCore::ContentChangeObserver::adjustObservedState):

• page/ios/ContentChangeObserver.h:

(WebCore::ContentChangeObserver::isObservingPendingStyleRecalc const):
(WebCore::ContentChangeObserver::isObservingStyleRecalc const): Deleted.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-03-08  Zalan Bujtas  <zalan@apple.com>
+
+        [ContentChangeObserver] Add StartedDOMTimerExecution and StartedStyleRecalc
+        https://bugs.webkit.org/show_bug.cgi?id=195463
+        <rdar://problem/48714762>
+
+        Reviewed by Simon Fraser.
+
+        This is in preparation for introducing m_isObservingContentChanges flag to track observing state across events (touchStart -> mouseMoved).
+
+        * page/ios/ContentChangeObserver.cpp:
+        (WebCore::ContentChangeObserver::domTimerExecuteDidStart):
+        (WebCore::ContentChangeObserver::styleRecalcDidStart):
+        (WebCore::ContentChangeObserver::styleRecalcDidFinish):
+        (WebCore::ContentChangeObserver::setShouldObserveNextStyleRecalc):
+        (WebCore::ContentChangeObserver::adjustObservedState):
+        * page/ios/ContentChangeObserver.h:
+        (WebCore::ContentChangeObserver::isObservingPendingStyleRecalc const):
+        (WebCore::ContentChangeObserver::isObservingStyleRecalc const): Deleted.
+
 2019-03-08  Chris Fleizach  <cfleizach@apple.com>
 

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

@@ -95 +95 @@
 
     m_domTimerIsBeingExecuted = true;
+    adjustObservedState(Event::StartedDOMTimerExecution);
 }
 
@@ -111 +112 @@
 void ContentChangeObserver::styleRecalcDidStart()
 {
-    if (!isObservingStyleRecalc())
+    if (!isWaitingForStyleRecalc())
         return;
     if (hasVisibleChangeState())
@@ -118 +119 @@
 
     m_styleRecalcIsBeingExecuted = true;
+    adjustObservedState(Event::StartedStyleRecalc);
 }
 
 void ContentChangeObserver::styleRecalcDidFinish()
 {
-    if (!isObservingStyleRecalc())
+    if (!isWaitingForStyleRecalc())
         return;
     LOG(ContentObservation, "stopObservingStyleRecalc: stop observing style recalc");
 
     m_styleRecalcIsBeingExecuted = false;
-    setShouldObserveNextStyleRecalc(false);
-    adjustObservedState(Event::StyleRecalcFinished);
+    adjustObservedState(Event::EndedStyleRecalc);
 }
 
@@ -210 +211 @@
     if (shouldObserve)
         LOG(ContentObservation, "Wait until next style recalc fires.");
-    m_isObservingStyleRecalc = shouldObserve;
+    m_isWaitingForStyleRecalc = shouldObserve;
 }
 
@@ -257 +258 @@
         m_isMouseMovedPrecededByTouch = false;
         break;
+    case Event::StartedDOMTimerExecution:
+    case Event::StartedStyleRecalc:
+        ASSERT(observedContentChange() == WKContentIndeterminateChange);
+        break;
     case Event::EndedTouchStartEventDispatching:
     case Event::EndedMouseMovedEventDispatching:
@@ -267 +272 @@
         setHasIndeterminateState();
         break;
+    case Event::EndedStyleRecalc:
+        setShouldObserveNextStyleRecalc(false);
+        FALLTHROUGH;
     case Event::RemovedDOMTimer:
-    case Event::StyleRecalcFinished:
     case Event::EndedDOMTimerExecution:
     case Event::EndedFixedObservationTimeWindow:

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

@@ -118 +118 @@
     void styleRecalcDidFinish();
     void setShouldObserveNextStyleRecalc(bool);
-    bool isObservingStyleRecalc() const { return m_isObservingStyleRecalc; }
+    bool isWaitingForStyleRecalc() const { return m_isWaitingForStyleRecalc; }
 
     bool isObservingContentChanges() const { return m_mouseMovedEventIsBeingDispatched || m_touchEventIsBeingDispatched || m_domTimerIsBeingExecuted || m_styleRecalcIsBeingExecuted || m_contentObservationTimer.isActive(); }
@@ -146 +146 @@
         InstalledDOMTimer,
         RemovedDOMTimer,
+        StartedDOMTimerExecution,
         EndedDOMTimerExecution,
-        StyleRecalcFinished,
-        ContentVisibilityChanged,
+        StartedStyleRecalc,
+        EndedStyleRecalc,
         StartedFixedObservationTimeWindow,
-        EndedFixedObservationTimeWindow
+        EndedFixedObservationTimeWindow,
+        ContentVisibilityChanged
     };
     void adjustObservedState(Event);
@@ -158 +160 @@
     HashSet<const DOMTimer*> m_DOMTimerList;
     bool m_touchEventIsBeingDispatched { false };
-    bool m_isObservingStyleRecalc { false };
+    bool m_isWaitingForStyleRecalc { false };
     bool m_styleRecalcIsBeingExecuted { false };
     bool m_isObservingDOMTimerScheduling { false };