Changeset 117855 in webkit

Timestamp:

May 21, 2012 5:24:49 PM (12 years ago)

Author:

eae@chromium.org

Message:

Fix bug in paintNinePieceImage exposed by subpixel change
​https://bugs.webkit.org/show_bug.cgi?id=87060

Reviewed by Levi Weintraub.

Source/WebCore:

Fix rounding in paintNinePieceImage where the left/right images where
drawn on subpixel bounds.

Covered by existing tests.

• rendering/RenderBoxModelObject.cpp:

(WebCore::RenderBoxModelObject::paintNinePieceImage):

LayoutTests:

• platform/chromium-linux/fast/borders/inline-mask-overlay-image-outset-expected.png: Removed.
• platform/chromium-linux/fast/borders/inline-mask-overlay-image-outset-vertical-rl-expected.png:
• platform/chromium-win/fast/borders/border-image-side-reduction-expected.png:
• platform/chromium-win/fast/borders/inline-mask-overlay-image-outset-expected.png:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium-linux/fast/borders/inline-mask-overlay-image-outset-expected.png (deleted)
• LayoutTests/platform/chromium-linux/fast/borders/inline-mask-overlay-image-outset-vertical-rl-expected.png (modified) (previous)
• LayoutTests/platform/chromium-win/fast/borders/border-image-side-reduction-expected.png (modified) (previous)
• LayoutTests/platform/chromium-win/fast/borders/inline-mask-overlay-image-outset-expected.png (modified) (previous)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBoxModelObject.cpp (modified) (6 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-05-21  Emil A Eklund  <eae@chromium.org>
+
+        Fix bug in paintNinePieceImage exposed by subpixel change
+        https://bugs.webkit.org/show_bug.cgi?id=87060
+
+        Reviewed by Levi Weintraub.
+
+        * platform/chromium-linux/fast/borders/inline-mask-overlay-image-outset-expected.png: Removed.
+        * platform/chromium-linux/fast/borders/inline-mask-overlay-image-outset-vertical-rl-expected.png:
+        * platform/chromium-win/fast/borders/border-image-side-reduction-expected.png:
+        * platform/chromium-win/fast/borders/inline-mask-overlay-image-outset-expected.png:
+
 2012-05-21  Levi Weintraub  <leviw@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-21  Emil A Eklund  <eae@chromium.org>
+
+        Fix bug in paintNinePieceImage exposed by subpixel change
+        https://bugs.webkit.org/show_bug.cgi?id=87060
+
+        Reviewed by Levi Weintraub.
+
+        Fix rounding in paintNinePieceImage where the left/right images where
+        drawn on subpixel bounds.
+
+        Covered by existing tests.
+
+        * rendering/RenderBoxModelObject.cpp:
+        (WebCore::RenderBoxModelObject::paintNinePieceImage):
+
 2012-05-21  Emil A Eklund  <eae@chromium.org>
 

trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp

@@ -1271 +1271 @@
     ENinePieceImageRule vRule = ninePieceImage.verticalRule();
 
-    LayoutUnit topWidth = computeBorderImageSide(ninePieceImage.borderSlices().top(), style->borderTopWidth(), topSlice, borderImageRect.height(), renderView);
-    LayoutUnit rightWidth = computeBorderImageSide(ninePieceImage.borderSlices().right(), style->borderRightWidth(), rightSlice, borderImageRect.width(), renderView);
-    LayoutUnit bottomWidth = computeBorderImageSide(ninePieceImage.borderSlices().bottom(), style->borderBottomWidth(), bottomSlice, borderImageRect.height(), renderView);
-    LayoutUnit leftWidth = computeBorderImageSide(ninePieceImage.borderSlices().left(), style->borderLeftWidth(), leftSlice, borderImageRect.width(), renderView);
+    int topWidth = computeBorderImageSide(ninePieceImage.borderSlices().top(), style->borderTopWidth(), topSlice, borderImageRect.height(), renderView);
+    int rightWidth = computeBorderImageSide(ninePieceImage.borderSlices().right(), style->borderRightWidth(), rightSlice, borderImageRect.width(), renderView);
+    int bottomWidth = computeBorderImageSide(ninePieceImage.borderSlices().bottom(), style->borderBottomWidth(), bottomSlice, borderImageRect.height(), renderView);
+    int leftWidth = computeBorderImageSide(ninePieceImage.borderSlices().left(), style->borderLeftWidth(), leftSlice, borderImageRect.width(), renderView);
     
     // Reduce the widths if they're too large.
@@ -1280 +1280 @@
     // offset for the side, let f = min(Lwidth/(Wleft+Wright), Lheight/(Wtop+Wbottom)). If f < 1, then all W are reduced by
     // multiplying them by f.
-    LayoutUnit borderSideWidth = max<LayoutUnit>(1, leftWidth + rightWidth);
-    LayoutUnit borderSideHeight = max<LayoutUnit>(1, topWidth + bottomWidth);
+    int borderSideWidth = max(1, leftWidth + rightWidth);
+    int borderSideHeight = max(1, topWidth + bottomWidth);
     float borderSideScaleFactor = min((float)borderImageRect.width() / borderSideWidth, (float)borderImageRect.height() / borderSideHeight);
     if (borderSideScaleFactor < 1) {
@@ -1317 +1317 @@
         // The rect to use from within the image is obtained from our slice, and is (0, 0, leftSlice, topSlice)
         if (drawTop)
-            graphicsContext->drawImage(image.get(), colorSpace, LayoutRect(borderImageRect.location(), LayoutSize(leftWidth, topWidth)),
+            graphicsContext->drawImage(image.get(), colorSpace, IntRect(borderImageRect.location(), IntSize(leftWidth, topWidth)),
                                        LayoutRect(0, 0, leftSlice, topSlice), op);
 
@@ -1323 +1323 @@
         // The rect to use from within the image is (0, imageHeight - bottomSlice, leftSlice, botomSlice)
         if (drawBottom)
-            graphicsContext->drawImage(image.get(), colorSpace, LayoutRect(borderImageRect.x(), borderImageRect.maxY() - bottomWidth, leftWidth, bottomWidth),
+            graphicsContext->drawImage(image.get(), colorSpace, IntRect(borderImageRect.x(), borderImageRect.maxY() - bottomWidth, leftWidth, bottomWidth),
                                        LayoutRect(0, imageHeight - bottomSlice, leftSlice, bottomSlice), op);
 
@@ -1340 +1340 @@
         // The rect to use from within the image is obtained from our slice, and is (imageWidth - rightSlice, 0, rightSlice, topSlice)
         if (drawTop)
-            graphicsContext->drawImage(image.get(), colorSpace, LayoutRect(borderImageRect.maxX() - rightWidth, borderImageRect.y(), rightWidth, topWidth),
+            graphicsContext->drawImage(image.get(), colorSpace, IntRect(borderImageRect.maxX() - rightWidth, borderImageRect.y(), rightWidth, topWidth),
                                        LayoutRect(imageWidth - rightSlice, 0, rightSlice, topSlice), op);
 
@@ -1346 +1346 @@
         // The rect to use from within the image is (imageWidth - rightSlice, imageHeight - bottomSlice, rightSlice, bottomSlice)
         if (drawBottom)
-            graphicsContext->drawImage(image.get(), colorSpace, LayoutRect(borderImageRect.maxX() - rightWidth, borderImageRect.maxY() - bottomWidth, rightWidth, bottomWidth),
+            graphicsContext->drawImage(image.get(), colorSpace, IntRect(borderImageRect.maxX() - rightWidth, borderImageRect.maxY() - bottomWidth, rightWidth, bottomWidth),
                                        LayoutRect(imageWidth - rightSlice, imageHeight - bottomSlice, rightSlice, bottomSlice), op);