Title: [169410] trunk/Source
Revision
169410
Author
simon.fra...@apple.com
Date
2014-05-27 21:44:54 -0700 (Tue, 27 May 2014)

Log Message

Do some renaming in the scrolling tree
https://bugs.webkit.org/show_bug.cgi?id=133333

Reviewed by Tim Horton.

Source/WebCore:

Rename ScrollingTreeNode::parentScrollPositionDidChange() to updateLayersAfterAncestorChange()
since this goes deep and to indicate that it's about layer updating.

Also rename the "viewportRect" parameter to "fixedPositionRect", since on iOS
this is the custom fixed-position rect that changes on zooming.

* page/scrolling/ScrollingTree.cpp:
(WebCore::ScrollingTree::viewportChangedViaDelegatedScrolling):
* page/scrolling/ScrollingTree.h:
* page/scrolling/ScrollingTreeFrameScrollingNode.h:
* page/scrolling/ScrollingTreeNode.h:
* page/scrolling/ScrollingTreeScrollingNode.h:
* page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.h:
* page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm:
(WebCore::ScrollingTreeFrameScrollingNodeIOS::updateLayersAfterViewportChange):
(WebCore::ScrollingTreeFrameScrollingNodeIOS::updateChildNodesAfterScroll):
* page/scrolling/mac/ScrollingTreeFixedNode.h:
* page/scrolling/mac/ScrollingTreeFixedNode.mm:
(WebCore::ScrollingTreeFixedNode::updateLayersAfterAncestorChange):
(WebCore::ScrollingTreeFixedNode::parentScrollPositionDidChange): Deleted.
* page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.h:
* page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm:
(WebCore::ScrollingTreeFrameScrollingNodeMac::setScrollLayerPosition):
* page/scrolling/mac/ScrollingTreeStickyNode.h:
* page/scrolling/mac/ScrollingTreeStickyNode.mm:
(WebCore::ScrollingTreeStickyNode::updateLayersAfterAncestorChange):
(WebCore::ScrollingTreeStickyNode::parentScrollPositionDidChange): Deleted.

Source/WebKit2:

Rename ScrollingTreeNode::parentScrollPositionDidChange() to updateLayersAfterAncestorChange()
since this goes deep and to indicate that it's about layer updating.

Also rename the "viewportRect" parameter to "fixedPositionRect", since on iOS
this is the custom fixed-position rect that changes on zooming.

* UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp:
(WebKit::RemoteScrollingCoordinatorProxy::viewportChangedViaDelegatedScrolling):
* UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.h:
* UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h:
(WebKit::ScrollingTreeOverflowScrollingNodeIOS::updateLayersAfterViewportChange):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (169409 => 169410)


--- trunk/Source/WebCore/ChangeLog	2014-05-28 04:44:51 UTC (rev 169409)
+++ trunk/Source/WebCore/ChangeLog	2014-05-28 04:44:54 UTC (rev 169410)
@@ -1,5 +1,40 @@
 2014-05-27  Simon Fraser  <simon.fra...@apple.com>
 
