WebKit Bugzilla
Attachment 360546 Details for
Bug 194002
: Add some basic geometry information to the scrolling tree
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-194002-20190129204127.patch (text/plain), 98.90 KB, created by
Simon Fraser (smfr)
on 2019-01-29 20:41:28 PST
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Simon Fraser (smfr)
Created:
2019-01-29 20:41:28 PST
Size:
98.90 KB
patch
obsolete
>Subversion Revision: 240698 >diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog >index 01815ef57e0ef4a19bed7d0668e4e43118edb308..84e4a0739c87fa3665ac5f11768c3f668404416f 100644 >--- a/Source/WebCore/ChangeLog >+++ b/Source/WebCore/ChangeLog >@@ -1,3 +1,46 @@ >+2019-01-29 Simon Fraser <simon.fraser@apple.com> >+ >+ Add some basic geometry information to the scrolling tree >+ https://bugs.webkit.org/show_bug.cgi?id=194002 >+ rdar://problem/47656294 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ To allow hit-testing in the scrolling tree, store a parent-relative scrollable >+ rect in "scrolling" and "frame hosting" nodes. This is a rect whose size is the size >+ of the scrollable area, and whose origin is relative to the parent scrolling tree node. >+ >+ Frame hosting nodes need this rect because they take care of the geometry offset between >+ an iframe and its scrolling tree ancestor in the parent document. >+ >+ Based on a patch by Frédéric Wang in bug 172917. >+ >+ * page/scrolling/AsyncScrollingCoordinator.cpp: >+ (WebCore::AsyncScrollingCoordinator::setScrollingNodeGeometry): >+ * page/scrolling/ScrollingStateFrameHostingNode.cpp: >+ (WebCore::ScrollingStateFrameHostingNode::ScrollingStateFrameHostingNode): >+ (WebCore::ScrollingStateFrameHostingNode::setAllPropertiesChanged): >+ (WebCore::ScrollingStateFrameHostingNode::setParentRelativeScrollableRect): >+ (WebCore::ScrollingStateFrameHostingNode::dumpProperties const): >+ * page/scrolling/ScrollingStateFrameHostingNode.h: >+ * page/scrolling/ScrollingTreeFrameHostingNode.cpp: >+ (WebCore::ScrollingTreeFrameHostingNode::commitStateBeforeChildren): >+ (WebCore::ScrollingTreeFrameHostingNode::dumpProperties const): >+ * page/scrolling/ScrollingTreeFrameHostingNode.h: >+ (WebCore::ScrollingTreeFrameHostingNode::parentRelativeScrollableRect const): >+ * rendering/RenderLayer.h: >+ * rendering/RenderLayerBacking.cpp: >+ (WebCore::RenderLayerBacking::updateScrollingLayers): >+ * rendering/RenderLayerCompositor.cpp: >+ (WebCore::RenderLayerCompositor::computeFrameScrollingGeometry const): >+ (WebCore::RenderLayerCompositor::computeFrameHostingGeometry const): >+ (WebCore::RenderLayerCompositor::computeOverflowScrollingGeometry const): >+ (WebCore::RenderLayerCompositor::updateScrollingNodeForScrollingRole): >+ (WebCore::RenderLayerCompositor::updateScrollingNodeForFrameHostingRole): >+ (WebCore::RenderLayerCompositor::updateScrollSnapPropertiesWithFrameView const): >+ (WebCore::RenderLayerCompositor::updateScrollSnapPropertiesWithFrameView): Deleted. >+ * rendering/RenderLayerCompositor.h: >+ > 2019-01-29 Simon Fraser <simon.fraser@apple.com> > > Add nodes to the scrolling tree in z-index order. >diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog >index bc81a084abd693583c65dcc7ceca5679115f7842..d2454647298bddee53239829eaf077fc2503ca2b 100644 >--- a/Source/WebKit/ChangeLog >+++ b/Source/WebKit/ChangeLog >@@ -1,3 +1,15 @@ >+2019-01-29 Simon Fraser <simon.fraser@apple.com> >+ >+ Add some basic geometry information to the scrolling tree >+ https://bugs.webkit.org/show_bug.cgi?id=194002 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Add a comment explaining why we don't need to encode/decode ParentRelativeScrollableRect. >+ >+ * Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp: >+ (ArgumentCoder<ScrollingStateFrameHostingNode>::encode): >+ > 2019-01-29 Simon Fraser <simon.fraser@apple.com> > > Add nodes to the scrolling tree in z-index order. >diff --git a/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp b/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp >index 8f12a31da23926b06b1bd8c164e2966be8b63ae8..f7d809da1c4f19129582ea14fae9a87076b00bbd 100644 >--- a/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp >+++ b/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp >@@ -40,6 +40,7 @@ > #include "ScrollAnimator.h" > #include "ScrollingConstraints.h" > #include "ScrollingStateFixedNode.h" >+#include "ScrollingStateFrameHostingNode.h" > #include "ScrollingStateFrameScrollingNode.h" > #include "ScrollingStateOverflowScrollingNode.h" > #include "ScrollingStateStickyNode.h" >@@ -591,25 +592,33 @@ void AsyncScrollingCoordinator::setNodeLayers(ScrollingNodeID nodeID, GraphicsLa > > void AsyncScrollingCoordinator::setScrollingNodeGeometry(ScrollingNodeID nodeID, const ScrollingGeometry& scrollingGeometry) > { >- auto* scrollingNode = downcast<ScrollingStateScrollingNode>(m_scrollingStateTree->stateNodeForID(nodeID)); >- ASSERT(scrollingNode); >- if (!scrollingNode) >+ auto* stateNode = m_scrollingStateTree->stateNodeForID(nodeID); >+ ASSERT(stateNode); >+ if (!stateNode) >+ return; >+ >+ if (stateNode->nodeType() == ScrollingNodeType::FrameHosting) { >+ auto& frameHostingStateNode = downcast<ScrollingStateFrameHostingNode>(*stateNode); >+ frameHostingStateNode.setParentRelativeScrollableRect(scrollingGeometry.parentRelativeScrollableRect); > return; >+ } >+ >+ auto& scrollingNode = downcast<ScrollingStateScrollingNode>(*stateNode); > >- scrollingNode->setParentRelativeScrollableRect(scrollingGeometry.parentRelativeScrollableRect); >- scrollingNode->setScrollOrigin(scrollingGeometry.scrollOrigin); >- scrollingNode->setScrollPosition(scrollingGeometry.scrollPosition); >- scrollingNode->setTotalContentsSize(scrollingGeometry.contentSize); >- scrollingNode->setReachableContentsSize(scrollingGeometry.reachableContentSize); >- scrollingNode->setScrollableAreaSize(scrollingGeometry.scrollableAreaSize); >+ scrollingNode.setParentRelativeScrollableRect(scrollingGeometry.parentRelativeScrollableRect); >+ scrollingNode.setScrollOrigin(scrollingGeometry.scrollOrigin); >+ scrollingNode.setScrollPosition(scrollingGeometry.scrollPosition); >+ scrollingNode.setTotalContentsSize(scrollingGeometry.contentSize); >+ scrollingNode.setReachableContentsSize(scrollingGeometry.reachableContentSize); >+ scrollingNode.setScrollableAreaSize(scrollingGeometry.scrollableAreaSize); > > #if ENABLE(CSS_SCROLL_SNAP) > // updateScrollSnapPropertiesWithFrameView() sets these for frame scrolling nodes. FIXME: Why the difference? > if (is<ScrollingStateOverflowScrollingNode>(scrollingNode)) { >- setStateScrollingNodeSnapOffsetsAsFloat(*scrollingNode, ScrollEventAxis::Horizontal, &scrollingGeometry.horizontalSnapOffsets, &scrollingGeometry.horizontalSnapOffsetRanges, m_page->deviceScaleFactor()); >- setStateScrollingNodeSnapOffsetsAsFloat(*scrollingNode, ScrollEventAxis::Vertical, &scrollingGeometry.verticalSnapOffsets, &scrollingGeometry.verticalSnapOffsetRanges, m_page->deviceScaleFactor()); >- scrollingNode->setCurrentHorizontalSnapPointIndex(scrollingGeometry.currentHorizontalSnapPointIndex); >- scrollingNode->setCurrentVerticalSnapPointIndex(scrollingGeometry.currentVerticalSnapPointIndex); >+ setStateScrollingNodeSnapOffsetsAsFloat(scrollingNode, ScrollEventAxis::Horizontal, &scrollingGeometry.horizontalSnapOffsets, &scrollingGeometry.horizontalSnapOffsetRanges, m_page->deviceScaleFactor()); >+ setStateScrollingNodeSnapOffsetsAsFloat(scrollingNode, ScrollEventAxis::Vertical, &scrollingGeometry.verticalSnapOffsets, &scrollingGeometry.verticalSnapOffsetRanges, m_page->deviceScaleFactor()); >+ scrollingNode.setCurrentHorizontalSnapPointIndex(scrollingGeometry.currentHorizontalSnapPointIndex); >+ scrollingNode.setCurrentVerticalSnapPointIndex(scrollingGeometry.currentVerticalSnapPointIndex); > } > #endif > } >diff --git a/Source/WebCore/page/scrolling/ScrollingStateFrameHostingNode.cpp b/Source/WebCore/page/scrolling/ScrollingStateFrameHostingNode.cpp >index 0cebd30b90ea5d5264c1d6b93558c0cbd7753e31..ecb64d59af0718a812151f3cdf169880eabf874f 100644 >--- a/Source/WebCore/page/scrolling/ScrollingStateFrameHostingNode.cpp >+++ b/Source/WebCore/page/scrolling/ScrollingStateFrameHostingNode.cpp >@@ -46,6 +46,7 @@ ScrollingStateFrameHostingNode::ScrollingStateFrameHostingNode(ScrollingStateTre > > ScrollingStateFrameHostingNode::ScrollingStateFrameHostingNode(const ScrollingStateFrameHostingNode& stateNode, ScrollingStateTree& adoptiveTree) > : ScrollingStateNode(stateNode, adoptiveTree) >+ , m_parentRelativeScrollableRect(stateNode.parentRelativeScrollableRect()) > { > } > >@@ -56,10 +57,29 @@ Ref<ScrollingStateNode> ScrollingStateFrameHostingNode::clone(ScrollingStateTree > return adoptRef(*new ScrollingStateFrameHostingNode(*this, adoptiveTree)); > } > >+void ScrollingStateFrameHostingNode::setAllPropertiesChanged() >+{ >+ setPropertyChangedBit(ParentRelativeScrollableRect); >+ >+ ScrollingStateNode::setAllPropertiesChanged(); >+} >+ >+void ScrollingStateFrameHostingNode::setParentRelativeScrollableRect(const LayoutRect& parentRelativeScrollableRect) >+{ >+ if (m_parentRelativeScrollableRect == parentRelativeScrollableRect) >+ return; >+ >+ m_parentRelativeScrollableRect = parentRelativeScrollableRect; >+ setPropertyChanged(ParentRelativeScrollableRect); >+} >+ > void ScrollingStateFrameHostingNode::dumpProperties(TextStream& ts, ScrollingStateTreeAsTextBehavior behavior) const > { > ts << "Frame hosting node"; > ScrollingStateNode::dumpProperties(ts, behavior); >+ >+ if (!m_parentRelativeScrollableRect.isEmpty()) >+ ts.dumpProperty("parent relative scrollable rect", m_parentRelativeScrollableRect); > } > > } // namespace WebCore >diff --git a/Source/WebCore/page/scrolling/ScrollingStateFrameHostingNode.h b/Source/WebCore/page/scrolling/ScrollingStateFrameHostingNode.h >index 1afe3e677405f826b3724c1ad68fa1192c1d5bfc..e2a2e9bb04260a8ffa233e73d06d69c2c50d2330 100644 >--- a/Source/WebCore/page/scrolling/ScrollingStateFrameHostingNode.h >+++ b/Source/WebCore/page/scrolling/ScrollingStateFrameHostingNode.h >@@ -40,11 +40,22 @@ public: > > virtual ~ScrollingStateFrameHostingNode(); > >+ enum ChangedProperty { >+ ParentRelativeScrollableRect = NumStateNodeBits >+ }; >+ >+ const LayoutRect& parentRelativeScrollableRect() const { return m_parentRelativeScrollableRect; } >+ WEBCORE_EXPORT void setParentRelativeScrollableRect(const LayoutRect&); >+ > void dumpProperties(WTF::TextStream&, ScrollingStateTreeAsTextBehavior) const override; > > private: > ScrollingStateFrameHostingNode(ScrollingStateTree&, ScrollingNodeID); > ScrollingStateFrameHostingNode(const ScrollingStateFrameHostingNode&, ScrollingStateTree&); >+ >+ void setAllPropertiesChanged() override; >+ >+ LayoutRect m_parentRelativeScrollableRect; > }; > > } // namespace WebCore >diff --git a/Source/WebCore/page/scrolling/ScrollingTreeFrameHostingNode.cpp b/Source/WebCore/page/scrolling/ScrollingTreeFrameHostingNode.cpp >index 34718e52ce91713465ec2f4c500dc6807355f7b2..24ad08fdb767d6ed35a7e9eedbe61c58b9601143 100644 >--- a/Source/WebCore/page/scrolling/ScrollingTreeFrameHostingNode.cpp >+++ b/Source/WebCore/page/scrolling/ScrollingTreeFrameHostingNode.cpp >@@ -29,6 +29,7 @@ > #if ENABLE(ASYNC_SCROLLING) > > #include "Logging.h" >+#include "ScrollingStateFrameHostingNode.h" > #include "ScrollingStateTree.h" > #include "ScrollingTree.h" > #include <wtf/text/TextStream.h> >@@ -48,9 +49,12 @@ ScrollingTreeFrameHostingNode::ScrollingTreeFrameHostingNode(ScrollingTree& scro > > ScrollingTreeFrameHostingNode::~ScrollingTreeFrameHostingNode() = default; > >-void ScrollingTreeFrameHostingNode::commitStateBeforeChildren(const ScrollingStateNode&) >+void ScrollingTreeFrameHostingNode::commitStateBeforeChildren(const ScrollingStateNode& stateNode) > { >- // Nothing to do. >+ const ScrollingStateFrameHostingNode& frameHostingStateNode = downcast<ScrollingStateFrameHostingNode>(stateNode); >+ >+ if (frameHostingStateNode.hasChangedProperty(ScrollingStateFrameHostingNode::ParentRelativeScrollableRect)) >+ m_parentRelativeScrollableRect = frameHostingStateNode.parentRelativeScrollableRect(); > } > > void ScrollingTreeFrameHostingNode::updateLayersAfterAncestorChange(const ScrollingTreeNode& changedNode, const FloatRect& fixedPositionRect, const FloatSize& cumulativeDelta) >@@ -66,6 +70,9 @@ void ScrollingTreeFrameHostingNode::dumpProperties(TextStream& ts, ScrollingStat > { > ts << "frame hosting node"; > ScrollingTreeNode::dumpProperties(ts, behavior); >+ >+ if (!m_parentRelativeScrollableRect.isEmpty()) >+ ts.dumpProperty("parent relative scrollable rect", m_parentRelativeScrollableRect); > } > > } // namespace WebCore >diff --git a/Source/WebCore/page/scrolling/ScrollingTreeFrameHostingNode.h b/Source/WebCore/page/scrolling/ScrollingTreeFrameHostingNode.h >index fac8b5c92ee2bed01ffd7a0185b25bc6a14cb684..5c3b7974358012e2045639797f11d7f8022efe3d 100644 >--- a/Source/WebCore/page/scrolling/ScrollingTreeFrameHostingNode.h >+++ b/Source/WebCore/page/scrolling/ScrollingTreeFrameHostingNode.h >@@ -44,7 +44,11 @@ private: > void commitStateBeforeChildren(const ScrollingStateNode&) final; > void updateLayersAfterAncestorChange(const ScrollingTreeNode& changedNode, const FloatRect& fixedPositionRect, const FloatSize& cumulativeDelta) final; > >+ const LayoutRect& parentRelativeScrollableRect() const { return m_parentRelativeScrollableRect; } >+ > WEBCORE_EXPORT void dumpProperties(WTF::TextStream&, ScrollingStateTreeAsTextBehavior) const override; >+ >+ LayoutRect m_parentRelativeScrollableRect; > }; > > } // namespace WebCore >diff --git a/Source/WebCore/rendering/RenderLayer.h b/Source/WebCore/rendering/RenderLayer.h >index c04c40a7d4a7d11ae304b0f9f0d57a790ff1884b..63e1fd22153df7a793da4d3bb8caa730c523502f 100644 >--- a/Source/WebCore/rendering/RenderLayer.h >+++ b/Source/WebCore/rendering/RenderLayer.h >@@ -397,6 +397,9 @@ public: > > LayoutRect rect() const { return LayoutRect(location(), size()); } > >+ IntSize visibleSize() const override; >+ IntSize contentsSize() const override; >+ > int scrollWidth() const; > int scrollHeight() const; > >@@ -1030,8 +1033,6 @@ private: > void setScrollOffset(const ScrollOffset&) override; > > IntRect visibleContentRectInternal(VisibleContentRectIncludesScrollbars, VisibleContentRectBehavior) const override; >- IntSize visibleSize() const override; >- IntSize contentsSize() const override; > IntSize overhangAmount() const override; > IntPoint lastKnownMousePosition() const override; > bool isHandlingWheelEvent() const override; >diff --git a/Source/WebCore/rendering/RenderLayerBacking.cpp b/Source/WebCore/rendering/RenderLayerBacking.cpp >index f4de5ec5f4137e06027056696eddb5d38d1df820..53311f5f26ef67e11f2aa6a09a27c9ee4bde0523 100644 >--- a/Source/WebCore/rendering/RenderLayerBacking.cpp >+++ b/Source/WebCore/rendering/RenderLayerBacking.cpp >@@ -1747,6 +1747,7 @@ bool RenderLayerBacking::updateScrollingLayers(bool needsScrollingLayers) > // Inner layer which renders the content that scrolls. > m_scrollingContentsLayer = createGraphicsLayer("scrolled Contents"); > m_scrollingContentsLayer->setDrawsContent(true); >+ m_scrollingContentsLayer->setAnchorPoint({ }); > > GraphicsLayerPaintingPhase paintPhase = GraphicsLayerPaintOverflowContents | GraphicsLayerPaintCompositedScroll; > if (!m_foregroundLayer) >diff --git a/Source/WebCore/rendering/RenderLayerCompositor.cpp b/Source/WebCore/rendering/RenderLayerCompositor.cpp >index 27a774b8b122f14f44d961038d6c8d9633a91346..1e29ca9233f647785254556460edd5546780b3c6 100644 >--- a/Source/WebCore/rendering/RenderLayerCompositor.cpp >+++ b/Source/WebCore/rendering/RenderLayerCompositor.cpp >@@ -3918,6 +3918,71 @@ ScrollingNodeID RenderLayerCompositor::updateScrollingNodeForViewportConstrained > return newNodeID; > } > >+void RenderLayerCompositor::computeFrameScrollingGeometry(ScrollingCoordinator::ScrollingGeometry& scrollingGeometry) const >+{ >+ auto& frameView = m_renderView.frameView(); >+ >+ if (m_renderView.frame().isMainFrame()) >+ scrollingGeometry.parentRelativeScrollableRect = frameView.frameRect(); >+ else >+ scrollingGeometry.parentRelativeScrollableRect = LayoutRect({ }, LayoutSize(frameView.size())); >+ >+ scrollingGeometry.scrollOrigin = frameView.scrollOrigin(); >+ scrollingGeometry.scrollableAreaSize = frameView.visibleContentRect().size(); >+ scrollingGeometry.contentSize = frameView.totalContentsSize(); >+ scrollingGeometry.reachableContentSize = frameView.totalContentsSize(); >+#if ENABLE(CSS_SCROLL_SNAP) >+ frameView.updateSnapOffsets(); >+ updateScrollSnapPropertiesWithFrameView(frameView); >+#endif >+} >+ >+void RenderLayerCompositor::computeFrameHostingGeometry(const RenderLayer& layer, const RenderLayer* ancestorLayer, ScrollingCoordinator::ScrollingGeometry& scrollingGeometry) const >+{ >+ // FIXME: ancestorLayer needs to be always non-null, so should become a reference. >+ if (ancestorLayer) { >+ LayoutRect scrollableRect; >+ if (is<RenderBox>(layer.renderer())) >+ scrollableRect = downcast<RenderBox>(layer.renderer()).paddingBoxRect(); >+ >+ auto offset = layer.convertToLayerCoords(ancestorLayer, scrollableRect.location()); // FIXME: broken for columns. >+ scrollableRect.setLocation(offset); >+ scrollingGeometry.parentRelativeScrollableRect = scrollableRect; >+ } >+} >+ >+void RenderLayerCompositor::computeOverflowScrollingGeometry(const RenderLayer& layer, const RenderLayer* ancestorLayer, ScrollingCoordinator::ScrollingGeometry& scrollingGeometry) const >+{ >+ // FIXME: ancestorLayer needs to be always non-null, so should become a reference. >+ if (ancestorLayer) { >+ LayoutRect scrollableRect; >+ if (is<RenderBox>(layer.renderer())) >+ scrollableRect = downcast<RenderBox>(layer.renderer()).paddingBoxRect(); >+ >+ auto offset = layer.convertToLayerCoords(ancestorLayer, scrollableRect.location()); // FIXME: broken for columns. >+ scrollableRect.setLocation(offset); >+ scrollingGeometry.parentRelativeScrollableRect = scrollableRect; >+ } >+ >+ scrollingGeometry.scrollOrigin = layer.scrollOrigin(); >+ scrollingGeometry.scrollPosition = layer.scrollPosition(); >+ scrollingGeometry.scrollableAreaSize = layer.visibleSize(); >+ scrollingGeometry.contentSize = layer.contentsSize(); >+ scrollingGeometry.reachableContentSize = layer.scrollableContentsSize(); >+#if ENABLE(CSS_SCROLL_SNAP) >+ if (const Vector<LayoutUnit>* offsets = layer.horizontalSnapOffsets()) >+ scrollingGeometry.horizontalSnapOffsets = *offsets; >+ if (const Vector<LayoutUnit>* offsets = layer.verticalSnapOffsets()) >+ scrollingGeometry.verticalSnapOffsets = *offsets; >+ if (const Vector<ScrollOffsetRange<LayoutUnit>>* ranges = layer.horizontalSnapOffsetRanges()) >+ scrollingGeometry.horizontalSnapOffsetRanges = *ranges; >+ if (const Vector<ScrollOffsetRange<LayoutUnit>>* ranges = layer.verticalSnapOffsetRanges()) >+ scrollingGeometry.verticalSnapOffsetRanges = *ranges; >+ scrollingGeometry.currentHorizontalSnapPointIndex = layer.currentHorizontalSnapPointIndex(); >+ scrollingGeometry.currentVerticalSnapPointIndex = layer.currentVerticalSnapPointIndex(); >+#endif >+} >+ > ScrollingNodeID RenderLayerCompositor::updateScrollingNodeForScrollingRole(RenderLayer& layer, ScrollingTreeState& treeState, OptionSet<ScrollingNodeChangeFlags> changes) > { > auto* scrollingCoordinator = this->scrollingCoordinator(); >@@ -3940,15 +4005,7 @@ ScrollingNodeID RenderLayerCompositor::updateScrollingNodeForScrollingRole(Rende > > if (changes & ScrollingNodeChangeFlags::LayerGeometry) { > ScrollingCoordinator::ScrollingGeometry scrollingGeometry; >- // FIXME(https://webkit.org/b/172917): Pass parentRelativeScrollableRect? >- scrollingGeometry.scrollOrigin = frameView.scrollOrigin(); >- scrollingGeometry.scrollableAreaSize = frameView.visibleContentRect().size(); >- scrollingGeometry.contentSize = frameView.totalContentsSize(); >- scrollingGeometry.reachableContentSize = frameView.totalContentsSize(); >-#if ENABLE(CSS_SCROLL_SNAP) >- frameView.updateSnapOffsets(); >- scrollingCoordinator->updateScrollSnapPropertiesWithFrameView(frameView); >-#endif >+ computeFrameScrollingGeometry(scrollingGeometry); > scrollingCoordinator->setScrollingNodeGeometry(newNodeID, scrollingGeometry); > } > } else { >@@ -3961,26 +4018,10 @@ ScrollingNodeID RenderLayerCompositor::updateScrollingNodeForScrollingRole(Rende > if (changes & ScrollingNodeChangeFlags::Layer) > scrollingCoordinator->setNodeLayers(newNodeID, layer.backing()->scrollingLayer(), layer.backing()->scrollingContentsLayer()); > >- if (changes & ScrollingNodeChangeFlags::LayerGeometry) { >+ if (changes & ScrollingNodeChangeFlags::LayerGeometry && treeState.parentNodeID) { >+ RenderLayer* scrollingAncestorLayer = m_scrollingNodeToLayerMap.get(treeState.parentNodeID.value()); > ScrollingCoordinator::ScrollingGeometry scrollingGeometry; >- // FIXME(https://webkit.org/b/172917): Pass parentRelativeScrollableRect? >- scrollingGeometry.scrollOrigin = layer.scrollOrigin(); >- scrollingGeometry.scrollPosition = layer.scrollPosition(); >- scrollingGeometry.scrollableAreaSize = layer.visibleSize(); >- scrollingGeometry.contentSize = layer.contentsSize(); >- scrollingGeometry.reachableContentSize = layer.scrollableContentsSize(); >-#if ENABLE(CSS_SCROLL_SNAP) >- if (const Vector<LayoutUnit>* offsets = layer.horizontalSnapOffsets()) >- scrollingGeometry.horizontalSnapOffsets = *offsets; >- if (const Vector<LayoutUnit>* offsets = layer.verticalSnapOffsets()) >- scrollingGeometry.verticalSnapOffsets = *offsets; >- if (const Vector<ScrollOffsetRange<LayoutUnit>>* ranges = layer.horizontalSnapOffsetRanges()) >- scrollingGeometry.horizontalSnapOffsetRanges = *ranges; >- if (const Vector<ScrollOffsetRange<LayoutUnit>>* ranges = layer.verticalSnapOffsetRanges()) >- scrollingGeometry.verticalSnapOffsetRanges = *ranges; >- scrollingGeometry.currentHorizontalSnapPointIndex = layer.currentHorizontalSnapPointIndex(); >- scrollingGeometry.currentVerticalSnapPointIndex = layer.currentVerticalSnapPointIndex(); >-#endif >+ computeOverflowScrollingGeometry(layer, scrollingAncestorLayer, scrollingGeometry); > scrollingCoordinator->setScrollingNodeGeometry(newNodeID, scrollingGeometry); > } > } >@@ -4001,6 +4042,13 @@ ScrollingNodeID RenderLayerCompositor::updateScrollingNodeForFrameHostingRole(Re > if (changes & ScrollingNodeChangeFlags::Layer) > scrollingCoordinator->setNodeLayers(newNodeID, layer.backing()->graphicsLayer()); > >+ if (changes & ScrollingNodeChangeFlags::LayerGeometry && treeState.parentNodeID) { >+ RenderLayer* scrollingAncestorLayer = m_scrollingNodeToLayerMap.get(treeState.parentNodeID.value()); >+ ScrollingCoordinator::ScrollingGeometry scrollingGeometry; >+ computeFrameHostingGeometry(layer, scrollingAncestorLayer, scrollingGeometry); >+ scrollingCoordinator->setScrollingNodeGeometry(newNodeID, scrollingGeometry); >+ } >+ > return newNodeID; > } > >@@ -4123,7 +4171,7 @@ RefPtr<DisplayRefreshMonitor> RenderLayerCompositor::createDisplayRefreshMonitor > #endif > > #if ENABLE(CSS_SCROLL_SNAP) >-void RenderLayerCompositor::updateScrollSnapPropertiesWithFrameView(const FrameView& frameView) >+void RenderLayerCompositor::updateScrollSnapPropertiesWithFrameView(const FrameView& frameView) const > { > if (auto* coordinator = scrollingCoordinator()) > coordinator->updateScrollSnapPropertiesWithFrameView(frameView); >diff --git a/Source/WebCore/rendering/RenderLayerCompositor.h b/Source/WebCore/rendering/RenderLayerCompositor.h >index c1025777755e33021f861f806ff1b958d4a14808..60c4f45919baac10fd1144921d0517e582764515 100644 >--- a/Source/WebCore/rendering/RenderLayerCompositor.h >+++ b/Source/WebCore/rendering/RenderLayerCompositor.h >@@ -352,7 +352,7 @@ public: > void updateRootContentLayerClipping(); > > #if ENABLE(CSS_SCROLL_SNAP) >- void updateScrollSnapPropertiesWithFrameView(const FrameView&); >+ void updateScrollSnapPropertiesWithFrameView(const FrameView&) const; > #endif > > // For testing. >@@ -497,6 +497,10 @@ private: > FixedPositionViewportConstraints computeFixedViewportConstraints(RenderLayer&) const; > StickyPositionViewportConstraints computeStickyViewportConstraints(RenderLayer&) const; > >+ void computeFrameScrollingGeometry(ScrollingCoordinator::ScrollingGeometry&) const; >+ void computeFrameHostingGeometry(const RenderLayer&, const RenderLayer* ancestorLayer, ScrollingCoordinator::ScrollingGeometry&) const; >+ void computeOverflowScrollingGeometry(const RenderLayer&, const RenderLayer* ancestorLayer, ScrollingCoordinator::ScrollingGeometry&) const; >+ > bool requiresScrollLayer(RootLayerAttachment) const; > bool requiresHorizontalScrollbarLayer() const; > bool requiresVerticalScrollbarLayer() const; >diff --git a/Source/WebKit/Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp b/Source/WebKit/Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp >index 059ed28fc972a882131e33ddf8a877e6bb99004e..0d01f33c1c8284eaeba57f67f9cae10a41f56905 100644 >--- a/Source/WebKit/Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp >+++ b/Source/WebKit/Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp >@@ -181,6 +181,7 @@ void ArgumentCoder<ScrollingStateFrameScrollingNode>::encode(Encoder& encoder, c > void ArgumentCoder<ScrollingStateFrameHostingNode>::encode(Encoder& encoder, const ScrollingStateFrameHostingNode& node) > { > encoder << static_cast<const ScrollingStateNode&>(node); >+ // ParentRelativeScrollableRect isn't used so we don't encode it. > } > > void ArgumentCoder<ScrollingStateOverflowScrollingNode>::encode(Encoder& encoder, const ScrollingStateOverflowScrollingNode& node) >diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog >index beba46f50bd073b7775a9afed4fcddc46afd1532..75468551a95c255c054e254f215ae143e511a235 100644 >--- a/LayoutTests/ChangeLog >+++ b/LayoutTests/ChangeLog >@@ -1,3 +1,74 @@ >+2019-01-29 Simon Fraser <simon.fraser@apple.com> >+ >+ Add some basic geometry information to the scrolling tree >+ https://bugs.webkit.org/show_bug.cgi?id=194002 >+ rdar://problem/47656294 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ New test results with "parent relative scrollable rect" output. >+ >+ * fast/scrolling/ios/change-scrollability-on-content-resize-expected.txt: >+ * fast/scrolling/ios/change-scrollability-on-content-resize-nested-expected.txt: >+ * fast/scrolling/ios/overflow-scroll-touch-expected.txt: >+ * fast/scrolling/ios/reconcile-layer-position-recursive-expected.txt: >+ * fast/scrolling/ios/subpixel-overflow-scrolling-with-ancestor-expected.txt: >+ * fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolled-down-expected.txt: >+ * fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolled-down-then-up-expected.txt: >+ * fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolling-layers-state-expected.txt: >+ * platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-expected.txt: >+ * platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-gain-scrolling-ancestor-expected.txt: >+ * platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-in-fixed-expected.txt: >+ * platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-lose-scrolling-ancestor-expected.txt: >+ * platform/ios-wk2/scrollingcoordinator/scrolling-tree/fixed-inside-frame-expected.txt: >+ * platform/ios-wk2/scrollingcoordinator/scrolling-tree/gain-scrolling-node-parent-expected.txt: >+ * platform/ios-wk2/scrollingcoordinator/scrolling-tree/lose-scrolling-node-parent-expected.txt: >+ * platform/ios-wk2/scrollingcoordinator/scrolling-tree/overflow-in-fixed-expected.txt: >+ * platform/ios-wk2/scrollingcoordinator/scrolling-tree/remove-coordinated-frame-expected.txt: >+ * platform/ios-wk2/scrollingcoordinator/scrolling-tree/remove-scrolling-role-expected.txt: >+ * platform/ios-wk2/scrollingcoordinator/scrolling-tree/reparent-across-compositing-layers-expected.txt: >+ * platform/ios-wk2/scrollingcoordinator/scrolling-tree/reparent-with-layer-removal-expected.txt: >+ * platform/ios-wk2/scrollingcoordinator/scrolling-tree/scrolling-tree-includes-frame-expected.txt: >+ * platform/ios-wk2/scrollingcoordinator/scrolling-tree/scrolling-tree-is-z-order-expected.txt: >+ * platform/ios-wk2/scrollingcoordinator/scrolling-tree/toggle-coordinated-frame-scrolling-expected.txt: >+ * platform/ios/fast/scrolling/ios/overflow-scrolling-ancestor-clip-expected.txt: >+ * platform/ios/fast/scrolling/ios/overflow-scrolling-ancestor-clip-size-expected.txt: >+ * platform/ios/fast/scrolling/ios/scrolling-content-clip-to-viewport-expected.txt: >+ * platform/ios/fast/scrolling/ios/textarea-scroll-touch-expected.txt: >+ * scrollingcoordinator/scrolling-tree/coordinated-frame-expected.txt: >+ * scrollingcoordinator/scrolling-tree/coordinated-frame-gain-scrolling-ancestor-expected.txt: >+ * scrollingcoordinator/scrolling-tree/coordinated-frame-in-fixed-expected.txt: >+ * scrollingcoordinator/scrolling-tree/coordinated-frame-lose-scrolling-ancestor-expected.txt: >+ * scrollingcoordinator/scrolling-tree/fixed-inside-frame-expected.txt: >+ * scrollingcoordinator/scrolling-tree/gain-scrolling-node-parent-expected.txt: >+ * scrollingcoordinator/scrolling-tree/lose-scrolling-node-parent-expected.txt: >+ * scrollingcoordinator/scrolling-tree/overflow-in-fixed-expected.txt: >+ * scrollingcoordinator/scrolling-tree/remove-coordinated-frame-expected.txt: >+ * scrollingcoordinator/scrolling-tree/remove-scrolling-role-expected.txt: >+ * scrollingcoordinator/scrolling-tree/reparent-across-compositing-layers-expected.txt: >+ * scrollingcoordinator/scrolling-tree/reparent-with-layer-removal-expected.txt: >+ * scrollingcoordinator/scrolling-tree/scrolling-tree-includes-frame-expected.txt: >+ * scrollingcoordinator/scrolling-tree/scrolling-tree-is-z-order-expected.txt: >+ * scrollingcoordinator/scrolling-tree/toggle-coordinated-frame-scrolling-expected.txt: >+ * tiled-drawing/scrolling/clamp-out-of-bounds-scrolls-expected.txt: >+ * tiled-drawing/scrolling/fixed/absolute-inside-fixed-expected.txt: >+ * tiled-drawing/scrolling/fixed/absolute-inside-out-of-view-fixed-expected.txt: >+ * tiled-drawing/scrolling/fixed/fixed-in-overflow-expected.txt: >+ * tiled-drawing/scrolling/fixed/fixed-position-out-of-view-expected.txt: >+ * tiled-drawing/scrolling/fixed/fixed-position-out-of-view-negative-zindex-expected.txt: >+ * tiled-drawing/scrolling/fixed/four-bars-expected.txt: >+ * tiled-drawing/scrolling/fixed/four-bars-with-header-and-footer-expected.txt: >+ * tiled-drawing/scrolling/fixed/negative-scroll-offset-expected.txt: >+ * tiled-drawing/scrolling/fixed/negative-scroll-offset-in-view-expected.txt: >+ * tiled-drawing/scrolling/fixed/nested-fixed-expected.txt: >+ * tiled-drawing/scrolling/fixed/percentage-inside-fixed-expected.txt: >+ * tiled-drawing/scrolling/frames/scroll-region-after-frame-layout-expected.txt: >+ * tiled-drawing/scrolling/scrolling-tree-after-scroll-expected.txt: >+ * tiled-drawing/scrolling/scrolling-tree-slow-scrolling-expected.txt: >+ * tiled-drawing/scrolling/sticky/negative-scroll-offset-expected.txt: >+ * tiled-drawing/scrolling/sticky/sticky-horizontal-expected.txt: >+ * tiled-drawing/scrolling/sticky/sticky-vertical-expected.txt: >+ > 2019-01-29 Simon Fraser <simon.fraser@apple.com> > > Add nodes to the scrolling tree in z-index order. >diff --git a/LayoutTests/fast/scrolling/ios/change-scrollability-on-content-resize-expected.txt b/LayoutTests/fast/scrolling/ios/change-scrollability-on-content-resize-expected.txt >index 18c16ef08aaeb6294529d5b18d326b213505ae43..9691f78170ec0538aa276be35a342cf3ea7d1336 100644 >--- a/LayoutTests/fast/scrolling/ios/change-scrollability-on-content-resize-expected.txt >+++ b/LayoutTests/fast/scrolling/ios/change-scrollability-on-content-resize-expected.txt >@@ -86,6 +86,7 @@ > (children 1 > (GraphicsLayer > (offsetFromRenderer width=5 height=5) >+ (anchor 0.00 0.00) > (bounds 200.00 400.00) > (drawsContent 1) > (visible rect 0.00, 0.00 200.00 x 200.00) >@@ -117,6 +118,7 @@ > (children 1 > (GraphicsLayer > (offsetFromRenderer width=5 height=5) >+ (anchor 0.00 0.00) > (bounds 200.00 400.00) > (drawsContent 1) > (visible rect 0.00, 0.00 200.00 x 200.00) >@@ -140,6 +142,7 @@ > (Frame scrolling node > (scrollable area size 800 600) > (contents size 800 600) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) >@@ -154,6 +157,7 @@ > (Overflow scrolling node > (scrollable area size 200 200) > (contents size 200 400) >+ (parent relative scrollable rect at (260,10) size 200x200) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) >@@ -163,6 +167,7 @@ > (Overflow scrolling node > (scrollable area size 200 200) > (contents size 200 400) >+ (parent relative scrollable rect at (260,260) size 200x200) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) >diff --git a/LayoutTests/fast/scrolling/ios/change-scrollability-on-content-resize-nested-expected.txt b/LayoutTests/fast/scrolling/ios/change-scrollability-on-content-resize-nested-expected.txt >index b5e6c6078ab3616e4a6ee97cf20b3b4b24ec2bae..60572d383dfecfdcb9749c3ee06bfa38dd9f3c01 100644 >--- a/LayoutTests/fast/scrolling/ios/change-scrollability-on-content-resize-nested-expected.txt >+++ b/LayoutTests/fast/scrolling/ios/change-scrollability-on-content-resize-nested-expected.txt >@@ -34,6 +34,7 @@ > (contentsScale 2.00) > (children 1 > (GraphicsLayer >+ (anchor 0.00 0.00) > (bounds 300.00 400.00) > (drawsContent 1) > (visible rect 0.00, 0.00 300.00 x 200.00) >@@ -66,6 +67,7 @@ > (Frame scrolling node > (scrollable area size 800 600) > (contents size 800 600) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) >@@ -80,6 +82,7 @@ > (Overflow scrolling node > (scrollable area size 300 200) > (contents size 300 400) >+ (parent relative scrollable rect at (8,13) size 300x200) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) >diff --git a/LayoutTests/fast/scrolling/ios/overflow-scroll-touch-expected.txt b/LayoutTests/fast/scrolling/ios/overflow-scroll-touch-expected.txt >index 765dc6f6569b5ce8e052503ee7b2b0e19394a34a..56670f2dd724050177c3b64ea2aa77dce575359e 100644 >--- a/LayoutTests/fast/scrolling/ios/overflow-scroll-touch-expected.txt >+++ b/LayoutTests/fast/scrolling/ios/overflow-scroll-touch-expected.txt >@@ -23,6 +23,7 @@ > (GraphicsLayer > (offsetFromRenderer width=1 height=1) > (scrollOffset (0,50)) >+ (anchor 0.00 0.00) > (bounds 200.00 400.00) > (drawsContent 1) > ) >@@ -44,6 +45,7 @@ > (GraphicsLayer > (offsetFromRenderer width=1 height=1) > (scrollOffset (0,50)) >+ (anchor 0.00 0.00) > (bounds 200.00 400.00) > (drawsContent 1) > ) >diff --git a/LayoutTests/fast/scrolling/ios/reconcile-layer-position-recursive-expected.txt b/LayoutTests/fast/scrolling/ios/reconcile-layer-position-recursive-expected.txt >index 1b6f6dbeaba6a952ab05ff0e6b0fcbdb2bd018d3..190f6613ef11be853663e79fc91586c5f51241eb 100644 >--- a/LayoutTests/fast/scrolling/ios/reconcile-layer-position-recursive-expected.txt >+++ b/LayoutTests/fast/scrolling/ios/reconcile-layer-position-recursive-expected.txt >@@ -35,6 +35,7 @@ > (contentsScale 2.00) > (children 1 > (GraphicsLayer >+ (anchor 0.00 0.00) > (bounds 300.00 510.00) > (drawsContent 1) > (visible rect 0.00, 13.00 300.00 x 287.00) >@@ -62,6 +63,7 @@ > (children 1 > (GraphicsLayer > (offsetFromRenderer width=5 height=5) >+ (anchor 0.00 0.00) > (bounds 270.00 610.00) > (drawsContent 1) > (visible rect 0.00, 0.00 200.00 x 245.00) >diff --git a/LayoutTests/fast/scrolling/ios/subpixel-overflow-scrolling-with-ancestor-expected.txt b/LayoutTests/fast/scrolling/ios/subpixel-overflow-scrolling-with-ancestor-expected.txt >index 828928400c2b57ffaacd7735da85b33ca7cce50e..6ea8a1a379cc51a2df546af21df538b6cf43a1eb 100644 >--- a/LayoutTests/fast/scrolling/ios/subpixel-overflow-scrolling-with-ancestor-expected.txt >+++ b/LayoutTests/fast/scrolling/ios/subpixel-overflow-scrolling-with-ancestor-expected.txt >@@ -16,6 +16,7 @@ > (children 1 > (GraphicsLayer > (scrollOffset (0,30)) >+ (anchor 0.00 0.00) > (bounds 300.00 900.00) > (drawsContent 1) > (children 1 >diff --git a/LayoutTests/fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolled-down-expected.txt b/LayoutTests/fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolled-down-expected.txt >index 21d41141558003650078c575be8be23a292cf027..22ca548b990f6e5f5f5462b6a62ccd263c1693b3 100644 >--- a/LayoutTests/fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolled-down-expected.txt >+++ b/LayoutTests/fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolled-down-expected.txt >@@ -4,6 +4,7 @@ > (contents size 4016 4042) > (requested scroll position 40 1000) > (requested scroll position represents programmatic scroll 1) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 2) > (vertical scroll elasticity 2) >diff --git a/LayoutTests/fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolled-down-then-up-expected.txt b/LayoutTests/fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolled-down-then-up-expected.txt >index d22f64a14ec0a971a8be3fd4e68bcb850bd5aa5e..1b3965f2e54e12d7d4c6f4288e2589b249846d06 100644 >--- a/LayoutTests/fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolled-down-then-up-expected.txt >+++ b/LayoutTests/fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolled-down-then-up-expected.txt >@@ -4,6 +4,7 @@ > (contents size 4016 4042) > (requested scroll position 40 460) > (requested scroll position represents programmatic scroll 1) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 2) > (vertical scroll elasticity 2) >diff --git a/LayoutTests/fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolling-layers-state-expected.txt b/LayoutTests/fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolling-layers-state-expected.txt >index 8029b8f60f9534298f17f4f8b2d2f95041e541d2..3f20e5a14274bfcda594d3545d3b4342dac51cad 100644 >--- a/LayoutTests/fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolling-layers-state-expected.txt >+++ b/LayoutTests/fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolling-layers-state-expected.txt >@@ -2,6 +2,7 @@ > (Frame scrolling node > (scrollable area size 785 585) > (contents size 4016 4042) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 2) > (vertical scroll elasticity 2) >diff --git a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-expected.txt b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-expected.txt >index 27ca443f3085870d17924c9b6ba272cb58fa4611..e5a76e78040ae0ab7c2624491031662d7d832907 100644 >--- a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-expected.txt >+++ b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-expected.txt >@@ -2,6 +2,7 @@ > (Frame scrolling node > (scrollable area size 800 600) > (contents size 800 1016) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) >@@ -14,10 +15,12 @@ > (behavior for fixed 0) > (children 1 > (Frame hosting node >+ (parent relative scrollable rect at (37,39) size 500x300) > (children 1 > (Frame scrolling node > (scrollable area size 500 300) > (contents size 500 420) >+ (parent relative scrollable rect at (0,0) size 500x300) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) >@@ -32,6 +35,7 @@ > (Overflow scrolling node > (scrollable area size 400 300) > (contents size 400 1760) >+ (parent relative scrollable rect at (10,10) size 400x300) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) >diff --git a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-gain-scrolling-ancestor-expected.txt b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-gain-scrolling-ancestor-expected.txt >index 9af13737c4061f56649588d52b6822e85181b442..3e2c9c75d69b1c7c6f5a79300914bc83ee00de98 100644 >--- a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-gain-scrolling-ancestor-expected.txt >+++ b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-gain-scrolling-ancestor-expected.txt >@@ -2,6 +2,7 @@ > (Frame scrolling node > (scrollable area size 800 600) > (contents size 800 1016) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) >@@ -19,10 +20,12 @@ > (layer position at last layout (8,10)) > (children 1 > (Frame hosting node >+ (parent relative scrollable rect at (29,29) size 500x300) > (children 1 > (Frame scrolling node > (scrollable area size 500 300) > (contents size 500 420) >+ (parent relative scrollable rect at (0,0) size 500x300) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) >@@ -37,6 +40,7 @@ > (Overflow scrolling node > (scrollable area size 400 300) > (contents size 400 1760) >+ (parent relative scrollable rect at (10,10) size 400x300) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) >diff --git a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-in-fixed-expected.txt b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-in-fixed-expected.txt >index 28fc30e6f6f78a501f4b2e098b8a86445bca0bc9..1609cae4197d44ed937ae7d8771de3e365c06d84 100644 >--- a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-in-fixed-expected.txt >+++ b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-in-fixed-expected.txt >@@ -2,6 +2,7 @@ > (Frame scrolling node > (scrollable area size 800 600) > (contents size 800 1016) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) >@@ -19,10 +20,12 @@ > (layer position at last layout (8,0)) > (children 1 > (Frame hosting node >+ (parent relative scrollable rect at (29,29) size 500x300) > (children 1 > (Frame scrolling node > (scrollable area size 500 300) > (contents size 500 420) >+ (parent relative scrollable rect at (0,0) size 500x300) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) >@@ -37,6 +40,7 @@ > (Overflow scrolling node > (scrollable area size 400 300) > (contents size 400 1760) >+ (parent relative scrollable rect at (10,10) size 400x300) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) >diff --git a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-lose-scrolling-ancestor-expected.txt b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-lose-scrolling-ancestor-expected.txt >index aa54c26880f1aa03a22932b822533ff704883aed..f80a475af7b68d5e249e1905d57cc4566e33cfe8 100644 >--- a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-lose-scrolling-ancestor-expected.txt >+++ b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-lose-scrolling-ancestor-expected.txt >@@ -2,6 +2,7 @@ > (Frame scrolling node > (scrollable area size 800 600) > (contents size 800 1016) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) >@@ -14,10 +15,12 @@ > (behavior for fixed 0) > (children 1 > (Frame hosting node >+ (parent relative scrollable rect at (37,39) size 500x300) > (children 1 > (Frame scrolling node > (scrollable area size 500 300) > (contents size 500 420) >+ (parent relative scrollable rect at (0,0) size 500x300) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) >@@ -32,6 +35,7 @@ > (Overflow scrolling node > (scrollable area size 400 300) > (contents size 400 1760) >+ (parent relative scrollable rect at (10,10) size 400x300) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) >diff --git a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/fixed-inside-frame-expected.txt b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/fixed-inside-frame-expected.txt >index 033e738014a26254b193457b9d10c285d58249de..27782bae3966a027db3da82c13e236c152df5e03 100644 >--- a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/fixed-inside-frame-expected.txt >+++ b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/fixed-inside-frame-expected.txt >@@ -3,6 +3,7 @@ > (Frame scrolling node > (scrollable area size 800 600) > (contents size 800 657) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) >@@ -15,12 +16,14 @@ > (behavior for fixed 0) > (children 1 > (Frame hosting node >+ (parent relative scrollable rect at (110,110) size 480x400) > (children 1 > (Frame scrolling node > (scrollable area size 480 400) > (contents size 480 1016) > (requested scroll position 0 120) > (requested scroll position represents programmatic scroll 1) >+ (parent relative scrollable rect at (0,0) size 480x400) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) >diff --git a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/gain-scrolling-node-parent-expected.txt b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/gain-scrolling-node-parent-expected.txt >index 0f5dc63b447deb66185498824c097d31b73721e6..5fc7fa011e0efad849e1d39dd2b2ae0efc7959d5 100644 >--- a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/gain-scrolling-node-parent-expected.txt >+++ b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/gain-scrolling-node-parent-expected.txt >@@ -5,6 +5,7 @@ Inner scrolling content > (Frame scrolling node > (scrollable area size 800 600) > (contents size 800 600) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) >@@ -19,6 +20,7 @@ Inner scrolling content > (Overflow scrolling node > (scrollable area size 420 320) > (contents size 443 1041) >+ (parent relative scrollable rect at (9,9) size 420x320) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) >@@ -28,6 +30,7 @@ Inner scrolling content > (Overflow scrolling node > (scrollable area size 420 320) > (contents size 420 1020) >+ (parent relative scrollable rect at (23,63) size 420x320) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) >diff --git a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/lose-scrolling-node-parent-expected.txt b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/lose-scrolling-node-parent-expected.txt >index 0f5dc63b447deb66185498824c097d31b73721e6..5fc7fa011e0efad849e1d39dd2b2ae0efc7959d5 100644 >--- a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/lose-scrolling-node-parent-expected.txt >+++ b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/lose-scrolling-node-parent-expected.txt >@@ -5,6 +5,7 @@ Inner scrolling content > (Frame scrolling node > (scrollable area size 800 600) > (contents size 800 600) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) >@@ -19,6 +20,7 @@ Inner scrolling content > (Overflow scrolling node > (scrollable area size 420 320) > (contents size 443 1041) >+ (parent relative scrollable rect at (9,9) size 420x320) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) >@@ -28,6 +30,7 @@ Inner scrolling content > (Overflow scrolling node > (scrollable area size 420 320) > (contents size 420 1020) >+ (parent relative scrollable rect at (23,63) size 420x320) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) >diff --git a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/overflow-in-fixed-expected.txt b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/overflow-in-fixed-expected.txt >index 730e785b8e5537ad3f07d058c771e4c93ddadf5a..8abfcb9004d003fe700666ece6d6873024380ee4 100644 >--- a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/overflow-in-fixed-expected.txt >+++ b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/overflow-in-fixed-expected.txt >@@ -3,6 +3,7 @@ Scrolling content > (Frame scrolling node > (scrollable area size 800 600) > (contents size 800 600) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) >@@ -22,6 +23,7 @@ Scrolling content > (Overflow scrolling node > (scrollable area size 400 300) > (contents size 400 1000) >+ (parent relative scrollable rect at (0,0) size 400x300) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) >diff --git a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/remove-coordinated-frame-expected.txt b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/remove-coordinated-frame-expected.txt >index 693d3ecaebef771cf27e01cd4f5b8bf5e483b1df..7a4439241e545618256578592479466a29592d16 100644 >--- a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/remove-coordinated-frame-expected.txt >+++ b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/remove-coordinated-frame-expected.txt >@@ -2,6 +2,7 @@ > (Frame scrolling node > (scrollable area size 800 600) > (contents size 800 1016) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) >diff --git a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/remove-scrolling-role-expected.txt b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/remove-scrolling-role-expected.txt >index 276780ce9674fda8238813ca85bf34af8c07ed26..bb7951a1c6711ed5fbab09fb8d42f3712f73a8c5 100644 >--- a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/remove-scrolling-role-expected.txt >+++ b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/remove-scrolling-role-expected.txt >@@ -2,6 +2,7 @@ > (Frame scrolling node > (scrollable area size 800 600) > (contents size 800 2513) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) >@@ -16,6 +17,7 @@ > (Overflow scrolling node > (scrollable area size 300 400) > (contents size 300 2000) >+ (parent relative scrollable rect at (14,14) size 300x400) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) >diff --git a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/reparent-across-compositing-layers-expected.txt b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/reparent-across-compositing-layers-expected.txt >index 2240194c88dca420a71e74ba596a13953a6adad2..1843ab3c65438bf05cd180687f0a1cdd2d85c698 100644 >--- a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/reparent-across-compositing-layers-expected.txt >+++ b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/reparent-across-compositing-layers-expected.txt >@@ -5,6 +5,7 @@ Inner scrolling content > (Frame scrolling node > (scrollable area size 800 600) > (contents size 800 600) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) >@@ -19,6 +20,7 @@ Inner scrolling content > (Overflow scrolling node > (scrollable area size 440 340) > (contents size 440 1040) >+ (parent relative scrollable rect at (70,102) size 440x340) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) >diff --git a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/reparent-with-layer-removal-expected.txt b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/reparent-with-layer-removal-expected.txt >index a855f98b32e567e076c27abe999392b5a9017200..485f56829bbbb0fd30445e0bd4716b0cfb717531 100644 >--- a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/reparent-with-layer-removal-expected.txt >+++ b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/reparent-with-layer-removal-expected.txt >@@ -5,6 +5,7 @@ Inner scrolling content > (Frame scrolling node > (scrollable area size 800 600) > (contents size 800 1041) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) >@@ -19,6 +20,7 @@ Inner scrolling content > (Overflow scrolling node > (scrollable area size 440 340) > (contents size 440 1040) >+ (parent relative scrollable rect at (70,102) size 440x340) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) >diff --git a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/scrolling-tree-includes-frame-expected.txt b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/scrolling-tree-includes-frame-expected.txt >index deb8cdd941a4ebbf0ba554354de683b5b5c2cc64..acd7100f58bf12c4c409b960c8141cd20e66af9c 100644 >--- a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/scrolling-tree-includes-frame-expected.txt >+++ b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/scrolling-tree-includes-frame-expected.txt >@@ -3,6 +3,7 @@ > (Frame scrolling node > (scrollable area size 800 600) > (contents size 800 600) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) >@@ -15,10 +16,12 @@ > (behavior for fixed 0) > (children 1 > (Frame hosting node >+ (parent relative scrollable rect at (0,0) size 100x200) > (children 1 > (Frame scrolling node > (scrollable area size 100 200) > (contents size 308 416) >+ (parent relative scrollable rect at (0,0) size 100x200) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) >diff --git a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/scrolling-tree-is-z-order-expected.txt b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/scrolling-tree-is-z-order-expected.txt >index f0e1c19acf46d8446b8a3490aa3595a68395824c..b0e3c0b075346ee8d8cbe65c9d62b8277fb49b39 100644 >--- a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/scrolling-tree-is-z-order-expected.txt >+++ b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/scrolling-tree-is-z-order-expected.txt >@@ -3,6 +3,7 @@ FirstSecondThird > (Frame scrolling node > (scrollable area size 800 600) > (contents size 800 600) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) >diff --git a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/toggle-coordinated-frame-scrolling-expected.txt b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/toggle-coordinated-frame-scrolling-expected.txt >index c4516290f547568e7881177e9dbfae39dfcff8f2..731282f12f6186479b3075d360be38bed9b72f56 100644 >--- a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/toggle-coordinated-frame-scrolling-expected.txt >+++ b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/toggle-coordinated-frame-scrolling-expected.txt >@@ -5,6 +5,7 @@ Scrolling tree on non-scrollable > (Frame scrolling node > (scrollable area size 800 600) > (contents size 800 645) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) >@@ -17,10 +18,12 @@ Scrolling tree on non-scrollable > (behavior for fixed 0) > (children 1 > (Frame hosting node >+ (parent relative scrollable rect at (30,30) size 600x500) > (children 1 > (Frame scrolling node > (scrollable area size 600 500) > (contents size 600 1024) >+ (parent relative scrollable rect at (0,0) size 600x500) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) >@@ -33,10 +36,12 @@ Scrolling tree on non-scrollable > (behavior for fixed 0) > (children 1 > (Frame hosting node >+ (parent relative scrollable rect at (10,54) size 500x400) > (children 1 > (Frame scrolling node > (scrollable area size 500 400) > (contents size 500 1024) >+ (parent relative scrollable rect at (0,0) size 500x400) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) >@@ -62,7 +67,8 @@ Scrolling tree on scrollable > > (Frame scrolling node > (scrollable area size 800 600) >- (contents size 800 1445) >+ (contents size 800 1515) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) >@@ -71,14 +77,16 @@ Scrolling tree on scrollable > (visual viewport enabled 1) > (layout viewport at (0,0) size 800x600) > (min layout viewport origin (0,0)) >- (max layout viewport origin (0,845)) >+ (max layout viewport origin (0,915)) > (behavior for fixed 0) > (children 1 > (Frame hosting node >+ (parent relative scrollable rect at (30,30) size 600x500) > (children 1 > (Frame scrolling node > (scrollable area size 600 500) > (contents size 600 500) >+ (parent relative scrollable rect at (0,0) size 600x500) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) >@@ -91,10 +99,12 @@ Scrolling tree on scrollable > (behavior for fixed 0) > (children 1 > (Frame hosting node >+ (parent relative scrollable rect at (10,54) size 500x400) > (children 1 > (Frame scrolling node > (scrollable area size 500 400) > (contents size 500 1024) >+ (parent relative scrollable rect at (0,0) size 500x400) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) >diff --git a/LayoutTests/platform/ios/fast/scrolling/ios/overflow-scrolling-ancestor-clip-expected.txt b/LayoutTests/platform/ios/fast/scrolling/ios/overflow-scrolling-ancestor-clip-expected.txt >index 5c20344365c64939b80bd6c2fb735dd7efe301d5..f6b3bab183b31774ebc66af90792094bf114fab2 100644 >--- a/LayoutTests/platform/ios/fast/scrolling/ios/overflow-scrolling-ancestor-clip-expected.txt >+++ b/LayoutTests/platform/ios/fast/scrolling/ios/overflow-scrolling-ancestor-clip-expected.txt >@@ -20,6 +20,7 @@ > (GraphicsLayer > (offsetFromRenderer width=1 height=1) > (scrollOffset (0,30)) >+ (anchor 0.00 0.00) > (bounds 300.00 900.00) > (drawsContent 1) > (children 1 >diff --git a/LayoutTests/platform/ios/fast/scrolling/ios/overflow-scrolling-ancestor-clip-size-expected.txt b/LayoutTests/platform/ios/fast/scrolling/ios/overflow-scrolling-ancestor-clip-size-expected.txt >index ff20cafe545b9724dcdd273b7bceb4e5e73221ec..82435306ea04360c1f4670bcd4e6b2c65a8d93c2 100644 >--- a/LayoutTests/platform/ios/fast/scrolling/ios/overflow-scrolling-ancestor-clip-size-expected.txt >+++ b/LayoutTests/platform/ios/fast/scrolling/ios/overflow-scrolling-ancestor-clip-size-expected.txt >@@ -20,6 +20,7 @@ > (GraphicsLayer > (offsetFromRenderer width=11 height=11) > (scrollOffset (0,30)) >+ (anchor 0.00 0.00) > (bounds 300.00 900.00) > (drawsContent 1) > (children 1 >diff --git a/LayoutTests/platform/ios/fast/scrolling/ios/scrolling-content-clip-to-viewport-expected.txt b/LayoutTests/platform/ios/fast/scrolling/ios/scrolling-content-clip-to-viewport-expected.txt >index b0c7ae744146701a1eea252fed98d273a4c3b4be..1bb2bf8edf8c8a26899165d2ee8597b2d36115d1 100644 >--- a/LayoutTests/platform/ios/fast/scrolling/ios/scrolling-content-clip-to-viewport-expected.txt >+++ b/LayoutTests/platform/ios/fast/scrolling/ios/scrolling-content-clip-to-viewport-expected.txt >@@ -13,6 +13,7 @@ > (bounds 320.00 340.00) > (children 1 > (GraphicsLayer >+ (anchor 0.00 0.00) > (bounds 320.00 1224.00) > (drawsContent 1) > ) >diff --git a/LayoutTests/platform/ios/fast/scrolling/ios/textarea-scroll-touch-expected.txt b/LayoutTests/platform/ios/fast/scrolling/ios/textarea-scroll-touch-expected.txt >index a89c9927feba7646cb0a59a415ec98bbc393be88..8770b179a9bb5b1390f3de8fe78b3ad643a46439 100644 >--- a/LayoutTests/platform/ios/fast/scrolling/ios/textarea-scroll-touch-expected.txt >+++ b/LayoutTests/platform/ios/fast/scrolling/ios/textarea-scroll-touch-expected.txt >@@ -21,6 +21,7 @@ > (GraphicsLayer > (offsetFromRenderer width=1 height=1) > (scrollOffset (0,50)) >+ (anchor 0.00 0.00) > (bounds 204.00 270.00) > (drawsContent 1) > ) >@@ -43,6 +44,7 @@ > (GraphicsLayer > (offsetFromRenderer width=1 height=1) > (scrollOffset (0,50)) >+ (anchor 0.00 0.00) > (bounds 204.00 270.00) > (drawsContent 1) > ) >diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-expected.txt b/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-expected.txt >index 35ba543692421457933d693581d42102b79999f5..0e4fe25bb1714a186b7888b135d3eb6348223dbf 100644 >--- a/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-expected.txt >+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-expected.txt >@@ -2,6 +2,7 @@ > (Frame scrolling node > (scrollable area size 785 600) > (contents size 785 1016) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 2) > (vertical scroll elasticity 2) >@@ -17,10 +18,12 @@ > (behavior for fixed 0) > (children 1 > (Frame hosting node >+ (parent relative scrollable rect at (37,39) size 500x300) > (children 1 > (Frame scrolling node > (scrollable area size 485 300) > (contents size 485 420) >+ (parent relative scrollable rect at (0,0) size 500x300) > (scrollable area parameters > (horizontal scroll elasticity 0) > (vertical scroll elasticity 0) >diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-gain-scrolling-ancestor-expected.txt b/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-gain-scrolling-ancestor-expected.txt >index ef8d8343298dc6821d944ff0d81f854103a7912e..88fde808f4d9ee93bbde5c1bb18d797fe8e7fc16 100644 >--- a/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-gain-scrolling-ancestor-expected.txt >+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-gain-scrolling-ancestor-expected.txt >@@ -2,6 +2,7 @@ > (Frame scrolling node > (scrollable area size 785 600) > (contents size 785 1016) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 2) > (vertical scroll elasticity 2) >@@ -22,10 +23,12 @@ > (layer position at last layout (8,10)) > (children 1 > (Frame hosting node >+ (parent relative scrollable rect at (29,29) size 500x300) > (children 1 > (Frame scrolling node > (scrollable area size 500 300) > (contents size 500 420) >+ (parent relative scrollable rect at (0,0) size 500x300) > (scrollable area parameters > (horizontal scroll elasticity 0) > (vertical scroll elasticity 0) >diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-in-fixed-expected.txt b/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-in-fixed-expected.txt >index e0e494ef5bc96be4dfaef930c4c5fde3232317b0..beaff96fd3445cfe091f5354c1776615060accae 100644 >--- a/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-in-fixed-expected.txt >+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-in-fixed-expected.txt >@@ -2,6 +2,7 @@ > (Frame scrolling node > (scrollable area size 785 600) > (contents size 785 1016) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 2) > (vertical scroll elasticity 2) >@@ -22,10 +23,12 @@ > (layer position at last layout (8,0)) > (children 1 > (Frame hosting node >+ (parent relative scrollable rect at (29,29) size 500x300) > (children 1 > (Frame scrolling node > (scrollable area size 485 300) > (contents size 485 420) >+ (parent relative scrollable rect at (0,0) size 500x300) > (scrollable area parameters > (horizontal scroll elasticity 0) > (vertical scroll elasticity 0) >diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-lose-scrolling-ancestor-expected.txt b/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-lose-scrolling-ancestor-expected.txt >index 0d27984f8a6a44121cb383e33324b31cadb0e43c..143134af8f42bba6bd04a502ca191777d5231dc1 100644 >--- a/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-lose-scrolling-ancestor-expected.txt >+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-lose-scrolling-ancestor-expected.txt >@@ -2,6 +2,7 @@ > (Frame scrolling node > (scrollable area size 785 600) > (contents size 785 1016) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 2) > (vertical scroll elasticity 2) >@@ -17,10 +18,12 @@ > (behavior for fixed 0) > (children 1 > (Frame hosting node >+ (parent relative scrollable rect at (37,39) size 500x300) > (children 1 > (Frame scrolling node > (scrollable area size 500 300) > (contents size 500 420) >+ (parent relative scrollable rect at (0,0) size 500x300) > (scrollable area parameters > (horizontal scroll elasticity 0) > (vertical scroll elasticity 0) >diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/fixed-inside-frame-expected.txt b/LayoutTests/scrollingcoordinator/scrolling-tree/fixed-inside-frame-expected.txt >index b8adf93adabff5af9f4cbebb939315d89ed899ce..daa30499a555267ae8119daf77dd77b0cccddcff 100644 >--- a/LayoutTests/scrollingcoordinator/scrolling-tree/fixed-inside-frame-expected.txt >+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/fixed-inside-frame-expected.txt >@@ -3,6 +3,7 @@ > (Frame scrolling node > (scrollable area size 785 600) > (contents size 785 657) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 2) > (vertical scroll elasticity 2) >@@ -16,12 +17,14 @@ > (behavior for fixed 0) > (children 1 > (Frame hosting node >+ (parent relative scrollable rect at (110,110) size 480x400) > (children 1 > (Frame scrolling node > (scrollable area size 465 400) > (contents size 465 1016) > (requested scroll position 0 120) > (requested scroll position represents programmatic scroll 1) >+ (parent relative scrollable rect at (0,0) size 480x400) > (scrollable area parameters > (horizontal scroll elasticity 0) > (vertical scroll elasticity 0) >diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/gain-scrolling-node-parent-expected.txt b/LayoutTests/scrollingcoordinator/scrolling-tree/gain-scrolling-node-parent-expected.txt >index 1f123a182a749410966ae7e08e3173e2c4a2f88d..18c26fae34842140d0aa07f377dfdaa6ffb7ca0f 100644 >--- a/LayoutTests/scrollingcoordinator/scrolling-tree/gain-scrolling-node-parent-expected.txt >+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/gain-scrolling-node-parent-expected.txt >@@ -5,6 +5,7 @@ Inner scrolling content > (Frame scrolling node > (scrollable area size 800 600) > (contents size 800 600) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 2) > (vertical scroll elasticity 2) >@@ -19,6 +20,7 @@ Inner scrolling content > (Overflow scrolling node > (scrollable area size 405 305) > (contents size 443 1039) >+ (parent relative scrollable rect at (9,9) size 405x305) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) >@@ -28,6 +30,7 @@ Inner scrolling content > (Overflow scrolling node > (scrollable area size 405 305) > (contents size 405 1020) >+ (parent relative scrollable rect at (23,59) size 405x305) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) >diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/lose-scrolling-node-parent-expected.txt b/LayoutTests/scrollingcoordinator/scrolling-tree/lose-scrolling-node-parent-expected.txt >index 1f123a182a749410966ae7e08e3173e2c4a2f88d..18c26fae34842140d0aa07f377dfdaa6ffb7ca0f 100644 >--- a/LayoutTests/scrollingcoordinator/scrolling-tree/lose-scrolling-node-parent-expected.txt >+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/lose-scrolling-node-parent-expected.txt >@@ -5,6 +5,7 @@ Inner scrolling content > (Frame scrolling node > (scrollable area size 800 600) > (contents size 800 600) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 2) > (vertical scroll elasticity 2) >@@ -19,6 +20,7 @@ Inner scrolling content > (Overflow scrolling node > (scrollable area size 405 305) > (contents size 443 1039) >+ (parent relative scrollable rect at (9,9) size 405x305) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) >@@ -28,6 +30,7 @@ Inner scrolling content > (Overflow scrolling node > (scrollable area size 405 305) > (contents size 405 1020) >+ (parent relative scrollable rect at (23,59) size 405x305) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) >diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/overflow-in-fixed-expected.txt b/LayoutTests/scrollingcoordinator/scrolling-tree/overflow-in-fixed-expected.txt >index 0d2b4d05f98e49117ea8a98f39d15c06d49fe392..ca3c47f5ad01244cbc15d7ee8ed5bfbef023d72e 100644 >--- a/LayoutTests/scrollingcoordinator/scrolling-tree/overflow-in-fixed-expected.txt >+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/overflow-in-fixed-expected.txt >@@ -3,6 +3,7 @@ Scrolling content > (Frame scrolling node > (scrollable area size 800 600) > (contents size 800 600) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 2) > (vertical scroll elasticity 2) >@@ -22,6 +23,7 @@ Scrolling content > (Overflow scrolling node > (scrollable area size 385 285) > (contents size 385 1000) >+ (parent relative scrollable rect at (0,0) size 385x285) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) >diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/remove-coordinated-frame-expected.txt b/LayoutTests/scrollingcoordinator/scrolling-tree/remove-coordinated-frame-expected.txt >index 82e9b4c90eee138b9f5d2c01e1d92a05eefbca2c..96234027afa800605d0b32ac192d50e8fb4cd7cf 100644 >--- a/LayoutTests/scrollingcoordinator/scrolling-tree/remove-coordinated-frame-expected.txt >+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/remove-coordinated-frame-expected.txt >@@ -2,6 +2,7 @@ > (Frame scrolling node > (scrollable area size 785 600) > (contents size 785 1016) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 2) > (vertical scroll elasticity 2) >diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/remove-scrolling-role-expected.txt b/LayoutTests/scrollingcoordinator/scrolling-tree/remove-scrolling-role-expected.txt >index 703ce5afa8a1b2adc9bbdfba8979c5787c140e11..575858ceb663198bff176570fa11b83e85106b1d 100644 >--- a/LayoutTests/scrollingcoordinator/scrolling-tree/remove-scrolling-role-expected.txt >+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/remove-scrolling-role-expected.txt >@@ -2,6 +2,7 @@ > (Frame scrolling node > (scrollable area size 785 600) > (contents size 785 2513) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 2) > (vertical scroll elasticity 2) >@@ -17,6 +18,7 @@ > (Overflow scrolling node > (scrollable area size 285 400) > (contents size 285 2000) >+ (parent relative scrollable rect at (14,14) size 285x400) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) >diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/reparent-across-compositing-layers-expected.txt b/LayoutTests/scrollingcoordinator/scrolling-tree/reparent-across-compositing-layers-expected.txt >index 691b8346faf7902f066962f7576dbe5bd02f0dd6..6c17932685c4230b32e32d78c9107896e8776978 100644 >--- a/LayoutTests/scrollingcoordinator/scrolling-tree/reparent-across-compositing-layers-expected.txt >+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/reparent-across-compositing-layers-expected.txt >@@ -5,6 +5,7 @@ Inner scrolling content > (Frame scrolling node > (scrollable area size 800 600) > (contents size 800 600) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 2) > (vertical scroll elasticity 2) >@@ -19,6 +20,7 @@ Inner scrolling content > (Overflow scrolling node > (scrollable area size 425 325) > (contents size 425 1040) >+ (parent relative scrollable rect at (70,98) size 425x325) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) >diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/reparent-with-layer-removal-expected.txt b/LayoutTests/scrollingcoordinator/scrolling-tree/reparent-with-layer-removal-expected.txt >index 7b1e5616227262454a9c0dcceda9ace27524cd95..d2f664ba9bfbe06b3109d2ac45cd3ebaea63a436 100644 >--- a/LayoutTests/scrollingcoordinator/scrolling-tree/reparent-with-layer-removal-expected.txt >+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/reparent-with-layer-removal-expected.txt >@@ -5,6 +5,7 @@ Inner scrolling content > (Frame scrolling node > (scrollable area size 785 600) > (contents size 785 1041) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 2) > (vertical scroll elasticity 2) >@@ -20,6 +21,7 @@ Inner scrolling content > (Overflow scrolling node > (scrollable area size 425 325) > (contents size 425 1040) >+ (parent relative scrollable rect at (70,98) size 425x325) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) >diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/scrolling-tree-includes-frame-expected.txt b/LayoutTests/scrollingcoordinator/scrolling-tree/scrolling-tree-includes-frame-expected.txt >index 38d2f710be3e73bbd1c70384568718a17ec945b0..51a795108053e196c371286f194c2d53d0393715 100644 >--- a/LayoutTests/scrollingcoordinator/scrolling-tree/scrolling-tree-includes-frame-expected.txt >+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/scrolling-tree-includes-frame-expected.txt >@@ -3,6 +3,7 @@ > (Frame scrolling node > (scrollable area size 800 600) > (contents size 800 600) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 2) > (vertical scroll elasticity 2) >@@ -15,10 +16,12 @@ > (behavior for fixed 0) > (children 1 > (Frame hosting node >+ (parent relative scrollable rect at (0,0) size 100x200) > (children 1 > (Frame scrolling node > (scrollable area size 85 185) > (contents size 308 416) >+ (parent relative scrollable rect at (0,0) size 100x200) > (scrollable area parameters > (horizontal scroll elasticity 0) > (vertical scroll elasticity 0) >diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/scrolling-tree-is-z-order-expected.txt b/LayoutTests/scrollingcoordinator/scrolling-tree/scrolling-tree-is-z-order-expected.txt >index 6865a1ab5632e814ddf112308dad62916075283f..7a30992215b3d1776151c6b1c0310548f222b492 100644 >--- a/LayoutTests/scrollingcoordinator/scrolling-tree/scrolling-tree-is-z-order-expected.txt >+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/scrolling-tree-is-z-order-expected.txt >@@ -3,6 +3,7 @@ FirstSecondThird > (Frame scrolling node > (scrollable area size 800 600) > (contents size 800 600) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 2) > (vertical scroll elasticity 2) >diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/toggle-coordinated-frame-scrolling-expected.txt b/LayoutTests/scrollingcoordinator/scrolling-tree/toggle-coordinated-frame-scrolling-expected.txt >index 8323c1e0c1dbc314f1fd97dbcc9fcf3bcb5f0d6b..f1a58cda1ff511a317096d1e8468ac1c7d2e1bf4 100644 >--- a/LayoutTests/scrollingcoordinator/scrolling-tree/toggle-coordinated-frame-scrolling-expected.txt >+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/toggle-coordinated-frame-scrolling-expected.txt >@@ -5,6 +5,7 @@ Scrolling tree on non-scrollable > (Frame scrolling node > (scrollable area size 785 600) > (contents size 785 640) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 2) > (vertical scroll elasticity 2) >@@ -18,10 +19,12 @@ Scrolling tree on non-scrollable > (behavior for fixed 0) > (children 1 > (Frame hosting node >+ (parent relative scrollable rect at (30,30) size 600x500) > (children 1 > (Frame scrolling node > (scrollable area size 585 500) > (contents size 585 1024) >+ (parent relative scrollable rect at (0,0) size 600x500) > (scrollable area parameters > (horizontal scroll elasticity 0) > (vertical scroll elasticity 0) >@@ -35,10 +38,12 @@ Scrolling tree on non-scrollable > (behavior for fixed 0) > (children 1 > (Frame hosting node >+ (parent relative scrollable rect at (10,52) size 500x400) > (children 1 > (Frame scrolling node > (scrollable area size 485 400) > (contents size 485 1024) >+ (parent relative scrollable rect at (0,0) size 500x400) > (scrollable area parameters > (horizontal scroll elasticity 0) > (vertical scroll elasticity 0) >@@ -65,7 +70,8 @@ Scrolling tree on scrollable > > (Frame scrolling node > (scrollable area size 785 600) >- (contents size 785 1541) >+ (contents size 785 1616) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 2) > (vertical scroll elasticity 2) >@@ -75,14 +81,16 @@ Scrolling tree on scrollable > (visual viewport enabled 1) > (layout viewport at (0,0) size 785x600) > (min layout viewport origin (0,0)) >- (max layout viewport origin (0,941)) >+ (max layout viewport origin (0,1016)) > (behavior for fixed 0) > (children 1 > (Frame hosting node >+ (parent relative scrollable rect at (30,30) size 600x500) > (children 1 > (Frame scrolling node > (scrollable area size 600 500) > (contents size 600 500) >+ (parent relative scrollable rect at (0,0) size 600x500) > (scrollable area parameters > (horizontal scroll elasticity 0) > (vertical scroll elasticity 0) >@@ -95,10 +103,12 @@ Scrolling tree on scrollable > (behavior for fixed 0) > (children 1 > (Frame hosting node >+ (parent relative scrollable rect at (10,52) size 500x400) > (children 1 > (Frame scrolling node > (scrollable area size 485 400) > (contents size 485 1024) >+ (parent relative scrollable rect at (0,0) size 500x400) > (scrollable area parameters > (horizontal scroll elasticity 0) > (vertical scroll elasticity 0) >diff --git a/LayoutTests/tiled-drawing/scrolling/clamp-out-of-bounds-scrolls-expected.txt b/LayoutTests/tiled-drawing/scrolling/clamp-out-of-bounds-scrolls-expected.txt >index 21e596804e2ec5544d252728fefbe2612dcb7f95..b351ab23030a1984de68c83217b1265483c9fef8 100644 >--- a/LayoutTests/tiled-drawing/scrolling/clamp-out-of-bounds-scrolls-expected.txt >+++ b/LayoutTests/tiled-drawing/scrolling/clamp-out-of-bounds-scrolls-expected.txt >@@ -3,6 +3,7 @@ Attempted scroll to -5000, 0 > (Frame scrolling node > (scrollable area size 785 585) > (contents size 5008 5021) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 2) > (vertical scroll elasticity 2) >@@ -22,6 +23,7 @@ Attempted scroll to 0, -5000 > (Frame scrolling node > (scrollable area size 785 585) > (contents size 5008 5021) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 2) > (vertical scroll elasticity 2) >@@ -41,6 +43,7 @@ Attempted scroll to -5000, -5000 > (Frame scrolling node > (scrollable area size 785 585) > (contents size 5008 5021) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 2) > (vertical scroll elasticity 2) >@@ -62,6 +65,7 @@ Attempted scroll to 10000, 0 > (contents size 5008 5021) > (requested scroll position 4223 0) > (requested scroll position represents programmatic scroll 1) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 2) > (vertical scroll elasticity 2) >@@ -83,6 +87,7 @@ Attempted scroll to 0, 10000 > (contents size 5008 5021) > (requested scroll position 0 4436) > (requested scroll position represents programmatic scroll 1) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 2) > (vertical scroll elasticity 2) >@@ -104,6 +109,7 @@ Attempted scroll to 10000, 10000 > (contents size 5008 5021) > (requested scroll position 4223 4436) > (requested scroll position represents programmatic scroll 1) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 2) > (vertical scroll elasticity 2) >diff --git a/LayoutTests/tiled-drawing/scrolling/fixed/absolute-inside-fixed-expected.txt b/LayoutTests/tiled-drawing/scrolling/fixed/absolute-inside-fixed-expected.txt >index 2fbfe6e60638ef620725e766b34db9709e015a33..177cb4cb75372dd1b64f23109a87c40f9912f62e 100644 >--- a/LayoutTests/tiled-drawing/scrolling/fixed/absolute-inside-fixed-expected.txt >+++ b/LayoutTests/tiled-drawing/scrolling/fixed/absolute-inside-fixed-expected.txt >@@ -4,6 +4,7 @@ > (contents size 785 2710) > (requested scroll position 0 200) > (requested scroll position represents programmatic scroll 1) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 2) > (vertical scroll elasticity 2) >diff --git a/LayoutTests/tiled-drawing/scrolling/fixed/absolute-inside-out-of-view-fixed-expected.txt b/LayoutTests/tiled-drawing/scrolling/fixed/absolute-inside-out-of-view-fixed-expected.txt >index 368e654ee484808e16ba9f0a68c0596669f19f8e..8c21447ad66d926dd91e0b6b23d0cf24bae8aeed 100644 >--- a/LayoutTests/tiled-drawing/scrolling/fixed/absolute-inside-out-of-view-fixed-expected.txt >+++ b/LayoutTests/tiled-drawing/scrolling/fixed/absolute-inside-out-of-view-fixed-expected.txt >@@ -4,6 +4,7 @@ > (contents size 785 2513) > (requested scroll position 0 200) > (requested scroll position represents programmatic scroll 1) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 2) > (vertical scroll elasticity 2) >diff --git a/LayoutTests/tiled-drawing/scrolling/fixed/fixed-in-overflow-expected.txt b/LayoutTests/tiled-drawing/scrolling/fixed/fixed-in-overflow-expected.txt >index f8ec0fd491e284c812147343f182c837e76c57f1..0c3c3c9fdc23ffd0550165de36f63f498c9161c5 100644 >--- a/LayoutTests/tiled-drawing/scrolling/fixed/fixed-in-overflow-expected.txt >+++ b/LayoutTests/tiled-drawing/scrolling/fixed/fixed-in-overflow-expected.txt >@@ -4,6 +4,7 @@ > (contents size 785 2213) > (requested scroll position 0 200) > (requested scroll position represents programmatic scroll 1) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 2) > (vertical scroll elasticity 2) >diff --git a/LayoutTests/tiled-drawing/scrolling/fixed/fixed-position-out-of-view-expected.txt b/LayoutTests/tiled-drawing/scrolling/fixed/fixed-position-out-of-view-expected.txt >index 9032b133d2ba133f20ae2e6a4c63a947e6ab4ccf..24cdde0496b65038172e7459bec2d92d37c9f279 100644 >--- a/LayoutTests/tiled-drawing/scrolling/fixed/fixed-position-out-of-view-expected.txt >+++ b/LayoutTests/tiled-drawing/scrolling/fixed/fixed-position-out-of-view-expected.txt >@@ -2,6 +2,7 @@ > (Frame scrolling node > (scrollable area size 785 600) > (contents size 785 1021) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 2) > (vertical scroll elasticity 2) >diff --git a/LayoutTests/tiled-drawing/scrolling/fixed/fixed-position-out-of-view-negative-zindex-expected.txt b/LayoutTests/tiled-drawing/scrolling/fixed/fixed-position-out-of-view-negative-zindex-expected.txt >index 9032b133d2ba133f20ae2e6a4c63a947e6ab4ccf..24cdde0496b65038172e7459bec2d92d37c9f279 100644 >--- a/LayoutTests/tiled-drawing/scrolling/fixed/fixed-position-out-of-view-negative-zindex-expected.txt >+++ b/LayoutTests/tiled-drawing/scrolling/fixed/fixed-position-out-of-view-negative-zindex-expected.txt >@@ -2,6 +2,7 @@ > (Frame scrolling node > (scrollable area size 785 600) > (contents size 785 1021) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 2) > (vertical scroll elasticity 2) >diff --git a/LayoutTests/tiled-drawing/scrolling/fixed/four-bars-expected.txt b/LayoutTests/tiled-drawing/scrolling/fixed/four-bars-expected.txt >index bf00f9c22da7a8e8d0ef04c707116c7023893e57..11fa988ca9bf86b9081e53be84f1b43d907b2d22 100644 >--- a/LayoutTests/tiled-drawing/scrolling/fixed/four-bars-expected.txt >+++ b/LayoutTests/tiled-drawing/scrolling/fixed/four-bars-expected.txt >@@ -4,6 +4,7 @@ > (contents size 785 2221) > (requested scroll position 0 200) > (requested scroll position represents programmatic scroll 1) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 2) > (vertical scroll elasticity 2) >diff --git a/LayoutTests/tiled-drawing/scrolling/fixed/four-bars-with-header-and-footer-expected.txt b/LayoutTests/tiled-drawing/scrolling/fixed/four-bars-with-header-and-footer-expected.txt >index a454dbfd27ce7ce476c0aee6c535f990368a413e..168965a864001f27c8eb03bfb9579b3a257db975 100644 >--- a/LayoutTests/tiled-drawing/scrolling/fixed/four-bars-with-header-and-footer-expected.txt >+++ b/LayoutTests/tiled-drawing/scrolling/fixed/four-bars-with-header-and-footer-expected.txt >@@ -4,6 +4,7 @@ > (contents size 785 2421) > (requested scroll position 0 200) > (requested scroll position represents programmatic scroll 1) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 2) > (vertical scroll elasticity 2) >diff --git a/LayoutTests/tiled-drawing/scrolling/fixed/negative-scroll-offset-expected.txt b/LayoutTests/tiled-drawing/scrolling/fixed/negative-scroll-offset-expected.txt >index 685d155aef027fb37f9e77236e00b2c711b0c3a9..8eba230babe21ebb16bb89e12155da1ff2839ff8 100644 >--- a/LayoutTests/tiled-drawing/scrolling/fixed/negative-scroll-offset-expected.txt >+++ b/LayoutTests/tiled-drawing/scrolling/fixed/negative-scroll-offset-expected.txt >@@ -2,6 +2,7 @@ > (Frame scrolling node > (scrollable area size 785 600) > (contents size 785 2221) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 2) > (vertical scroll elasticity 2) >diff --git a/LayoutTests/tiled-drawing/scrolling/fixed/negative-scroll-offset-in-view-expected.txt b/LayoutTests/tiled-drawing/scrolling/fixed/negative-scroll-offset-in-view-expected.txt >index 26124bca444743db675f57d180071d23ff4a9622..c081d0412b9f8805e3d4ac367d2524fed1b0cf4d 100644 >--- a/LayoutTests/tiled-drawing/scrolling/fixed/negative-scroll-offset-in-view-expected.txt >+++ b/LayoutTests/tiled-drawing/scrolling/fixed/negative-scroll-offset-in-view-expected.txt >@@ -2,6 +2,7 @@ > (Frame scrolling node > (scrollable area size 785 600) > (contents size 785 2221) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 2) > (vertical scroll elasticity 2) >diff --git a/LayoutTests/tiled-drawing/scrolling/fixed/nested-fixed-expected.txt b/LayoutTests/tiled-drawing/scrolling/fixed/nested-fixed-expected.txt >index 34111e85abea866b7349ded5256df04489842d1b..1e0873dc987aad571e435deec3332ed710dd9ee2 100644 >--- a/LayoutTests/tiled-drawing/scrolling/fixed/nested-fixed-expected.txt >+++ b/LayoutTests/tiled-drawing/scrolling/fixed/nested-fixed-expected.txt >@@ -4,6 +4,7 @@ > (contents size 785 2213) > (requested scroll position 0 200) > (requested scroll position represents programmatic scroll 1) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 2) > (vertical scroll elasticity 2) >diff --git a/LayoutTests/tiled-drawing/scrolling/fixed/percentage-inside-fixed-expected.txt b/LayoutTests/tiled-drawing/scrolling/fixed/percentage-inside-fixed-expected.txt >index 10ddb14d2f868bfc32537509af2e196ffd92f47e..98fdb8c13dbc3c1613787c484c3eb694dd39a1d8 100644 >--- a/LayoutTests/tiled-drawing/scrolling/fixed/percentage-inside-fixed-expected.txt >+++ b/LayoutTests/tiled-drawing/scrolling/fixed/percentage-inside-fixed-expected.txt >@@ -4,6 +4,7 @@ > (contents size 785 2513) > (requested scroll position 0 200) > (requested scroll position represents programmatic scroll 1) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 2) > (vertical scroll elasticity 2) >diff --git a/LayoutTests/tiled-drawing/scrolling/frames/scroll-region-after-frame-layout-expected.txt b/LayoutTests/tiled-drawing/scrolling/frames/scroll-region-after-frame-layout-expected.txt >index a8489851e09c6517270b2d5b76664e03fb2ff9a6..f2437bcd73a5c7fb44a6ef2c57b6969612f3821c 100644 >--- a/LayoutTests/tiled-drawing/scrolling/frames/scroll-region-after-frame-layout-expected.txt >+++ b/LayoutTests/tiled-drawing/scrolling/frames/scroll-region-after-frame-layout-expected.txt >@@ -3,6 +3,7 @@ > (Frame scrolling node > (scrollable area size 785 600) > (contents size 785 757) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 2) > (vertical scroll elasticity 2) >diff --git a/LayoutTests/tiled-drawing/scrolling/scrolling-tree-after-scroll-expected.txt b/LayoutTests/tiled-drawing/scrolling/scrolling-tree-after-scroll-expected.txt >index 2c9b4ac7e0374deb12fe7fb1b6a52cebfe4d1442..91a966fc571909639607189fc5871fcc63ee21ec 100644 >--- a/LayoutTests/tiled-drawing/scrolling/scrolling-tree-after-scroll-expected.txt >+++ b/LayoutTests/tiled-drawing/scrolling/scrolling-tree-after-scroll-expected.txt >@@ -4,6 +4,7 @@ > (contents size 785 5021) > (requested scroll position 0 3000) > (requested scroll position represents programmatic scroll 1) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 2) > (vertical scroll elasticity 2) >diff --git a/LayoutTests/tiled-drawing/scrolling/scrolling-tree-slow-scrolling-expected.txt b/LayoutTests/tiled-drawing/scrolling/scrolling-tree-slow-scrolling-expected.txt >index a1304d89c3146efd574d0196650e541f0ed7a89b..73b51b6a746366b2b898ce7acffc0052aab67835 100644 >--- a/LayoutTests/tiled-drawing/scrolling/scrolling-tree-slow-scrolling-expected.txt >+++ b/LayoutTests/tiled-drawing/scrolling/scrolling-tree-slow-scrolling-expected.txt >@@ -2,6 +2,7 @@ > (Frame scrolling node > (scrollable area size 800 600) > (contents size 800 600) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 2) > (vertical scroll elasticity 2) >diff --git a/LayoutTests/tiled-drawing/scrolling/sticky/negative-scroll-offset-expected.txt b/LayoutTests/tiled-drawing/scrolling/sticky/negative-scroll-offset-expected.txt >index 24fbfcb7823b07a07ecf80f206b3f4a2185defd2..3c297b5cfc6c5b1e4295b25fe38e86c310571c8b 100644 >--- a/LayoutTests/tiled-drawing/scrolling/sticky/negative-scroll-offset-expected.txt >+++ b/LayoutTests/tiled-drawing/scrolling/sticky/negative-scroll-offset-expected.txt >@@ -2,6 +2,7 @@ > (Frame scrolling node > (scrollable area size 785 600) > (contents size 785 2216) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 2) > (vertical scroll elasticity 2) >diff --git a/LayoutTests/tiled-drawing/scrolling/sticky/sticky-horizontal-expected.txt b/LayoutTests/tiled-drawing/scrolling/sticky/sticky-horizontal-expected.txt >index 27ff523057967f3a6d5d86b2a282ec48960aaa58..c0ed0bd0f54051bcccb0c798725bbbc583651c87 100644 >--- a/LayoutTests/tiled-drawing/scrolling/sticky/sticky-horizontal-expected.txt >+++ b/LayoutTests/tiled-drawing/scrolling/sticky/sticky-horizontal-expected.txt >@@ -5,6 +5,7 @@ Left sticky Right sticky Left % sticky Right % sticky Left and Right Left and Ri > (contents size 2008 585) > (requested scroll position 800 0) > (requested scroll position represents programmatic scroll 1) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 2) > (vertical scroll elasticity 2) >diff --git a/LayoutTests/tiled-drawing/scrolling/sticky/sticky-vertical-expected.txt b/LayoutTests/tiled-drawing/scrolling/sticky/sticky-vertical-expected.txt >index 311b82135f41d89c563a70d54fb848f8806ebf0f..502e92547588bb7bc5bd42a4b99b16da067d0297 100644 >--- a/LayoutTests/tiled-drawing/scrolling/sticky/sticky-vertical-expected.txt >+++ b/LayoutTests/tiled-drawing/scrolling/sticky/sticky-vertical-expected.txt >@@ -9,6 +9,7 @@ Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor > (contents size 785 2908) > (requested scroll position 0 580) > (requested scroll position represents programmatic scroll 1) >+ (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 2) > (vertical scroll elasticity 2)
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 194002
:
360546
|
360548
|
360552
|
360559