Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(222)

Side by Side Diff: third_party/WebKit/Source/core/page/scrolling/StickyPositionScrollingConstraints.cpp

Issue 2708883005: Handle nested position:sticky elements correctly (main thread) (Closed)
Patch Set: Rebase Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « third_party/WebKit/Source/core/page/scrolling/StickyPositionScrollingConstraints.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "core/page/scrolling/StickyPositionScrollingConstraints.h" 5 #include "core/page/scrolling/StickyPositionScrollingConstraints.h"
6 6
7 namespace blink { 7 namespace blink {
8 8
9 FloatSize StickyPositionScrollingConstraints::computeStickyOffset( 9 FloatSize StickyPositionScrollingConstraints::computeStickyOffset(
10 const FloatRect& viewportRect) const { 10 const FloatRect& viewportRect,
11 FloatRect boxRect = m_scrollContainerRelativeStickyBoxRect; 11 const StickyPositionScrollingConstraints* ancestorStickyBoxConstraints,
12 const StickyPositionScrollingConstraints*
13 ancestorContainingBlockConstraints) {
14 // Adjust the constraint rect locations based on our ancestor sticky elements
15 // These adjustments are necessary to avoid double offsetting in the case of
16 // nested sticky elements.
17 FloatSize ancestorStickyBoxOffset =
18 ancestorStickyBoxConstraints
19 ? ancestorStickyBoxConstraints->getTotalStickyBoxStickyOffset()
20 : FloatSize();
21 FloatSize ancestorContainingBlockOffset =
22 ancestorContainingBlockConstraints
23 ? ancestorContainingBlockConstraints
24 ->getTotalContainingBlockStickyOffset()
25 : FloatSize();
26 FloatRect stickyBoxRect = m_scrollContainerRelativeStickyBoxRect;
27 FloatRect containingBlockRect = m_scrollContainerRelativeContainingBlockRect;
28 stickyBoxRect.move(ancestorStickyBoxOffset + ancestorContainingBlockOffset);
29 containingBlockRect.move(ancestorContainingBlockOffset);
30
31 FloatRect boxRect = stickyBoxRect;
12 32
13 if (hasAnchorEdge(AnchorEdgeRight)) { 33 if (hasAnchorEdge(AnchorEdgeRight)) {
14 float rightLimit = viewportRect.maxX() - m_rightOffset; 34 float rightLimit = viewportRect.maxX() - m_rightOffset;
15 float rightDelta = std::min<float>( 35 float rightDelta = std::min<float>(0, rightLimit - stickyBoxRect.maxX());
16 0, rightLimit - m_scrollContainerRelativeStickyBoxRect.maxX());
17 float availableSpace = 36 float availableSpace =
18 std::min<float>(0, m_scrollContainerRelativeContainingBlockRect.x() - 37 std::min<float>(0, containingBlockRect.x() - stickyBoxRect.x());
19 m_scrollContainerRelativeStickyBoxRect.x());
20 if (rightDelta < availableSpace) 38 if (rightDelta < availableSpace)
21 rightDelta = availableSpace; 39 rightDelta = availableSpace;
22 40
23 boxRect.move(rightDelta, 0); 41 boxRect.move(rightDelta, 0);
24 } 42 }
25 43
26 if (hasAnchorEdge(AnchorEdgeLeft)) { 44 if (hasAnchorEdge(AnchorEdgeLeft)) {
27 float leftLimit = viewportRect.x() + m_leftOffset; 45 float leftLimit = viewportRect.x() + m_leftOffset;
28 float leftDelta = std::max<float>( 46 float leftDelta = std::max<float>(0, leftLimit - stickyBoxRect.x());
29 0, leftLimit - m_scrollContainerRelativeStickyBoxRect.x());
30 float availableSpace = 47 float availableSpace =
31 std::max<float>(0, m_scrollContainerRelativeContainingBlockRect.maxX() - 48 std::max<float>(0, containingBlockRect.maxX() - stickyBoxRect.maxX());
32 m_scrollContainerRelativeStickyBoxRect.maxX());
33 if (leftDelta > availableSpace) 49 if (leftDelta > availableSpace)
34 leftDelta = availableSpace; 50 leftDelta = availableSpace;
35 51
36 boxRect.move(leftDelta, 0); 52 boxRect.move(leftDelta, 0);
37 } 53 }
38 54
39 if (hasAnchorEdge(AnchorEdgeBottom)) { 55 if (hasAnchorEdge(AnchorEdgeBottom)) {
40 float bottomLimit = viewportRect.maxY() - m_bottomOffset; 56 float bottomLimit = viewportRect.maxY() - m_bottomOffset;
41 float bottomDelta = std::min<float>( 57 float bottomDelta = std::min<float>(0, bottomLimit - stickyBoxRect.maxY());
42 0, bottomLimit - m_scrollContainerRelativeStickyBoxRect.maxY());
43 float availableSpace = 58 float availableSpace =
44 std::min<float>(0, m_scrollContainerRelativeContainingBlockRect.y() - 59 std::min<float>(0, containingBlockRect.y() - stickyBoxRect.y());
45 m_scrollContainerRelativeStickyBoxRect.y());
46 if (bottomDelta < availableSpace) 60 if (bottomDelta < availableSpace)
47 bottomDelta = availableSpace; 61 bottomDelta = availableSpace;
48 62
49 boxRect.move(0, bottomDelta); 63 boxRect.move(0, bottomDelta);
50 } 64 }
51 65
52 if (hasAnchorEdge(AnchorEdgeTop)) { 66 if (hasAnchorEdge(AnchorEdgeTop)) {
53 float topLimit = viewportRect.y() + m_topOffset; 67 float topLimit = viewportRect.y() + m_topOffset;
54 float topDelta = std::max<float>( 68 float topDelta = std::max<float>(0, topLimit - stickyBoxRect.y());
55 0, topLimit - m_scrollContainerRelativeStickyBoxRect.y());
56 float availableSpace = 69 float availableSpace =
57 std::max<float>(0, m_scrollContainerRelativeContainingBlockRect.maxY() - 70 std::max<float>(0, containingBlockRect.maxY() - stickyBoxRect.maxY());
58 m_scrollContainerRelativeStickyBoxRect.maxY());
59 if (topDelta > availableSpace) 71 if (topDelta > availableSpace)
60 topDelta = availableSpace; 72 topDelta = availableSpace;
61 73
62 boxRect.move(0, topDelta); 74 boxRect.move(0, topDelta);
63 } 75 }
64 76
65 return boxRect.location() - m_scrollContainerRelativeStickyBoxRect.location(); 77 FloatSize stickyOffset = boxRect.location() - stickyBoxRect.location();
78
79 m_totalStickyBoxStickyOffset = ancestorStickyBoxOffset + stickyOffset;
80 m_totalContainingBlockStickyOffset =
81 ancestorStickyBoxOffset + ancestorContainingBlockOffset + stickyOffset;
82
83 return stickyOffset;
66 } 84 }
67 85
68 } // namespace blink 86 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/page/scrolling/StickyPositionScrollingConstraints.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698