+        Do some renaming in the scrolling tree
+        https://bugs.webkit.org/show_bug.cgi?id=133333
+
+        Reviewed by Tim Horton.
+
+        Rename ScrollingTreeNode::parentScrollPositionDidChange() to updateLayersAfterAncestorChange()
+        since this goes deep and to indicate that it's about layer updating.
+        
+        Also rename the "viewportRect" parameter to "fixedPositionRect", since on iOS
+        this is the custom fixed-position rect that changes on zooming.
+
+        * page/scrolling/ScrollingTree.cpp:
+        (WebCore::ScrollingTree::viewportChangedViaDelegatedScrolling):
+        * page/scrolling/ScrollingTree.h:
+        * page/scrolling/ScrollingTreeFrameScrollingNode.h:
+        * page/scrolling/ScrollingTreeNode.h:
+        * page/scrolling/ScrollingTreeScrollingNode.h:
+        * page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.h:
+        * page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm:
+        (WebCore::ScrollingTreeFrameScrollingNodeIOS::updateLayersAfterViewportChange):
+        (WebCore::ScrollingTreeFrameScrollingNodeIOS::updateChildNodesAfterScroll):
+        * page/scrolling/mac/ScrollingTreeFixedNode.h:
+        * page/scrolling/mac/ScrollingTreeFixedNode.mm:
+        (WebCore::ScrollingTreeFixedNode::updateLayersAfterAncestorChange):
+        (WebCore::ScrollingTreeFixedNode::parentScrollPositionDidChange): Deleted.
+        * page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.h:
+        * page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm:
+        (WebCore::ScrollingTreeFrameScrollingNodeMac::setScrollLayerPosition):
+        * page/scrolling/mac/ScrollingTreeStickyNode.h:
+        * page/scrolling/mac/ScrollingTreeStickyNode.mm:
+        (WebCore::ScrollingTreeStickyNode::updateLayersAfterAncestorChange):
+        (WebCore::ScrollingTreeStickyNode::parentScrollPositionDidChange): Deleted.
+
+2014-05-27  Simon Fraser  <simon.fra...@apple.com>
+
         Instantiate a ScrollingTreeMac on Mac
         https://bugs.webkit.org/show_bug.cgi?id=133332
 

Modified: trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp (169409 => 169410)


--- trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp	2014-05-28 04:44:51 UTC (rev 169409)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp	2014-05-28 04:44:54 UTC (rev 169410)
@@ -98,7 +98,7 @@
         m_rootNode->handleWheelEvent(wheelEvent);
 }
 
-void ScrollingTree::viewportChangedViaDelegatedScrolling(ScrollingNodeID nodeID, const WebCore::FloatRect& viewportRect, double scale)
+void ScrollingTree::viewportChangedViaDelegatedScrolling(ScrollingNodeID nodeID, const WebCore::FloatRect& fixedPositionRect, double scale)
 {
     ScrollingTreeNode* node = nodeForID(nodeID);
     if (!node)
@@ -107,7 +107,7 @@
     if (!node->isScrollingNode())
         return;
 
-    toScrollingTreeScrollingNode(node)->updateLayersAfterViewportChange(viewportRect, scale);
+    toScrollingTreeScrollingNode(node)->updateLayersAfterViewportChange(fixedPositionRect, scale);
 }
 
 void ScrollingTree::scrollPositionChangedViaDelegatedScrolling(ScrollingNodeID nodeID, const WebCore::FloatPoint& scrollPosition, bool inUserInteration)

Modified: trunk/Source/WebCore/page/scrolling/ScrollingTree.h (169409 => 169410)


--- trunk/Source/WebCore/page/scrolling/ScrollingTree.h	2014-05-28 04:44:51 UTC (rev 169409)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTree.h	2014-05-28 04:44:54 UTC (rev 169410)
@@ -80,7 +80,7 @@
 
     // Delegated scrolling/zooming has caused the viewport to change, so update viewport-constrained layers
     // (but don't cause scroll events to be fired).
-    virtual void viewportChangedViaDelegatedScrolling(ScrollingNodeID, const WebCore::FloatRect& viewportRect, double scale);
+    virtual void viewportChangedViaDelegatedScrolling(ScrollingNodeID, const WebCore::FloatRect& fixedPositionRect, double scale);
 
     // Delegated scrolling has scrolled a node. Update layer positions on descendant tree nodes,
     // and call scrollingTreeNodeDidScroll().

Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.h (169409 => 169410)


--- trunk/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.h	2014-05-28 04:44:51 UTC (rev 169409)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.h	2014-05-28 04:44:54 UTC (rev 169410)
@@ -43,13 +43,13 @@
     virtual void updateBeforeChildren(const ScrollingStateNode&) override;
     
     // FIXME: We should implement this when we support ScrollingTreeScrollingNodes as children.
