Changeset 260643 in webkit

Timestamp:

Apr 24, 2020 8:03:22 AM (4 years ago)

Author:

Simon Fraser

Message:

Move some post-renderingUpdate code into WebCore
​https://bugs.webkit.org/show_bug.cgi?id=210952

Reviewed by Antti Koivisto.

Factor some code called by the various DrawingArea subclasses into Page::finalizeRenderingUpdate(),
with some flags to control behavior that differs between drawing areas.

ScrollingCoordinator::commitTreeStateIfNeeded() is a no-op for RemoteScrollingCoordinator so
it's fine to always call it.

Source/WebCore:

• page/Page.cpp:

(WebCore::Page::passiveTouchEventListenerRectsForTesting):
(WebCore::Page::finalizeRenderingUpdate):

• page/Page.h:

Source/WebKit:

• WebProcess/WebPage/RemoteLayerTree/RemoteLayerTreeDrawingArea.mm:

(WebKit::RemoteLayerTreeDrawingArea::updateRendering):

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::finalizeRenderingUpdate):

• WebProcess/WebPage/WebPage.h:
• WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:

(WebKit::TiledCoreAnimationDrawingArea::updateRendering):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/Page.cpp (modified) (2 diffs)
• WebCore/page/Page.h (modified) (2 diffs)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/WebProcess/WebPage/RemoteLayerTree/RemoteLayerTreeDrawingArea.mm (modified) (1 diff)
• WebKit/WebProcess/WebPage/WebPage.cpp (modified) (1 diff)
• WebKit/WebProcess/WebPage/WebPage.h (modified) (1 diff)
• WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-04-24  Simon Fraser  <simon.fraser@apple.com>
+
+        Move some post-renderingUpdate code into WebCore
+        https://bugs.webkit.org/show_bug.cgi?id=210952
+
+        Reviewed by Antti Koivisto.
+
+        Factor some code called by the various DrawingArea subclasses into Page::finalizeRenderingUpdate(),
+        with some flags to control behavior that differs between drawing areas.
+
+        ScrollingCoordinator::commitTreeStateIfNeeded() is a no-op for RemoteScrollingCoordinator so
+        it's fine to always call it.
+
+        * page/Page.cpp:
+        (WebCore::Page::passiveTouchEventListenerRectsForTesting):
+        (WebCore::Page::finalizeRenderingUpdate):
+        * page/Page.h:
+
 2020-04-24  Adrian Perez de Castro  <aperez@igalia.com>
 

trunk/Source/WebCore/page/Page.cpp

@@ -517 +517 @@
 
     Vector<IntRect> rects;
-    if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator())
+    if (auto* scrollingCoordinator = this->scrollingCoordinator())
         rects.appendVector(scrollingCoordinator->absoluteEventTrackingRegions().asynchronousDispatchRegion.rects());
 
@@ -1419 +1419 @@
         auto* frameView = child->view();
         ASSERT(!frameView || !frameView->needsLayout());
+    }
+#endif
+}
+
+void Page::finalizeRenderingUpdate(OptionSet<FinalizeRenderingUpdateFlags> flags)
+{
+    auto* view = mainFrame().view();
+    if (!view)
+        return;
+
+    if (flags.contains(FinalizeRenderingUpdateFlags::InvalidateImagesWithAsyncDecodes))
+        view->invalidateImagesWithAsyncDecodes();
+
+    view->flushCompositingStateIncludingSubframes();
+
+#if ENABLE(ASYNC_SCROLLING)
+    if (auto* scrollingCoordinator = this->scrollingCoordinator()) {
+        scrollingCoordinator->commitTreeStateIfNeeded();
+        if (flags.contains(FinalizeRenderingUpdateFlags::ApplyScrollingTreeLayerPositions))
+            scrollingCoordinator->applyScrollingTreeLayerPositions();
     }
 #endif

trunk/Source/WebCore/page/Page.h

@@ -165 +165 @@
 };
 
