Changeset 171306 in webkit

Timestamp:

Jul 21, 2014 11:26:43 AM (10 years ago)

Author:

Simon Fraser

Message:

[iOS WK1] Single touch div scrolling doesn't work in framesets (breaks Word previews)
​https://bugs.webkit.org/show_bug.cgi?id=135103
<rdar://problem/11830219>

Reviewed by Darin Adler.

After r166117 all layer flushing starts on the root frame; we no longer flush layers
for each frame during painting. However, flushing GraphicsLayers can set some state
on a subframe RenderLayerCompositor that is now never processed, which breaks scroll
layer registration.

Fix by doing a walk of the Frame tree, and calling didFlushLayers() on subframe RenderLayerCompositors
before calling didFlushLayers() on self.

• rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::flushPendingLayerChanges):
(WebCore::RenderLayerCompositor::didFlushLayers):
(WebCore::RenderLayerCompositor::notifySubframesAfterLayerFlush):
(WebCore::RenderLayerCompositor::enclosingCompositorFlushingLayers): Drive-by nullptr.

• rendering/RenderLayerCompositor.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderLayerCompositor.cpp (modified) (3 diffs)
• rendering/RenderLayerCompositor.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-07-20  Simon Fraser  <simon.fraser@apple.com>
+
+        [iOS WK1] Single touch div scrolling doesn't work in framesets (breaks Word previews)
+        https://bugs.webkit.org/show_bug.cgi?id=135103
+        <rdar://problem/11830219>
+
+        Reviewed by Darin Adler.
+
+        After r166117 all layer flushing starts on the root frame; we no longer flush layers
+        for each frame during painting. However, flushing GraphicsLayers can set some state
+        on a subframe RenderLayerCompositor that is now never processed, which breaks scroll
+        layer registration.
+        
+        Fix by doing a walk of the Frame tree, and calling didFlushLayers() on subframe RenderLayerCompositors
+        before calling didFlushLayers() on self.
+
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::flushPendingLayerChanges):
+        (WebCore::RenderLayerCompositor::didFlushLayers):
+        (WebCore::RenderLayerCompositor::notifySubframesAfterLayerFlush):
+        (WebCore::RenderLayerCompositor::enclosingCompositorFlushingLayers): Drive-by nullptr.
+        * rendering/RenderLayerCompositor.h:
+
 2014-07-21  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -471 +471 @@
     m_flushingLayers = false;
 
+    updateScrollCoordinatedLayersAfterFlushIncludingSubframes();
+
 #if PLATFORM(IOS)
-    updateCustomLayersAfterFlush();
-
     ChromeClient* client = this->chromeClient();
     if (client && isFlushRoot)
@@ -479 +479 @@
 #endif
 
+    startLayerFlushTimerIfNeeded();
+}
+
+void RenderLayerCompositor::updateScrollCoordinatedLayersAfterFlushIncludingSubframes()
+{
+    updateScrollCoordinatedLayersAfterFlush();
+
+    Frame& frame = m_renderView.frameView().frame();
+    for (Frame* subframe = frame.tree().firstChild(); subframe; subframe = subframe->tree().traverseNext(&frame)) {
+        RenderView* view = subframe->contentRenderer();
+        if (!view)
+            continue;
+
+        view->compositor().updateScrollCoordinatedLayersAfterFlush();
+    }
+}
+
+void RenderLayerCompositor::updateScrollCoordinatedLayersAfterFlush()
+{
+#if PLATFORM(IOS)
+    updateCustomLayersAfterFlush();
+#endif
+
     for (auto it = m_scrollCoordinatedLayersNeedingUpdate.begin(), end = m_scrollCoordinatedLayersNeedingUpdate.end(); it != end; ++it)
         updateScrollCoordinatedStatus(**it);
 
     m_scrollCoordinatedLayersNeedingUpdate.clear();
-    startLayerFlushTimerIfNeeded();
 }
 
@@ -601 +623 @@
 {
     for (Frame* frame = &m_renderView.frameView().frame(); frame; frame = frame->tree().parent()) {
-        RenderLayerCompositor* compositor = frame->contentRenderer() ? &frame->contentRenderer()->compositor() : 0;
+        RenderLayerCompositor* compositor = frame->contentRenderer() ? &frame->contentRenderer()->compositor() : nullptr;
         if (compositor->isFlushingLayers())
             return compositor;

trunk/Source/WebCore/rendering/RenderLayerCompositor.h

@@ -382 +382 @@
 
     bool isFlushingLayers() const { return m_flushingLayers; }
+    void updateScrollCoordinatedLayersAfterFlushIncludingSubframes();
+    void updateScrollCoordinatedLayersAfterFlush();
     
     Page* page() const;