-    virtual void parentScrollPositionDidChange(const FloatRect& /*viewportRect*/, const FloatSize& /*cumulativeDelta*/) override { }
+    virtual void updateLayersAfterAncestorChange(const ScrollingTreeNode& /*changedNode*/, const FloatRect& /*fixedPositionRect*/, const FloatSize& /*cumulativeDelta*/) override { }
 
     virtual void handleWheelEvent(const PlatformWheelEvent&) = 0;
     virtual void setScrollPosition(const FloatPoint&);
     virtual void setScrollPositionWithoutContentEdgeConstraints(const FloatPoint&) = 0;
 
-    virtual void updateLayersAfterViewportChange(const FloatRect& viewportRect, double scale) = 0;
+    virtual void updateLayersAfterViewportChange(const FloatRect& fixedPositionRect, double scale) = 0;
     virtual void updateLayersAfterDelegatedScroll(const FloatPoint&) { }
 
     SynchronousScrollingReasons synchronousScrollingReasons() const { return m_synchronousScrollingReasons; }

Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.h (169409 => 169410)


--- trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.h	2014-05-28 04:44:51 UTC (rev 169409)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.h	2014-05-28 04:44:54 UTC (rev 169410)
@@ -55,7 +55,7 @@
     virtual void updateBeforeChildren(const ScrollingStateNode&) = 0;
     virtual void updateAfterChildren(const ScrollingStateNode&) { }
 
-    virtual void parentScrollPositionDidChange(const FloatRect& viewportRect, const FloatSize& cumulativeDelta) = 0;
+    virtual void updateLayersAfterAncestorChange(const ScrollingTreeNode& changedNode, const FloatRect& fixedPositionRect, const FloatSize& cumulativeDelta) = 0;
 
     ScrollingTreeNode* parent() const { return m_parent; }
     void setParent(ScrollingTreeNode* parent) { m_parent = parent; }

Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.h (169409 => 169410)


--- trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.h	2014-05-28 04:44:51 UTC (rev 169409)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.h	2014-05-28 04:44:54 UTC (rev 169410)
@@ -47,13 +47,13 @@
     virtual void updateAfterChildren(const ScrollingStateNode&) override;
 
     // FIXME: We should implement this when we support ScrollingTreeScrollingNodes as children.
-    virtual void parentScrollPositionDidChange(const FloatRect& /*viewportRect*/, const FloatSize& /*cumulativeDelta*/) override { }
+    virtual void updateLayersAfterAncestorChange(const ScrollingTreeNode& /*changedNode*/, const FloatRect& /*fixedPositionRect*/, const FloatSize& /*cumulativeDelta*/) override { }
 
     virtual void handleWheelEvent(const PlatformWheelEvent&) = 0;
     virtual void setScrollPosition(const FloatPoint&);
     virtual void setScrollPositionWithoutContentEdgeConstraints(const FloatPoint&);
 
-    virtual void updateLayersAfterViewportChange(const FloatRect& viewportRect, double scale) = 0;
+    virtual void updateLayersAfterViewportChange(const FloatRect& fixedPositionRect, double scale) = 0;
     virtual void updateLayersAfterDelegatedScroll(const FloatPoint&) { }
 
 protected:

Modified: trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.h (169409 => 169410)


--- trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.h	2014-05-28 04:44:51 UTC (rev 169409)
+++ trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.h	2014-05-28 04:44:54 UTC (rev 169410)
@@ -51,7 +51,7 @@
     virtual FloatPoint scrollPosition() const override;
     virtual void setScrollPositionWithoutContentEdgeConstraints(const FloatPoint&) override;
 
-    virtual void updateLayersAfterViewportChange(const FloatRect& viewportRect, double scale);
+    virtual void updateLayersAfterViewportChange(const FloatRect& fixedPositionRect, double scale);
     virtual void updateLayersAfterDelegatedScroll(const FloatPoint&) override;
 
     virtual void setScrollLayerPosition(const FloatPoint&) override;

Modified: trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm (169409 => 169410)


--- trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm	2014-05-28 04:44:51 UTC (rev 169409)
+++ trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm	2014-05-28 04:44:54 UTC (rev 169410)
@@ -126,16 +126,17 @@
     updateChildNodesAfterScroll(scrollPosition);
 }
 
