Changeset 127520 in webkit

Timestamp:

Sep 4, 2012 4:39:00 PM (12 years ago)

Author:

jchaffraix@webkit.org

Message:

REGRESSION(r120832): RenderLayer::clampScrollOffset doesn't properly clamp
​https://bugs.webkit.org/show_bug.cgi?id=95776

Reviewed by Simon Fraser.

.:

• ManualTests/select-menu-list-wrongly-positioned.html: Added.

Source/WebCore:

r120832 consolidated the clamping logic into RenderLayer::clampScrollOffset. The existing code wouldn't properly ensure that
the offset were positive which got exposed to other code paths, leading to the regression.

Tested by ManualTests/select-menu-list-wrongly-positioned.html as I didn't find a way to create a reliable layout test.

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::clampScrollOffset):
Fixed the clamping logic to ensure that the scroll offset's dimensions are positive.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• ManualTests/select-menu-list-wrongly-positioned.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderLayer.cpp (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2012-09-04  Julien Chaffraix  <jchaffraix@webkit.org>
+
+        REGRESSION(r120832): RenderLayer::clampScrollOffset doesn't properly clamp
+        https://bugs.webkit.org/show_bug.cgi?id=95776
+
+        Reviewed by Simon Fraser.
+
+        * ManualTests/select-menu-list-wrongly-positioned.html: Added.
+
 2012-09-04  Michał Pakuła vel Rutka  <m.pakula@samsung.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-04  Julien Chaffraix  <jchaffraix@webkit.org>
+
+        REGRESSION(r120832): RenderLayer::clampScrollOffset doesn't properly clamp
+        https://bugs.webkit.org/show_bug.cgi?id=95776
+
+        Reviewed by Simon Fraser.
+
+        r120832 consolidated the clamping logic into RenderLayer::clampScrollOffset. The existing code wouldn't properly ensure that
+        the offset were positive which got exposed to other code paths, leading to the regression.
+
+        Tested by ManualTests/select-menu-list-wrongly-positioned.html as I didn't find a way to create a reliable layout test.
+
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::clampScrollOffset):
+        Fixed the clamping logic to ensure that the scroll offset's dimensions are positive.
+
 2012-09-04  Joshua Bell  <jsbell@chromium.org>
 

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -1666 +1666 @@
     int maxY = scrollHeight() - box->pixelSnappedClientHeight();
 
-    int x = min(max(scrollOffset.width(), 0), maxX);
-    int y = min(max(scrollOffset.height(), 0), maxY);
+    int x = max(min(scrollOffset.width(), maxX), 0);
+    int y = max(min(scrollOffset.height(), maxY), 0);
     return IntSize(x, y);
 }