| Index: third_party/WebKit/Source/core/page/scrolling/StickyPositionScrollingConstraints.cpp
|
| diff --git a/third_party/WebKit/Source/core/page/scrolling/StickyPositionScrollingConstraints.cpp b/third_party/WebKit/Source/core/page/scrolling/StickyPositionScrollingConstraints.cpp
|
| index d0c2d01708f9e499bcf3344607592d95753dd366..a6e85b2f6ee931c76b7de93cc39a10864e691191 100644
|
| --- a/third_party/WebKit/Source/core/page/scrolling/StickyPositionScrollingConstraints.cpp
|
| +++ b/third_party/WebKit/Source/core/page/scrolling/StickyPositionScrollingConstraints.cpp
|
| @@ -15,8 +15,9 @@ FloatSize StickyPositionScrollingConstraints::computeStickyOffset(
|
| float rightDelta = std::min<float>(
|
| 0, rightLimit - m_scrollContainerRelativeStickyBoxRect.maxX());
|
| float availableSpace =
|
| - std::min<float>(0, m_scrollContainerRelativeContainingBlockRect.x() -
|
| - m_scrollContainerRelativeStickyBoxRect.x());
|
| + std::min<float>(0,
|
| + m_scrollContainerRelativeContainingBlockRect.x() -
|
| + m_scrollContainerRelativeStickyBoxRect.x());
|
| if (rightDelta < availableSpace)
|
| rightDelta = availableSpace;
|
|
|
| @@ -28,8 +29,9 @@ FloatSize StickyPositionScrollingConstraints::computeStickyOffset(
|
| float leftDelta = std::max<float>(
|
| 0, leftLimit - m_scrollContainerRelativeStickyBoxRect.x());
|
| float availableSpace =
|
| - std::max<float>(0, m_scrollContainerRelativeContainingBlockRect.maxX() -
|
| - m_scrollContainerRelativeStickyBoxRect.maxX());
|
| + std::max<float>(0,
|
| + m_scrollContainerRelativeContainingBlockRect.maxX() -
|
| + m_scrollContainerRelativeStickyBoxRect.maxX());
|
| if (leftDelta > availableSpace)
|
| leftDelta = availableSpace;
|
|
|
| @@ -41,8 +43,9 @@ FloatSize StickyPositionScrollingConstraints::computeStickyOffset(
|
| float bottomDelta = std::min<float>(
|
| 0, bottomLimit - m_scrollContainerRelativeStickyBoxRect.maxY());
|
| float availableSpace =
|
| - std::min<float>(0, m_scrollContainerRelativeContainingBlockRect.y() -
|
| - m_scrollContainerRelativeStickyBoxRect.y());
|
| + std::min<float>(0,
|
| + m_scrollContainerRelativeContainingBlockRect.y() -
|
| + m_scrollContainerRelativeStickyBoxRect.y());
|
| if (bottomDelta < availableSpace)
|
| bottomDelta = availableSpace;
|
|
|
| @@ -54,8 +57,9 @@ FloatSize StickyPositionScrollingConstraints::computeStickyOffset(
|
| float topDelta = std::max<float>(
|
| 0, topLimit - m_scrollContainerRelativeStickyBoxRect.y());
|
| float availableSpace =
|
| - std::max<float>(0, m_scrollContainerRelativeContainingBlockRect.maxY() -
|
| - m_scrollContainerRelativeStickyBoxRect.maxY());
|
| + std::max<float>(0,
|
| + m_scrollContainerRelativeContainingBlockRect.maxY() -
|
| + m_scrollContainerRelativeStickyBoxRect.maxY());
|
| if (topDelta > availableSpace)
|
| topDelta = availableSpace;
|
|
|
|
|