Changeset 126943 in webkit

Timestamp:

Aug 28, 2012, 5:38:45 PM (14 years ago)

Author:

Simon Fraser

Message:

Handle sticky that overflows its container
​https://bugs.webkit.org/show_bug.cgi?id=95260

Reviewed by Ojan Vafai.

Source/WebCore:

When an element with position:sticky overflows its container,
don't have the sticky code push it back inside that container.
It will just never get offset in the sticky direction.

Test: fast/css/sticky/sticky-overflowing.html

• rendering/RenderBoxModelObject.cpp:

(WebCore::RenderBoxModelObject::stickyPositionOffset):

LayoutTests:

Testcase with sticky elements that overflow their containers.

• fast/css/sticky/sticky-overflowing-expected.html: Added.
• fast/css/sticky/sticky-overflowing.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/sticky/sticky-overflowing-expected.html (added)
• LayoutTests/fast/css/sticky/sticky-overflowing.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBoxModelObject.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-08-28  Simon Fraser  <simon.fraser@apple.com>
+
+        Handle sticky that overflows its container
+        https://bugs.webkit.org/show_bug.cgi?id=95260
+
+        Reviewed by Ojan Vafai.
+
+        Testcase with sticky elements that overflow their containers.
+
+        * fast/css/sticky/sticky-overflowing-expected.html: Added.
+        * fast/css/sticky/sticky-overflowing.html: Added.
+
 2012-08-28  Xianzhu Wang  <wangxianzhu@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-08-28  Simon Fraser  <simon.fraser@apple.com>
+
+        Handle sticky that overflows its container
+        https://bugs.webkit.org/show_bug.cgi?id=95260
+
+        Reviewed by Ojan Vafai.
+
+        When an element with position:sticky overflows its container,
+        don't have the sticky code push it back inside that container.
+        It will just never get offset in the sticky direction.
+
+        Test: fast/css/sticky/sticky-overflowing.html
+
+        * rendering/RenderBoxModelObject.cpp:
+        (WebCore::RenderBoxModelObject::stickyPositionOffset):
+
 2012-08-28  Mark Pilgrim  <pilgrim@chromium.org>
 

trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp

@@ -586 +586 @@
     if (!style()->right().isAuto()) {
         LayoutUnit rightLimit = viewportRect.maxX() - valueForLength(style()->right(), viewportRect.width(), view());
-        if (absoluteStickyBoxRect.maxX() > rightLimit)
-            absoluteStickyBoxRect.setX(rightLimit - absoluteStickyBoxRect.width());
-            
-        if (absoluteStickyBoxRect.x() < absContainerContentRect.x())
-            absoluteStickyBoxRect.setX(absContainerContentRect.x());
+        LayoutUnit rightDelta = min<float>(0, rightLimit.toFloat() - absoluteStickyBoxRect.maxX());
+        LayoutUnit availableSpace = min<float>(0, absContainerContentRect.x() - absoluteStickyBoxRect.x());
+        if (rightDelta < availableSpace)
+            rightDelta = availableSpace;
+
+        absoluteStickyBoxRect.move(rightDelta, 0);
     }
 
     if (!style()->left().isAuto()) {
         LayoutUnit leftLimit = viewportRect.x() + valueForLength(style()->left(), viewportRect.width(), view());
-        if (absoluteStickyBoxRect.x() < leftLimit)
-            absoluteStickyBoxRect.setX(leftLimit);
-
-        if (absoluteStickyBoxRect.maxX() > absContainerContentRect.maxX())
-            absoluteStickyBoxRect.setX(absContainerContentRect.maxX() - absoluteStickyBoxRect.width());
+        LayoutUnit leftDelta = max<float>(0, leftLimit.toFloat() - absoluteStickyBoxRect.x());
+        LayoutUnit availableSpace = max<float>(0, absContainerContentRect.maxX() - absoluteStickyBoxRect.maxX());
+        if (leftDelta > availableSpace)
+            leftDelta = availableSpace;
+
+        absoluteStickyBoxRect.move(leftDelta, 0);
     }
 
@@ -605 +607 @@
     if (!style()->bottom().isAuto()) {
         LayoutUnit bottomLimit = viewportRect.maxY() - valueForLength(style()->bottom(), viewportRect.height(), view());
-        if (absoluteStickyBoxRect.maxY() > bottomLimit)
-            absoluteStickyBoxRect.setY(bottomLimit - absoluteStickyBoxRect.height());
-            
-        if (absoluteStickyBoxRect.y() < absContainerContentRect.y())
-            absoluteStickyBoxRect.setY(absContainerContentRect.y());
+        LayoutUnit bottomDelta = min<float>(0, bottomLimit.toFloat() - absoluteStickyBoxRect.maxY());
+        LayoutUnit availableSpace = min<float>(0, absContainerContentRect.y() - absoluteStickyBoxRect.y());
+        if (bottomDelta < availableSpace)
+            bottomDelta = availableSpace;
+
+        absoluteStickyBoxRect.move(0, bottomDelta);
     }
 
     if (!style()->top().isAuto()) {
         LayoutUnit topLimit = viewportRect.y() + valueForLength(style()->top(), viewportRect.height(), view());
-        if (absoluteStickyBoxRect.y() < topLimit)
-            absoluteStickyBoxRect.setY(topLimit);
-
-        if (absoluteStickyBoxRect.maxY() > absContainerContentRect.maxY())
-            absoluteStickyBoxRect.setY(absContainerContentRect.maxY() - absoluteStickyBoxRect.height());
+        LayoutUnit topDelta = max<float>(0, topLimit.toFloat() - absoluteStickyBoxRect.y());
+        LayoutUnit availableSpace = max<float>(0, absContainerContentRect.maxY() - absoluteStickyBoxRect.maxY());
+        if (topDelta > availableSpace)
+            topDelta = availableSpace;
+
+        absoluteStickyBoxRect.move(0, topDelta);
     }