Changeset 41976 in webkit

Timestamp:

Mar 25, 2009 10:07:31 AM (15 years ago)

Author:

hyatt@apple.com

Message:

WebCore:

2009-03-25 David Hyatt <​hyatt@apple.com>

Reviewed by Eric Seidel

Fix for bug 23198, border images should not clip to border radii. The border-image should just ignore
the border-radius, since the assumption is that any desired rounding will be built into the border-image
itself.

Note that I do not agree with this change, but I am matching the spec.

Added fast/borders/border-image-border-radius.html

• rendering/RenderBoxModelObject.cpp: (WebCore::RenderBoxModelObject::paintNinePieceImage):

LayoutTests:

2009-03-25 David Hyatt <​hyatt@apple.com>

Reviewed by Eric Seidel

Test case for bug 23198.

• fast/borders/border-image-border-radius.html: Added.
• platform/mac/fast/borders/border-image-border-radius-expected.checksum: Added.
• platform/mac/fast/borders/border-image-border-radius-expected.png: Added.
• platform/mac/fast/borders/border-image-border-radius-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/borders/border-image-border-radius.html (added)
• LayoutTests/platform/mac/fast/borders/border-image-border-radius-expected.checksum (added)
• LayoutTests/platform/mac/fast/borders/border-image-border-radius-expected.png (added)
• LayoutTests/platform/mac/fast/borders/border-image-border-radius-expected.txt (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderBoxModelObject.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-03-25  David Hyatt  <hyatt@apple.com>
+
+        Reviewed by Eric Seidel
+
+        Test case for bug 23198.
+
+        * fast/borders/border-image-border-radius.html: Added.
+        * platform/mac/fast/borders/border-image-border-radius-expected.checksum: Added.
+        * platform/mac/fast/borders/border-image-border-radius-expected.png: Added.
+        * platform/mac/fast/borders/border-image-border-radius-expected.txt: Added.
+
 2009-03-25  Darin Adler  <darin@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-03-25  David Hyatt  <hyatt@apple.com>
+
+        Reviewed by Eric Seidel
+
+        Fix for bug 23198, border images should not clip to border radii.  The border-image should just ignore
+        the border-radius, since the assumption is that any desired rounding will be built into the border-image
+        itself.
+
+        Note that I do not agree with this change, but I am matching the spec.
+
+        Added fast/borders/border-image-border-radius.html
+
+        * rendering/RenderBoxModelObject.cpp:
+        (WebCore::RenderBoxModelObject::paintNinePieceImage):
+
 2009-03-25  Gustavo Noronha Silva  <gns@gnome.org>
 

trunk/WebCore/rendering/RenderBoxModelObject.cpp

@@ -602 +602 @@
 {
     StyleImage* styleImage = ninePieceImage.image();
-    if (!styleImage || !styleImage->canRender(style->effectiveZoom()))
+    if (!styleImage)
         return false;
 
@@ -608 +608 @@
         return true; // Never paint a nine-piece image incrementally, but don't paint the fallback borders either.
 
-    // If we have a border radius, the image gets clipped to the rounded rect.
-    bool clipped = false;
-    if (style->hasBorderRadius()) {
-        IntRect clipRect(tx, ty, w, h);
-        graphicsContext->save();
-        graphicsContext->addRoundedRectClip(clipRect, style->borderTopLeftRadius(), style->borderTopRightRadius(),
-                                            style->borderBottomLeftRadius(), style->borderBottomRightRadius());
-        clipped = true;
-    }
+    if (!styleImage->canRender(style->effectiveZoom()))
+        return false;
 
     // FIXME: border-image is broken with full page zooming when tiling has to happen, since the tiling function
@@ -712 +705 @@
                                         IntRect(leftSlice, topSlice, imageWidth - rightSlice - leftSlice, imageHeight - topSlice - bottomSlice),
                                         (Image::TileRule)hRule, (Image::TileRule)vRule, op);
-
-    // Clear the clip for the border radius.
-    if (clipped)
-        graphicsContext->restore();
 
     return true;