-void ScrollingTreeFrameScrollingNodeIOS::updateLayersAfterViewportChange(const FloatRect& viewportRect, double /*scale*/)
+void ScrollingTreeFrameScrollingNodeIOS::updateLayersAfterViewportChange(const FloatRect& fixedPositionRect, double /*scale*/)
 {
-    [m_counterScrollingLayer setPosition:viewportRect.location()];
+    // Note: we never currently have a m_counterScrollingLayer (which is used for background-attachment:fixed) on iOS.
+    [m_counterScrollingLayer setPosition:fixedPositionRect.location()];
 
     if (!m_children)
         return;
 
     size_t size = m_children->size();
     for (size_t i = 0; i < size; ++i)
-        m_children->at(i)->parentScrollPositionDidChange(viewportRect, FloatSize());
+        m_children->at(i)->updateLayersAfterAncestorChange(*this, fixedPositionRect, FloatSize());
 }
 
 void ScrollingTreeFrameScrollingNodeIOS::updateLayersAfterDelegatedScroll(const FloatPoint& scrollPosition)
@@ -169,14 +170,14 @@
     
     if (!m_children)
         return;
-    
+
     viewportRect.setLocation(scrollOffset);
-    
+
     FloatRect viewportConstrainedObjectsRect = FrameView::rectForViewportConstrainedObjects(enclosingLayoutRect(viewportRect), roundedLayoutSize(totalContentsSize()), frameScaleFactor(), false, behaviorForFixed);
-    
+
     size_t size = m_children->size();
     for (size_t i = 0; i < size; ++i)
-        m_children->at(i)->parentScrollPositionDidChange(viewportConstrainedObjectsRect, FloatSize());
+        m_children->at(i)->updateLayersAfterAncestorChange(*this, fixedPositionRect, FloatSize());
 }
 
 FloatPoint ScrollingTreeFrameScrollingNodeIOS::minimumScrollPosition() const

Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.h (169409 => 169410)


--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.h	2014-05-28 04:44:51 UTC (rev 169409)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.h	2014-05-28 04:44:54 UTC (rev 169410)
@@ -48,7 +48,7 @@
     ScrollingTreeFixedNode(ScrollingTree&, ScrollingNodeID);
 
     virtual void updateBeforeChildren(const ScrollingStateNode&) override;
-    virtual void parentScrollPositionDidChange(const FloatRect& viewportRect, const FloatSize& cumulativeDelta) override;
+    virtual void updateLayersAfterAncestorChange(const ScrollingTreeNode& changedNode, const FloatRect& fixedPositionRect, const FloatSize& cumulativeDelta) override;
 
     FixedPositionViewportConstraints m_constraints;
     RetainPtr<CALayer> m_layer;

Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.mm (169409 => 169410)


--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.mm	2014-05-28 04:44:51 UTC (rev 169409)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.mm	2014-05-28 04:44:54 UTC (rev 169410)
@@ -64,9 +64,9 @@
     return CGPointMake(a.x * b.width, a.y * b.height);
 }
 
-void ScrollingTreeFixedNode::parentScrollPositionDidChange(const FloatRect& viewportRect, const FloatSize& cumulativeDelta)
+void ScrollingTreeFixedNode::updateLayersAfterAncestorChange(const ScrollingTreeNode& changedNode, const FloatRect& fixedPositionRect, const FloatSize& cumulativeDelta)
 {
-    FloatPoint layerPosition = m_constraints.layerPositionForViewportRect(viewportRect);
+    FloatPoint layerPosition = m_constraints.layerPositionForViewportRect(fixedPositionRect);
     layerPosition -= cumulativeDelta;
 
     CGRect layerBounds = [m_layer.get() bounds];
@@ -81,7 +81,7 @@
 
     size_t size = m_children->size();
     for (size_t i = 0; i < size; ++i)
-        m_children->at(i)->parentScrollPositionDidChange(viewportRect, newDelta);
+        m_children->at(i)->updateLayersAfterAncestorChange(changedNode, fixedPositionRect, newDelta);
 }
 
 } // namespace WebCore

Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.h (169409 => 169410)


