Changeset 139659 in webkit

Timestamp:

Jan 14, 2013 1:40:52 PM (11 years ago)

Author:

eae@chromium.org

Message:

offsetWidth/height incorrect for images when zoomed
​https://bugs.webkit.org/show_bug.cgi?id=106624

Source/WebCore:

Reviewed by Levi Weintraub.

offsetWidth and height are incorrect for images at certain zoom
levels due to flooring the values ones adjusted for zoom.
By rounding the value instead we avoid the problem and return
the right size.

Test: fast/images/zoomed-offset-size.html

• dom/Element.cpp:

(WebCore::Element::offsetWidth):
(WebCore::Element::offsetHeight):
(WebCore::Element::clientWidth):
(WebCore::Element::clientHeight):
Change to round (as opposed to floor) the zoom adjusted value.

• rendering/RenderObject.h:

(WebCore::adjustLayoutUnitForAbsoluteZoom):

• rendering/style/RenderStyle.h:

(WebCore::adjustLayoutUnitForAbsoluteZoom):
Add LayoutUnit version of adjustForAbsoluteZoom to avoid float
conversion.

LayoutTests:

Reviewed by Levi Weintraub.

Add test for offsetWidth/Height for zoomed image.

• fast/images/zoomed-offset-size-expected.txt: Added.
• fast/images/zoomed-offset-size.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/images/zoomed-offset-size-expected.txt (added)
• LayoutTests/fast/images/zoomed-offset-size.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Element.cpp (modified) (4 diffs)
• Source/WebCore/rendering/RenderObject.h (modified) (1 diff)
• Source/WebCore/rendering/style/RenderStyle.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-11  Emil A Eklund  <eae@chromium.org>
+
+        offsetWidth/height incorrect for images when zoomed
+        https://bugs.webkit.org/show_bug.cgi?id=106624
+
+        Reviewed by Levi Weintraub.
+        
+        Add test for offsetWidth/Height for zoomed image.
+
+        * fast/images/zoomed-offset-size-expected.txt: Added.
+        * fast/images/zoomed-offset-size.html: Added.
+
 2013-01-14  Dominic Mazzoni  <dmazzoni@google.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-11  Emil A Eklund  <eae@chromium.org>
+
+        offsetWidth/height incorrect for images when zoomed
+        https://bugs.webkit.org/show_bug.cgi?id=106624
+
+        Reviewed by Levi Weintraub.
+        
+        offsetWidth and height are incorrect for images at certain zoom
+        levels due to flooring the values ones adjusted for zoom.
+        By rounding the value instead we avoid the problem and return
+        the right size.
+
+        Test: fast/images/zoomed-offset-size.html
+
+        * dom/Element.cpp:
+        (WebCore::Element::offsetWidth):
+        (WebCore::Element::offsetHeight):
+        (WebCore::Element::clientWidth):
+        (WebCore::Element::clientHeight):
+        Change to round (as opposed to floor) the zoom adjusted value.
+        
+        * rendering/RenderObject.h:
+        (WebCore::adjustLayoutUnitForAbsoluteZoom):
+        * rendering/style/RenderStyle.h:
+        (WebCore::adjustLayoutUnitForAbsoluteZoom):
+        Add LayoutUnit version of adjustForAbsoluteZoom to avoid float
+        conversion.
+
 2013-01-14  Mark Pilgrim  <pilgrim@chromium.org>
 

trunk/Source/WebCore/dom/Element.cpp

@@ -454 +454 @@
     document()->updateLayoutIgnorePendingStylesheets();
     if (RenderBoxModelObject* renderer = renderBoxModelObject())
+#if ENABLE(SUBPIXEL_LAYOUT)
+        return adjustLayoutUnitForAbsoluteZoom(renderer->pixelSnappedOffsetWidth(), renderer).round();
+#else
         return adjustForAbsoluteZoom(renderer->pixelSnappedOffsetWidth(), renderer);
+#endif
     return 0;
 }
@@ -462 +466 @@
     document()->updateLayoutIgnorePendingStylesheets();
     if (RenderBoxModelObject* renderer = renderBoxModelObject())
+#if ENABLE(SUBPIXEL_LAYOUT)
+        return adjustLayoutUnitForAbsoluteZoom(renderer->pixelSnappedOffsetHeight(), renderer).round();
+#else
         return adjustForAbsoluteZoom(renderer->pixelSnappedOffsetHeight(), renderer);
+#endif
     return 0;
 }
@@ -509 +517 @@
     
     if (RenderBox* renderer = renderBox())
+#if ENABLE(SUBPIXEL_LAYOUT)
+        return adjustLayoutUnitForAbsoluteZoom(renderer->pixelSnappedClientWidth(), renderer).round();
+#else
         return adjustForAbsoluteZoom(renderer->pixelSnappedClientWidth(), renderer);
+#endif
     return 0;
 }
@@ -530 +542 @@
     
     if (RenderBox* renderer = renderBox())
+#if ENABLE(SUBPIXEL_LAYOUT)
+        return adjustLayoutUnitForAbsoluteZoom(renderer->pixelSnappedClientHeight(), renderer).round();
+#else
         return adjustForAbsoluteZoom(renderer->pixelSnappedClientHeight(), renderer);
+#endif
     return 0;
 }

trunk/Source/WebCore/rendering/RenderObject.h

@@ -1274 +1274 @@
 }
 
+#if ENABLE(SUBPIXEL_LAYOUT)
+inline LayoutUnit adjustLayoutUnitForAbsoluteZoom(LayoutUnit value, RenderObject* renderer)
+{
+    return adjustLayoutUnitForAbsoluteZoom(value, renderer->style());
+}
+#endif
+
 inline void adjustFloatQuadForAbsoluteZoom(FloatQuad& quad, RenderObject* renderer)
 {

trunk/Source/WebCore/rendering/style/RenderStyle.h

@@ -1783 +1783 @@
 }
 
+#if ENABLE(SUBPIXEL_LAYOUT)
+inline LayoutUnit adjustLayoutUnitForAbsoluteZoom(LayoutUnit value, const RenderStyle* style)
+{
+    return value / style->effectiveZoom();
+}
+#endif
+
 inline bool RenderStyle::setZoom(float f)
 {