Changeset 103435 in webkit

Timestamp:

Dec 21, 2011 1:01:43 PM (12 years ago)

Author:

andersca@apple.com

Message:

Inform the scrolling coordinator when scrollbar layers come and go
​https://bugs.webkit.org/show_bug.cgi?id=75028

Reviewed by Andreas Kling and Simon Fraser.

• page/ScrollingCoordinator.h:
• page/mac/ScrollingCoordinatorMac.mm:

(WebCore::ScrollingCoordinator::setFrameViewHorizontalScrollbarLayer):
(WebCore::ScrollingCoordinator::setFrameViewVerticalScrollbarLayer):

• rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::updateOverflowControlsLayers):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/ScrollingCoordinator.h (modified) (1 diff)
• page/mac/ScrollingCoordinatorMac.mm (modified) (1 diff)
• rendering/RenderLayerCompositor.cpp (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-12-21  Anders Carlsson  <andersca@apple.com>
+
+        Inform the scrolling coordinator when scrollbar layers come and go
+        https://bugs.webkit.org/show_bug.cgi?id=75028
+
+        Reviewed by Andreas Kling and Simon Fraser.
+
+        * page/ScrollingCoordinator.h:
+        * page/mac/ScrollingCoordinatorMac.mm:
+        (WebCore::ScrollingCoordinator::setFrameViewHorizontalScrollbarLayer):
+        (WebCore::ScrollingCoordinator::setFrameViewVerticalScrollbarLayer):
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::updateOverflowControlsLayers):
+
 2011-12-20  Dmitry Lomov  <dslomov@google.com>
 

trunk/Source/WebCore/page/ScrollingCoordinator.h

@@ -58 +58 @@
 
     // Should be called whenever the scroll layer for the given frame view changes.
-    void setFrameViewScrollLayer(FrameView*, const GraphicsLayer* scrollLayer);
+    void frameViewScrollLayerDidChange(FrameView*, const GraphicsLayer*);
+
+    // Should be called whenever the horizontal scrollbar layer for the given frame view changes.
+    void frameViewHorizontalScrollbarLayerDidChange(FrameView*, const GraphicsLayer*);
+
+    // Should be called whenever the horizontal scrollbar layer for the given frame view changes.
+    void frameViewVerticalScrollbarLayerDidChange(FrameView*, const GraphicsLayer*);
 
     // Should be called whenever the geometry of the given frame view changes,

trunk/Source/WebCore/page/mac/ScrollingCoordinatorMac.mm

@@ -162 +162 @@
 }
 
-void ScrollingCoordinator::setFrameViewScrollLayer(FrameView* frameView, const GraphicsLayer* scrollLayer)
+void ScrollingCoordinator::frameViewHorizontalScrollbarLayerDidChange(FrameView* frameView, const GraphicsLayer*)
+{
+    ASSERT(isMainThread());
+    ASSERT(m_page);
+
+    if (frameView->frame() != m_page->mainFrame())
+        return;
+
+    // FIXME: Implement.
+}
+
+void ScrollingCoordinator::frameViewVerticalScrollbarLayerDidChange(FrameView* frameView, const GraphicsLayer*)
+{
+    ASSERT(isMainThread());
+    ASSERT(m_page);
+    
+    if (frameView->frame() != m_page->mainFrame())
+        return;
+
+    // FIXME: Implement.
+}
+
+void ScrollingCoordinator::frameViewScrollLayerDidChange(FrameView* frameView, const GraphicsLayer* scrollLayer)
 {
     ASSERT(isMainThread());

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -1710 +1710 @@
             m_overflowControlsHostLayer->addChild(m_layerForHorizontalScrollbar.get());
             layersChanged = true;
+
+#if ENABLE(THREADED_SCROLLING)
+            if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator())
+                scrollingCoordinator->frameViewHorizontalScrollbarLayerDidChange(m_renderView->frameView(), m_layerForHorizontalScrollbar.get());
+#endif
         }
     } else if (m_layerForHorizontalScrollbar) {
@@ -1715 +1720 @@
         m_layerForHorizontalScrollbar = nullptr;
         layersChanged = true;
+
+#if ENABLE(THREADED_SCROLLING)
+        if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator())
+            scrollingCoordinator->frameViewHorizontalScrollbarLayerDidChange(m_renderView->frameView(), 0);
+#endif
     }
 
@@ -1725 +1735 @@
             m_overflowControlsHostLayer->addChild(m_layerForVerticalScrollbar.get());
             layersChanged = true;
+
+#if ENABLE(THREADED_SCROLLING)
+            if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator())
+                scrollingCoordinator->frameViewVerticalScrollbarLayerDidChange(m_renderView->frameView(), m_layerForVerticalScrollbar.get());
+#endif
         }
     } else if (m_layerForVerticalScrollbar) {
@@ -1730 +1745 @@
         m_layerForVerticalScrollbar = nullptr;
         layersChanged = true;
+
+#if ENABLE(THREADED_SCROLLING)
+        if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator())
+            scrollingCoordinator->frameViewVerticalScrollbarLayerDidChange(m_renderView->frameView(), 0);
+#endif
     }
 
@@ -1802 +1822 @@
 #if ENABLE(THREADED_SCROLLING)
             if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator())
-                scrollingCoordinator->setFrameViewScrollLayer(m_renderView->frameView(), m_scrollLayer.get());
+                scrollingCoordinator->frameViewScrollLayerDidChange(m_renderView->frameView(), m_scrollLayer.get());
 #endif
         }