Changeset 242102 in webkit

Timestamp:

Feb 26, 2019, 1:01:28 PM (7 years ago)

Author:

Alan Bujtas

Message:

[ContentChangeObserver] Move style recalc schedule observation logic to ContentChangeObserver
​https://bugs.webkit.org/show_bug.cgi?id=195062
<rdar://problem/48409258>

Reviewed by Tim Horton.

Also rename registerDOMTimerForContentObservationIfNeeded to be consistent with the did* naming style.

• dom/Document.cpp:

(WebCore::Document::scheduleStyleRecalc):

• page/DOMTimer.cpp:

(WebCore::DOMTimer::install):

• page/ios/ContentChangeObserver.h:
• page/ios/ContentChangeObserver.mm:

(WebCore::ContentChangeObserver::didInstallDOMTimer):
(WebCore::ContentChangeObserver::didScheduleStyleRecalc):
(WebCore::ContentChangeObserver::registerDOMTimerForContentObservationIfNeeded): Deleted.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (2 diffs)
• page/DOMTimer.cpp (modified) (1 diff)
• page/ios/ContentChangeObserver.h (modified) (3 diffs)
• page/ios/ContentChangeObserver.mm (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-02-26  Zalan Bujtas  <zalan@apple.com>
+
+        [ContentChangeObserver] Move style recalc schedule observation logic to ContentChangeObserver
+        https://bugs.webkit.org/show_bug.cgi?id=195062
+        <rdar://problem/48409258>
+
+        Reviewed by Tim Horton.
+
+        Also rename registerDOMTimerForContentObservationIfNeeded to be consistent with the did* naming style.
+
+        * dom/Document.cpp:
+        (WebCore::Document::scheduleStyleRecalc):
+        * page/DOMTimer.cpp:
+        (WebCore::DOMTimer::install):
+        * page/ios/ContentChangeObserver.h:
+        * page/ios/ContentChangeObserver.mm:
+        (WebCore::ContentChangeObserver::didInstallDOMTimer):
+        (WebCore::ContentChangeObserver::didScheduleStyleRecalc):
+        (WebCore::ContentChangeObserver::registerDOMTimerForContentObservationIfNeeded): Deleted.
+
 2019-02-26  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -1810 +1810 @@
 
     ASSERT(childNeedsStyleRecalc() || m_needsFullStyleRebuild);
-
-#if PLATFORM(IOS_FAMILY)
-    if (auto* page = this->page()) {
-        auto& contentChangeObserver = page->contentChangeObserver();
-        if (contentChangeObserver.isObservingStyleRecalcScheduling()) {
-            LOG_WITH_STREAM(ContentObservation, stream << "Document(" << this << ")::scheduleStyleRecalc: register this style recalc schedule and observe when it fires.");
-            contentChangeObserver.setObservedContentChange(WKContentIndeterminateChange);
-        }
-    }
-#endif
-
     auto shouldThrottleStyleRecalc = [&] {
         if (!view() || !view()->isVisuallyNonEmpty())
@@ -1833 +1822 @@
 
     m_styleRecalcTimer.startOneShot(0_s);
+#if PLATFORM(IOS_FAMILY)
+    if (auto* page = this->page())
+        page->contentChangeObserver().didScheduleStyleRecalc();
+#endif
 
     InspectorInstrumentation::didScheduleStyleRecalculation(*this);

trunk/Source/WebCore/page/DOMTimer.cpp

@@ -224 +224 @@
 #if PLATFORM(IOS_FAMILY)
     if (is<Document>(context))
-        downcast<Document>(context).page()->contentChangeObserver().registerDOMTimerForContentObservationIfNeeded(*timer, timeout, singleShot);
+        downcast<Document>(context).page()->contentChangeObserver().didInstallDOMTimer(*timer, timeout, singleShot);
 #endif
     return timer->m_timeoutId;

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

@@ -39 +39 @@
     ContentChangeObserver(Page&);
 
-    void registerDOMTimerForContentObservationIfNeeded(const DOMTimer&, Seconds timeout, bool singleShot);
+    void didInstallDOMTimer(const DOMTimer&, Seconds timeout, bool singleShot);
     void removeDOMTimer(const DOMTimer&);
     void startObservingDOMTimerExecute(const DOMTimer&);
     void stopObservingDOMTimerExecute(const DOMTimer&);
 
+    void didScheduleStyleRecalc();
     void startObservingStyleResolve();
     void stopObservingStyleResolve();
@@ -50 +51 @@
     WEBCORE_EXPORT void stopObservingContentChanges();
 
-    bool isObservingStyleRecalcScheduling();
-
-    void setShouldObserveNextStyleRecalc(bool);
-    bool shouldObserveNextStyleRecalc();
-
-    void setObservedContentChange(WKContentChange);
     WEBCORE_EXPORT WKContentChange observedContentChange();
 
@@ -86 +81 @@
     void stopObservingStyleRecalcScheduling();
 
+    void setShouldObserveNextStyleRecalc(bool);
+    bool shouldObserveNextStyleRecalc();
+
     bool isObservingContentChanges();
+    bool isObservingStyleRecalcScheduling();
+
+    void setObservedContentChange(WKContentChange);
 
     Page& m_page;

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

@@ -41 +41 @@
 }
 
-void ContentChangeObserver::registerDOMTimerForContentObservationIfNeeded(const DOMTimer& timer, Seconds timeout, bool singleShot)
+void ContentChangeObserver::didInstallDOMTimer(const DOMTimer& timer, Seconds timeout, bool singleShot)
 {
     if (!m_page.mainFrame().document())
@@ -53 +53 @@
     setObservedContentChange(WKContentIndeterminateChange);
     addObservedDOMTimer(timer);
-    LOG_WITH_STREAM(ContentObservation, stream << "registerDOMTimerForContentObservationIfNeeded: registed this timer: (" << &timer << ") and observe when it fires.");
+    LOG_WITH_STREAM(ContentObservation, stream << "didInstallDOMTimer: register this timer: (" << &timer << ") and observe when it fires.");
 }
 
@@ -85 +85 @@
         setShouldObserveNextStyleRecalc(true);
     }
+}
+
+void ContentChangeObserver::didScheduleStyleRecalc()
+{
+    if (!isObservingStyleRecalcScheduling())
+        return;
+    LOG(ContentObservation, "didScheduleStyleRecalc: register this style recalc schedule and observe when it fires.");
+    setObservedContentChange(WKContentIndeterminateChange);
 }