Changeset 168655 in webkit

Timestamp:

May 12, 2014 4:21:51 PM (10 years ago)

Author:

Beth Dakin

Message:

Content shadow layer needs to move in sync with the content layer
​https://bugs.webkit.org/show_bug.cgi?id=132841
-and corresponding-
<rdar://problem/16641115>

Reviewed by Simon Fraser.

Now that the root content layer moves a little bit (for y scroll positions between
0 and topContentInset), the shadow layer needs to move along with it since the
shadow layer should always have the same position as the root content layer.

Set the root state node’s shadow layer, and update the position whenever the root
content layer’s position is updated.

• page/scrolling/AsyncScrollingCoordinator.cpp:

(WebCore::AsyncScrollingCoordinator::frameViewRootLayerDidChange):
(WebCore::AsyncScrollingCoordinator::updateScrollPositionAfterAsyncScroll):

Fetch the compositor’s layerForContentShadow().

• page/scrolling/ScrollingCoordinator.cpp:

(WebCore::ScrollingCoordinator::contentShadowLayerForFrameView):

• page/scrolling/ScrollingCoordinator.h:

Hook up the contentShadowLayer in the state node.

• page/scrolling/ScrollingStateScrollingNode.cpp:

(WebCore::ScrollingStateScrollingNode::ScrollingStateScrollingNode):
(WebCore::ScrollingStateScrollingNode::setContentShadowLayer):

Hook it up in the ScrollingTreeNode as well. Move the layer whenever the m
_scrolledContentsLayer is moved.

• page/scrolling/ScrollingStateScrollingNode.h:
• page/scrolling/mac/ScrollingTreeScrollingNodeMac.h:
• page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm:

(WebCore::ScrollingTreeScrollingNodeMac::updateBeforeChildren):
(WebCore::ScrollingTreeScrollingNodeMac::setScrollLayerPosition):

The shadow layer needs an anchor point now that we are moving it around.

• rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::updateOverflowControlsLayers):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/scrolling/AsyncScrollingCoordinator.cpp (modified) (4 diffs)
• page/scrolling/ScrollingCoordinator.cpp (modified) (1 diff)
• page/scrolling/ScrollingCoordinator.h (modified) (1 diff)
• page/scrolling/ScrollingStateScrollingNode.cpp (modified) (2 diffs)
• page/scrolling/ScrollingStateScrollingNode.h (modified) (3 diffs)
• page/scrolling/mac/ScrollingTreeScrollingNodeMac.h (modified) (1 diff)
• page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm (modified) (2 diffs)
• rendering/RenderLayerCompositor.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-05-12  Beth Dakin  <bdakin@apple.com>
+
+        Content shadow layer needs to move in sync with the content layer
+        https://bugs.webkit.org/show_bug.cgi?id=132841
+        -and corresponding-
+        <rdar://problem/16641115>
+
+        Reviewed by Simon Fraser.
+
+        Now that the root content layer moves a little bit (for y scroll positions between 
+        0 and topContentInset), the shadow layer needs to move along with it since the 
+        shadow layer should always have the same position as the root content layer.
+
+        Set the root state node’s shadow layer, and update the position whenever the root 
+        content layer’s position is updated.
+        * page/scrolling/AsyncScrollingCoordinator.cpp:
+        (WebCore::AsyncScrollingCoordinator::frameViewRootLayerDidChange):
+        (WebCore::AsyncScrollingCoordinator::updateScrollPositionAfterAsyncScroll):
+
+        Fetch the compositor’s layerForContentShadow().
+        * page/scrolling/ScrollingCoordinator.cpp:
+        (WebCore::ScrollingCoordinator::contentShadowLayerForFrameView):
+        * page/scrolling/ScrollingCoordinator.h:
+
+        Hook up the contentShadowLayer in the state node.
+        * page/scrolling/ScrollingStateScrollingNode.cpp:
+        (WebCore::ScrollingStateScrollingNode::ScrollingStateScrollingNode):
+        (WebCore::ScrollingStateScrollingNode::setContentShadowLayer):
+
+        Hook it up in the ScrollingTreeNode as well. Move the layer whenever the m
+        _scrolledContentsLayer is moved.
+        * page/scrolling/ScrollingStateScrollingNode.h:
+        * page/scrolling/mac/ScrollingTreeScrollingNodeMac.h:
+        * page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm:
+        (WebCore::ScrollingTreeScrollingNodeMac::updateBeforeChildren):
+        (WebCore::ScrollingTreeScrollingNodeMac::setScrollLayerPosition):
+
+        The shadow layer needs an anchor point now that we are moving it around.
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::updateOverflowControlsLayers):
+
 2014-05-12  Dirk Schulze  <krit@webkit.org>
 

trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp

@@ -136 +136 @@
     node->setCounterScrollingLayer(counterScrollingLayerForFrameView(frameView));
     node->setInsetClipLayer(insetClipLayerForFrameView(frameView));
+    node->setContentShadowLayer(contentShadowLayerForFrameView(frameView));
     node->setHeaderLayer(headerLayerForFrameView(frameView));
     node->setFooterLayer(footerLayerForFrameView(frameView));
@@ -216 +217 @@
             GraphicsLayer* counterScrollingLayer = counterScrollingLayerForFrameView(frameView);
             GraphicsLayer* insetClipLayer = insetClipLayerForFrameView(frameView);