--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.h	2014-05-28 04:44:51 UTC (rev 169409)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.h	2014-05-28 04:44:54 UTC (rev 169410)
@@ -69,7 +69,7 @@
     virtual void setScrollPosition(const FloatPoint&) override;
     virtual void setScrollPositionWithoutContentEdgeConstraints(const FloatPoint&) override;
 
-    virtual void updateLayersAfterViewportChange(const FloatRect& viewportRect, double scale) override;
+    virtual void updateLayersAfterViewportChange(const FloatRect& fixedPositionRect, double scale) override;
 
     virtual void setScrollLayerPosition(const FloatPoint&) override;
 

Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm (169409 => 169410)


--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm	2014-05-28 04:44:51 UTC (rev 169409)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm	2014-05-28 04:44:54 UTC (rev 169410)
@@ -349,7 +349,6 @@
     FloatPoint scrollOffset = position - toFloatSize(scrollOrigin());
     FloatRect viewportRect(FloatPoint(), scrollableAreaSize());
     
-    // FIXME: scrollOffsetForFixedPosition() needs to do float math.
     FloatSize scrollOffsetForFixedChildren = FrameView::scrollOffsetForFixedPosition(enclosingLayoutRect(viewportRect),
         roundedLayoutSize(totalContentsSize()), roundedLayoutPoint(scrollOffset), scrollOrigin(), frameScaleFactor(), false, behaviorForFixed, headerHeight(), footerHeight());
     
@@ -410,7 +409,7 @@
 
     size_t size = m_children->size();
     for (size_t i = 0; i < size; ++i)
-        m_children->at(i)->parentScrollPositionDidChange(viewportRect, FloatSize());
+        m_children->at(i)->updateLayersAfterAncestorChange(*this, viewportRect, FloatSize());
 }
 
 void ScrollingTreeFrameScrollingNodeMac::updateLayersAfterViewportChange(const FloatRect&, double)

Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.h (169409 => 169410)


--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.h	2014-05-28 04:44:51 UTC (rev 169409)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.h	2014-05-28 04:44:54 UTC (rev 169410)
@@ -48,7 +48,7 @@
     ScrollingTreeStickyNode(ScrollingTree&, ScrollingNodeID);
 
     virtual void updateBeforeChildren(const ScrollingStateNode&) override;
-    virtual void parentScrollPositionDidChange(const FloatRect& viewportRect, const FloatSize& cumulativeDelta) override;
+    virtual void updateLayersAfterAncestorChange(const ScrollingTreeNode& changedNode, const FloatRect& fixedPositionRect, const FloatSize& cumulativeDelta) override;
 
     StickyPositionViewportConstraints m_constraints;
     RetainPtr<CALayer> m_layer;

Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.mm (169409 => 169410)


--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.mm	2014-05-28 04:44:51 UTC (rev 169409)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.mm	2014-05-28 04:44:54 UTC (rev 169410)
@@ -64,9 +64,9 @@
     return CGPointMake(a.x * b.width, a.y * b.height);
 }
 
-void ScrollingTreeStickyNode::parentScrollPositionDidChange(const FloatRect& viewportRect, const FloatSize& cumulativeDelta)
+void ScrollingTreeStickyNode::updateLayersAfterAncestorChange(const ScrollingTreeNode& changedNode, const FloatRect& fixedPositionRect, const FloatSize& cumulativeDelta)
 {
-    FloatPoint layerPosition = m_constraints.layerPositionForConstrainingRect(viewportRect);
+    FloatPoint layerPosition = m_constraints.layerPositionForConstrainingRect(fixedPositionRect);
 
     // FIXME: Subtracting the cumulativeDelta is not totally sufficient to get the new position right for nested
     // sticky objects. We probably need a way to modify the containingBlockRect in the ViewportContraints
@@ -85,7 +85,7 @@
 
     size_t size = m_children->size();
     for (size_t i = 0; i < size; ++i)
-        m_children->at(i)->parentScrollPositionDidChange(viewportRect, newDelta);
+        m_children->at(i)->updateLayersAfterAncestorChange(changedNode, fixedPositionRect, newDelta);
 }
 
 } // namespace WebCore