+enum class FinalizeRenderingUpdateFlags : uint8_t {
+    ApplyScrollingTreeLayerPositions    = 1 << 0,
+    InvalidateImagesWithAsyncDecodes    = 1 << 1,
+};
+
 class Page : public Supplementable<Page>, public CanMakeWeakPtr<Page> {
     WTF_MAKE_NONCOPYABLE(Page);
@@ -481 +486 @@
     WEBCORE_EXPORT void layoutIfNeeded();
     WEBCORE_EXPORT void updateRendering();
+    
+    WEBCORE_EXPORT void finalizeRenderingUpdate(OptionSet<FinalizeRenderingUpdateFlags>);
     
     WEBCORE_EXPORT void scheduleRenderingUpdate();

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-04-24  Simon Fraser  <simon.fraser@apple.com>
+
+        Move some post-renderingUpdate code into WebCore
+        https://bugs.webkit.org/show_bug.cgi?id=210952
+
+        Reviewed by Antti Koivisto.
+
+        Factor some code called by the various DrawingArea subclasses into Page::finalizeRenderingUpdate(),
+        with some flags to control behavior that differs between drawing areas.
+
+        ScrollingCoordinator::commitTreeStateIfNeeded() is a no-op for RemoteScrollingCoordinator so
+        it's fine to always call it.
+
+        * WebProcess/WebPage/RemoteLayerTree/RemoteLayerTreeDrawingArea.mm:
+        (WebKit::RemoteLayerTreeDrawingArea::updateRendering):
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::finalizeRenderingUpdate):
+        * WebProcess/WebPage/WebPage.h:
+        * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+        (WebKit::TiledCoreAnimationDrawingArea::updateRendering):
+
 2020-04-24  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/WebProcess/WebPage/RemoteLayerTree/RemoteLayerTreeDrawingArea.mm

@@ -339 +339 @@
     addCommitHandlers();
 
+    OptionSet<FinalizeRenderingUpdateFlags> flags;
     if (m_nextRenderingUpdateRequiresSynchronousImageDecoding)
-        m_webPage.mainFrameView()->invalidateImagesWithAsyncDecodes();
-
-    m_webPage.mainFrameView()->flushCompositingStateIncludingSubframes();
+        flags.add(FinalizeRenderingUpdateFlags::InvalidateImagesWithAsyncDecodes);
+
+    m_webPage.finalizeRenderingUpdate(flags);
 
     // Because our view-relative overlay root layer is not attached to the FrameView's GraphicsLayer tree, we need to flush it manually.

trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp

@@ -3813 +3813 @@
 }
 
+void WebPage::finalizeRenderingUpdate(OptionSet<FinalizeRenderingUpdateFlags> flags)
+{
+    m_page->finalizeRenderingUpdate(flags);
+}
+
 WebInspector* WebPage::inspector(LazyCreationPolicy behavior)
 {

trunk/Source/WebKit/WebProcess/WebPage/WebPage.h

@@ -352 +352 @@
     void layoutIfNeeded();
     void updateRendering();
+    void finalizeRenderingUpdate(OptionSet<WebCore::FinalizeRenderingUpdateFlags>);
 
     enum class LazyCreationPolicy { UseExistingOnly, CreateIfNeeded };

trunk/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm

@@ -476 +476 @@
 
         addCommitHandlers();
-        
-        bool didFlushAllFrames = m_webPage.mainFrameView()->flushCompositingStateIncludingSubframes();
-
-#if ENABLE(ASYNC_SCROLLING)
-        if (auto* scrollingCoordinator = m_webPage.corePage()->scrollingCoordinator()) {
-            scrollingCoordinator->commitTreeStateIfNeeded();
-            if (flushType == UpdateRenderingType::Normal)
-                scrollingCoordinator->applyScrollingTreeLayerPositions();
-        }
-#endif
+
+        OptionSet<FinalizeRenderingUpdateFlags> flags;
+        if (flushType == UpdateRenderingType::Normal)
+            flags.add(FinalizeRenderingUpdateFlags::ApplyScrollingTreeLayerPositions);
+
+        m_webPage.finalizeRenderingUpdate(flags);
 
         // If we have an active transient zoom, we want the zoom to win over any changes
@@ -497 +493 @@
         }
 
-        if (didFlushAllFrames) {
-            sendDidFirstLayerFlushIfNeeded();
-            invalidateRenderingUpdateRunLoopObserver();
-        }
+        sendDidFirstLayerFlushIfNeeded();
+        invalidateRenderingUpdateRunLoopObserver();
     }
 }