+            GraphicsLayer* contentShadowLayer = contentShadowLayerForFrameView(frameView);
             GraphicsLayer* scrolledContentsLayer = rootContentLayerForFrameView(frameView);
             GraphicsLayer* headerLayer = headerLayerForFrameView(frameView);
@@ -235 +237 @@
                 if (insetClipLayer)
                     insetClipLayer->setPosition(positionForInsetClipLayer);
+                if (contentShadowLayer)
+                    contentShadowLayer->setPosition(positionForContentsLayer);
                 if (scrolledContentsLayer)
                     scrolledContentsLayer->setPosition(positionForContentsLayer);
@@ -247 +251 @@
                 if (insetClipLayer)
                     insetClipLayer->syncPosition(positionForInsetClipLayer);
+                if (contentShadowLayer)
+                    contentShadowLayer->syncPosition(positionForContentsLayer);
                 if (scrolledContentsLayer)
                     scrolledContentsLayer->syncPosition(positionForContentsLayer);

trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp

@@ -256 +256 @@
 }
 
+GraphicsLayer* ScrollingCoordinator::contentShadowLayerForFrameView(FrameView* frameView)
+{
+    if (RenderView* renderView = frameView->frame().contentRenderer())
+        return renderView->compositor().layerForContentShadow();
+    return nullptr;
+}
+
 GraphicsLayer* ScrollingCoordinator::rootContentLayerForFrameView(FrameView* frameView)
 {

trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h

@@ -206 +206 @@
     GraphicsLayer* insetClipLayerForFrameView(FrameView*);
     GraphicsLayer* rootContentLayerForFrameView(FrameView*);
+    GraphicsLayer* contentShadowLayerForFrameView(FrameView*);
     GraphicsLayer* headerLayerForFrameView(FrameView*);
     GraphicsLayer* footerLayerForFrameView(FrameView*);

trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp

@@ -88 +88 @@
         setInsetClipLayer(stateNode.insetClipLayer().toRepresentation(adoptiveTree.preferredLayerRepresentation()));
 
+    if (hasChangedProperty(ContentShadowLayer))
+        setContentShadowLayer(stateNode.contentShadowLayer().toRepresentation(adoptiveTree.preferredLayerRepresentation()));
+
     if (hasChangedProperty(HeaderLayer))
         setHeaderLayer(stateNode.headerLayer().toRepresentation(adoptiveTree.preferredLayerRepresentation()));
@@ -256 +259 @@
 }
 
+void ScrollingStateScrollingNode::setContentShadowLayer(const LayerRepresentation& layerRepresentation)
+{
+    if (layerRepresentation == m_contentShadowLayer)
+        return;
+    
+    m_contentShadowLayer = layerRepresentation;
+    setPropertyChanged(ContentShadowLayer);
+}
+
 void ScrollingStateScrollingNode::setHeaderLayer(const LayerRepresentation& layerRepresentation)
 {

trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h

@@ -64 +64 @@
         CounterScrollingLayer,
         InsetClipLayer,
+        ContentShadowLayer,
         HeaderHeight,
         FooterHeight,
@@ -131 +132 @@
     void setInsetClipLayer(const LayerRepresentation&);
 
+    const LayerRepresentation& contentShadowLayer() const { return m_contentShadowLayer; }
+    void setContentShadowLayer(const LayerRepresentation&);
+
     // The header and footer layers scroll vertically with the page, they should remain fixed when scrolling horizontally.
     const LayerRepresentation& headerLayer() const { return m_headerLayer; }
@@ -154 +158 @@
     LayerRepresentation m_counterScrollingLayer;
     LayerRepresentation m_insetClipLayer;
+    LayerRepresentation m_contentShadowLayer;
     LayerRepresentation m_headerLayer;
     LayerRepresentation m_footerLayer;

trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.h

@@ -91 +91 @@
     RetainPtr<CALayer> m_counterScrollingLayer;
     RetainPtr<CALayer> m_insetClipLayer;
+    RetainPtr<CALayer> m_contentShadowLayer;
     RetainPtr<CALayer> m_headerLayer;
     RetainPtr<CALayer> m_footerLayer;

trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm

@@ -88 +88 @@
         m_insetClipLayer = scrollingStateNode.insetClipLayer();
 
+    if (scrollingStateNode.hasChangedProperty(ScrollingStateScrollingNode::ContentShadowLayer))
+        m_contentShadowLayer = scrollingStateNode.contentShadowLayer();
+
     if (scrollingStateNode.hasChangedProperty(ScrollingStateScrollingNode::HeaderLayer))
         m_headerLayer = scrollingStateNode.headerLayer();
@@ -361 +364 @@
         m_scrolledContentsLayer.get().position = FloatPoint(m_scrolledContentsLayer.get().position.x,
             FrameView::yPositionForRootContentLayer(position, topContentInset, headerHeight()));
+        if (m_contentShadowLayer)
+            m_contentShadowLayer.get().position = m_scrolledContentsLayer.get().position;
     }
 

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -3103 +3103 @@
             m_contentShadowLayer->setSize(m_rootContentLayer->size());
             m_contentShadowLayer->setPosition(m_rootContentLayer->position());
+            m_contentShadowLayer->setAnchorPoint(FloatPoint3D());
             m_contentShadowLayer->setCustomAppearance(GraphicsLayer::ScrollingShadow);