Title: [257016] branches/safari-609.1.20.0-branch/Source/WebCore
- Revision
- 257016
- Author
- alanc...@apple.com
- Date
- 2020-02-19 17:52:08 -0800 (Wed, 19 Feb 2020)
Log Message
Cherry-pick r256400. rdar://problem/59446986
Unreviewed, partial rollout of r255037.
<rdar://problem/59240559>
* page/scrolling/cocoa/ScrollingTreeFixedNode.mm:
(WebCore::ScrollingTreeFixedNode::applyLayerPositions):
* page/scrolling/cocoa/ScrollingTreeStickyNode.mm:
(WebCore::ScrollingTreeStickyNode::computeLayerPosition const):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@256400 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-609.1.20.0-branch/Source/WebCore/ChangeLog (257015 => 257016)
--- branches/safari-609.1.20.0-branch/Source/WebCore/ChangeLog 2020-02-20 01:52:05 UTC (rev 257015)
+++ branches/safari-609.1.20.0-branch/Source/WebCore/ChangeLog 2020-02-20 01:52:08 UTC (rev 257016)
@@ -1,5 +1,29 @@
2020-02-19 Alan Coon <alanc...@apple.com>
+ Cherry-pick r256400. rdar://problem/59446986
+
+ Unreviewed, partial rollout of r255037.
+ <rdar://problem/59240559>
+
+ * page/scrolling/cocoa/ScrollingTreeFixedNode.mm:
+ (WebCore::ScrollingTreeFixedNode::applyLayerPositions):
+ * page/scrolling/cocoa/ScrollingTreeStickyNode.mm:
+ (WebCore::ScrollingTreeStickyNode::computeLayerPosition const):
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@256400 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-02-11 Ryan Haddad <ryanhad...@apple.com>
+
+ Unreviewed, partial rollout of r255037.
+ <rdar://problem/59240559>
+
+ * page/scrolling/cocoa/ScrollingTreeFixedNode.mm:
+ (WebCore::ScrollingTreeFixedNode::applyLayerPositions):
+ * page/scrolling/cocoa/ScrollingTreeStickyNode.mm:
+ (WebCore::ScrollingTreeStickyNode::computeLayerPosition const):
+
+2020-02-19 Alan Coon <alanc...@apple.com>
+
Cherry-pick r256191. rdar://problem/59447003
Disallow setting base URL to a data or _javascript_ URL
Modified: branches/safari-609.1.20.0-branch/Source/WebCore/page/scrolling/cocoa/ScrollingTreeFixedNode.mm (257015 => 257016)
--- branches/safari-609.1.20.0-branch/Source/WebCore/page/scrolling/cocoa/ScrollingTreeFixedNode.mm 2020-02-20 01:52:05 UTC (rev 257015)
+++ branches/safari-609.1.20.0-branch/Source/WebCore/page/scrolling/cocoa/ScrollingTreeFixedNode.mm 2020-02-20 01:52:08 UTC (rev 257016)
@@ -77,7 +77,7 @@
if (is<ScrollingTreeFrameScrollingNode>(*ancestor)) {
// Fixed nodes are positioned relative to the containing frame scrolling node.
// We bail out after finding one.
- auto layoutViewport = downcast<ScrollingTreeFrameScrollingNode>(*ancestor).layoutViewportRespectingRubberBanding();
+ auto layoutViewport = downcast<ScrollingTreeFrameScrollingNode>(*ancestor).layoutViewport();
return m_constraints.layerPositionForViewportRect(layoutViewport) - overflowScrollDelta;
}
Modified: branches/safari-609.1.20.0-branch/Source/WebCore/page/scrolling/cocoa/ScrollingTreeStickyNode.mm (257015 => 257016)
--- branches/safari-609.1.20.0-branch/Source/WebCore/page/scrolling/cocoa/ScrollingTreeStickyNode.mm 2020-02-20 01:52:05 UTC (rev 257015)
+++ branches/safari-609.1.20.0-branch/Source/WebCore/page/scrolling/cocoa/ScrollingTreeStickyNode.mm 2020-02-20 01:52:08 UTC (rev 257016)
@@ -73,7 +73,7 @@
FloatRect constrainingRect;
if (is<ScrollingTreeFrameScrollingNode>(scrollingNode)) {
auto& frameScrollingNode = downcast<ScrollingTreeFrameScrollingNode>(scrollingNode);
- constrainingRect = frameScrollingNode.layoutViewportRespectingRubberBanding();
+ constrainingRect = frameScrollingNode.layoutViewport();
} else {
auto& overflowScrollingNode = downcast<ScrollingTreeOverflowScrollingNode>(scrollingNode);
constrainingRect = FloatRect(overflowScrollingNode.currentScrollPosition(), m_constraints.constrainingRectAtLastLayout().size());
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
