Changeset 139013 in webkit

Timestamp:

Jan 7, 2013, 4:39:06 PM (12 years ago)

Author:

eae@chromium.org

Message:

REGRESSION(SUBPIXEL_LAYOUT): el.offsetWidth < el.clientWidth for elements of a certain size
​https://bugs.webkit.org/show_bug.cgi?id=106107

Source/WebCore:

Reviewed by Levi Weintraub.

Add overloaded pixelSnappedOffsetWidth|Height methods to
RenderBox that do pixel snapping with the same offset
as clientWidth/height to ensure consistent rounding.

Test: fast/sub-pixel/client-and-offset-width.html

• rendering/RenderBox.cpp:

(WebCore::RenderBox::pixelSnappedOffsetWidth):
(WebCore::RenderBox::pixelSnappedOffsetHeight):
Snap using the same offset as the clientWidth/height versions.

• rendering/RenderBox.h:

Remove out of date FIXME and add OVERRIDE keyword.

• rendering/RenderBoxModelObject.h:

Mark pixelSnappedOffsetWidth|Height as virtual.

LayoutTests:

Reviewed by Levi Weintraub.

Add test for clientWidth/offsetWidth rounding.

• fast/sub-pixel/client-and-offset-width-expected.txt: Added.
• fast/sub-pixel/client-and-offset-width.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/sub-pixel/client-and-offset-width-expected.txt (added)
• LayoutTests/fast/sub-pixel/client-and-offset-width.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBox.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderBox.h (modified) (1 diff)
• Source/WebCore/rendering/RenderBoxModelObject.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-07  Emil A Eklund  <eae@chromium.org>
+
+        REGRESSION(SUBPIXEL_LAYOUT): el.offsetWidth < el.clientWidth for elements of a certain size
+        https://bugs.webkit.org/show_bug.cgi?id=106107
+
+        Reviewed by Levi Weintraub.
+        
+        Add test for clientWidth/offsetWidth rounding.
+
+        * fast/sub-pixel/client-and-offset-width-expected.txt: Added.
+        * fast/sub-pixel/client-and-offset-width.html: Added.
+
 2013-01-07  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-07  Emil A Eklund  <eae@chromium.org>
+
+        REGRESSION(SUBPIXEL_LAYOUT): el.offsetWidth < el.clientWidth for elements of a certain size
+        https://bugs.webkit.org/show_bug.cgi?id=106107
+
+        Reviewed by Levi Weintraub.
+        
+        Add overloaded pixelSnappedOffsetWidth|Height methods to
+        RenderBox that do pixel snapping with the same offset
+        as clientWidth/height to ensure consistent rounding.
+
+        Test: fast/sub-pixel/client-and-offset-width.html
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::pixelSnappedOffsetWidth):
+        (WebCore::RenderBox::pixelSnappedOffsetHeight):
+        Snap using the same offset as the clientWidth/height versions.
+        
+        * rendering/RenderBox.h:
+        Remove out of date FIXME and add OVERRIDE keyword.
+        
+        * rendering/RenderBoxModelObject.h:
+        Mark pixelSnappedOffsetWidth|Height as virtual.
+
 2013-01-07  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -391 +391 @@
 {
     return snapSizeToPixel(clientHeight(), y() + clientTop());
+}
+
+int RenderBox::pixelSnappedOffsetWidth() const
+{
+    return snapSizeToPixel(offsetWidth(), x() + clientLeft());
+}
+
+int RenderBox::pixelSnappedOffsetHeight() const
+{
+    return snapSizeToPixel(offsetHeight(), y() + clientTop());
 }
 

trunk/Source/WebCore/rendering/RenderBox.h

@@ -206 +206 @@
     virtual LayoutUnit offsetHeight() const { return height(); }
 
-    // FIXME: The implementation for these functions will change once we move to subpixel layout. See bug 60318.
-    virtual int pixelSnappedOffsetWidth() const { return pixelSnappedWidth(); }
-    virtual int pixelSnappedOffsetHeight() const { return pixelSnappedHeight(); }
+    virtual int pixelSnappedOffsetWidth() const OVERRIDE;
+    virtual int pixelSnappedOffsetHeight() const OVERRIDE;
 
     // More IE extensions.  clientWidth and clientHeight represent the interior of an object

trunk/Source/WebCore/rendering/RenderBoxModelObject.h

@@ -81 +81 @@
     int pixelSnappedOffsetLeft() const { return roundToInt(offsetLeft()); }
     int pixelSnappedOffsetTop() const { return roundToInt(offsetTop()); }
-    int pixelSnappedOffsetWidth() const;
-    int pixelSnappedOffsetHeight() const;
+    virtual int pixelSnappedOffsetWidth() const;
+    virtual int pixelSnappedOffsetHeight() const;
 
     virtual void updateFromStyle() OVERRIDE;