Modified: trunk/Source/WebKit2/ChangeLog (169409 => 169410)


--- trunk/Source/WebKit2/ChangeLog	2014-05-28 04:44:51 UTC (rev 169409)
+++ trunk/Source/WebKit2/ChangeLog	2014-05-28 04:44:54 UTC (rev 169410)
@@ -1,3 +1,22 @@
+2014-05-27  Simon Fraser  <simon.fra...@apple.com>
+
+        Do some renaming in the scrolling tree
+        https://bugs.webkit.org/show_bug.cgi?id=133333
+
+        Reviewed by Tim Horton.
+        
+        Rename ScrollingTreeNode::parentScrollPositionDidChange() to updateLayersAfterAncestorChange()
+        since this goes deep and to indicate that it's about layer updating.
+        
+        Also rename the "viewportRect" parameter to "fixedPositionRect", since on iOS
+        this is the custom fixed-position rect that changes on zooming.
+
+        * UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp:
+        (WebKit::RemoteScrollingCoordinatorProxy::viewportChangedViaDelegatedScrolling):
+        * UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.h:
+        * UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h:
+        (WebKit::ScrollingTreeOverflowScrollingNodeIOS::updateLayersAfterViewportChange):
+
 2014-05-27  Geoffrey Garen  <gga...@apple.com>
 
         Some proof-reading of the WebKit2 API headerdoc

Modified: trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp (169409 => 169410)


--- trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp	2014-05-28 04:44:51 UTC (rev 169409)
+++ trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp	2014-05-28 04:44:54 UTC (rev 169410)
@@ -154,9 +154,9 @@
     return m_scrollingTree->isPointInNonFastScrollableRegion(p);
 }
 
-void RemoteScrollingCoordinatorProxy::viewportChangedViaDelegatedScrolling(ScrollingNodeID nodeID, const FloatRect& viewportRect, double scale)
+void RemoteScrollingCoordinatorProxy::viewportChangedViaDelegatedScrolling(ScrollingNodeID nodeID, const FloatRect& fixedPositionRect, double scale)
 {
-    m_scrollingTree->viewportChangedViaDelegatedScrolling(nodeID, viewportRect, scale);
+    m_scrollingTree->viewportChangedViaDelegatedScrolling(nodeID, fixedPositionRect, scale);
 }
 
 // This comes from the scrolling tree.

Modified: trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.h (169409 => 169410)


--- trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.h	2014-05-28 04:44:51 UTC (rev 169409)
+++ trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.h	2014-05-28 04:44:54 UTC (rev 169410)
@@ -58,7 +58,7 @@
     bool isPointInNonFastScrollableRegion(const WebCore::IntPoint&) const;
 
     // Called externally when native views move around.
-    void viewportChangedViaDelegatedScrolling(WebCore::ScrollingNodeID, const WebCore::FloatRect& viewportRect, double scale);
+    void viewportChangedViaDelegatedScrolling(WebCore::ScrollingNodeID, const WebCore::FloatRect& fixedPositionRect, double scale);
 
     // FIXME: expose the tree and pass this to that?
     bool handleWheelEvent(const WebCore::PlatformWheelEvent&);

Modified: trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h (169409 => 169410)


--- trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h	2014-05-28 04:44:51 UTC (rev 169409)
+++ trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h	2014-05-28 04:44:54 UTC (rev 169410)
@@ -54,7 +54,7 @@
 
     virtual void setScrollLayerPosition(const WebCore::FloatPoint&) override;
 
-    virtual void updateLayersAfterViewportChange(const WebCore::FloatRect& viewportRect, double scale) { }
+    virtual void updateLayersAfterViewportChange(const WebCore::FloatRect& fixedPositionRect, double scale) { }
     virtual void handleWheelEvent(const WebCore::PlatformWheelEvent&) override { }
 
     void updateChildNodesAfterScroll(const WebCore::FloatPoint&);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to