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

Side by Side Diff: Source/core/page/scrolling/ScrollingConstraints.cpp

Issue 1308273010: Adapt and reland old position sticky implementation (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix style errors and remaining layout tests. Created 5 years, 3 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2012 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 10 matching lines...) Expand all
21 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 21 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
23 * THE POSSIBILITY OF SUCH DAMAGE. 23 * THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 #include "core/page/scrolling/ScrollingConstraints.h" 27 #include "core/page/scrolling/ScrollingConstraints.h"
28 28
29 namespace blink { 29 namespace blink {
30 30
31 FloatPoint FixedPositionViewportConstraints::layerPositionForViewportRect(const FloatRect& viewportRect) const 31 LayoutPoint FixedPositionViewportConstraints::layerPositionForViewportRect(const LayoutRect& viewportRect) const
32 { 32 {
33 FloatSize offset; 33 LayoutSize offset;
34 34
35 if (hasAnchorEdge(AnchorEdgeLeft)) 35 if (hasAnchorEdge(AnchorEdgeLeft))
36 offset.setWidth(viewportRect.x() - m_viewportRectAtLastLayout.x()); 36 offset.setWidth(viewportRect.x() - m_viewportRectAtLastLayout.x());
37 else if (hasAnchorEdge(AnchorEdgeRight)) 37 else if (hasAnchorEdge(AnchorEdgeRight))
38 offset.setWidth(viewportRect.maxX() - m_viewportRectAtLastLayout.maxX()) ; 38 offset.setWidth(viewportRect.maxX() - m_viewportRectAtLastLayout.maxX()) ;
39 39
40 if (hasAnchorEdge(AnchorEdgeTop)) 40 if (hasAnchorEdge(AnchorEdgeTop))
41 offset.setHeight(viewportRect.y() - m_viewportRectAtLastLayout.y()); 41 offset.setHeight(viewportRect.y() - m_viewportRectAtLastLayout.y());
42 else if (hasAnchorEdge(AnchorEdgeBottom)) 42 else if (hasAnchorEdge(AnchorEdgeBottom))
43 offset.setHeight(viewportRect.maxY() - m_viewportRectAtLastLayout.maxY() ); 43 offset.setHeight(viewportRect.maxY() - m_viewportRectAtLastLayout.maxY() );
44 44
45 return m_layerPositionAtLastLayout + offset; 45 return m_layerPositionAtLastLayout + offset;
46 } 46 }
47 47
48 LayoutSize StickyPositionViewportConstraints::computeStickyOffset(const LayoutRe ct& viewportRect) const
49 {
50 LayoutRect boxRect = m_absoluteStickyBoxRect;
51
52 if (hasAnchorEdge(AnchorEdgeRight)) {
53 LayoutUnit rightLimit = viewportRect.maxX() - m_rightOffset;
54 LayoutUnit rightDelta = std::min<LayoutUnit>(0, rightLimit - m_absoluteS tickyBoxRect.maxX());
55 LayoutUnit availableSpace = std::min<LayoutUnit>(0, m_absoluteContaining BlockRect.x() - m_absoluteStickyBoxRect.x());
56 if (rightDelta < availableSpace)
57 rightDelta = availableSpace;
58
59 boxRect.move(rightDelta, 0);
60 }
61
62 if (hasAnchorEdge(AnchorEdgeLeft)) {
63 LayoutUnit leftLimit = viewportRect.x() + m_leftOffset;
64 LayoutUnit leftDelta = std::max<LayoutUnit>(0, leftLimit - m_absoluteSti ckyBoxRect.x());
65 LayoutUnit availableSpace = std::max<LayoutUnit>(0, m_absoluteContaining BlockRect.maxX() - m_absoluteStickyBoxRect.maxX());
66 if (leftDelta > availableSpace)
67 leftDelta = availableSpace;
68
69 boxRect.move(leftDelta, 0);
70 }
71
72 if (hasAnchorEdge(AnchorEdgeBottom)) {
73 LayoutUnit bottomLimit = viewportRect.maxY() - m_bottomOffset;
74 LayoutUnit bottomDelta = std::min<LayoutUnit>(0, bottomLimit - m_absolut eStickyBoxRect.maxY());
75 LayoutUnit availableSpace = std::min<LayoutUnit>(0, m_absoluteContaining BlockRect.y() - m_absoluteStickyBoxRect.y());
76 if (bottomDelta < availableSpace)
77 bottomDelta = availableSpace;
78
79 boxRect.move(0, bottomDelta);
80 }
81
82 if (hasAnchorEdge(AnchorEdgeTop)) {
83 LayoutUnit topLimit = viewportRect.y() + m_topOffset;
84 LayoutUnit topDelta = std::max<LayoutUnit>(0, topLimit - m_absoluteStick yBoxRect.y());
85 LayoutUnit availableSpace = std::max<LayoutUnit>(0, m_absoluteContaining BlockRect.maxY() - m_absoluteStickyBoxRect.maxY());
86 if (topDelta > availableSpace)
87 topDelta = availableSpace;
88
89 boxRect.move(0, topDelta);
90 }
91
92 return boxRect.location() - m_absoluteStickyBoxRect.location();
93 }
94
95 LayoutPoint StickyPositionViewportConstraints::layerPositionForViewportRect(cons t LayoutRect& viewportRect) const
96 {
97 LayoutSize offset = computeStickyOffset(viewportRect);
98 return m_layerPositionAtLastLayout + offset - m_stickyOffsetAtLastLayout;
99 }
100
48 } // namespace blink 101 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698