Changeset 28778 in webkit

Timestamp:

Dec 16, 2007 3:08:27 PM (16 years ago)

Author:

Beth Dakin

Message:

WebCore:

Reviewed by Geoff.

Make relative-size SVGs work in border-image.

• rendering/RenderBox.cpp: (WebCore::RenderBox::calculateBackgroundSize):
• rendering/RenderObject.cpp: (WebCore::RenderObject::paintBorderImage):

LayoutTests:

Reviewed by Geoff.

Tests for SVG as border-image.

• fast/borders/resources/green-fixed-size-rect.svg: Added.
• fast/borders/resources/green-relative-size-rect.svg: Added.
• fast/borders/svg-as-border-image-2.html: Added.
• fast/borders/svg-as-border-image.html: Added.
• platform/mac/fast/borders/svg-as-border-image-2-expected.checksum: Added.
• platform/mac/fast/borders/svg-as-border-image-2-expected.png: Added.
• platform/mac/fast/borders/svg-as-border-image-2-expected.txt: Added.
• platform/mac/fast/borders/svg-as-border-image-expected.checksum: Added.
• platform/mac/fast/borders/svg-as-border-image-expected.png: Added.
• platform/mac/fast/borders/svg-as-border-image-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/borders/resources/green-fixed-size-rect.svg (added)
• LayoutTests/fast/borders/resources/green-relative-size-rect.svg (added)
• LayoutTests/fast/borders/svg-as-border-image-2.html (added)
• LayoutTests/fast/borders/svg-as-border-image.html (added)
• LayoutTests/platform/mac/fast/borders/svg-as-border-image-2-expected.checksum (added)
• LayoutTests/platform/mac/fast/borders/svg-as-border-image-2-expected.png (added)
• LayoutTests/platform/mac/fast/borders/svg-as-border-image-2-expected.txt (added)
• LayoutTests/platform/mac/fast/borders/svg-as-border-image-expected.checksum (added)
• LayoutTests/platform/mac/fast/borders/svg-as-border-image-expected.png (added)
• LayoutTests/platform/mac/fast/borders/svg-as-border-image-expected.txt (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderBox.cpp (modified) (2 diffs)
• WebCore/rendering/RenderObject.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-12-16  Beth Dakin  <bdakin@apple.com>
+
+        Reviewed by Geoff.
+
+        Tests for SVG as border-image.
+
+        * fast/borders/resources/green-fixed-size-rect.svg: Added.
+        * fast/borders/resources/green-relative-size-rect.svg: Added.
+        * fast/borders/svg-as-border-image-2.html: Added.
+        * fast/borders/svg-as-border-image.html: Added.
+        * platform/mac/fast/borders/svg-as-border-image-2-expected.checksum: Added.
+        * platform/mac/fast/borders/svg-as-border-image-2-expected.png: Added.
+        * platform/mac/fast/borders/svg-as-border-image-2-expected.txt: Added.
+        * platform/mac/fast/borders/svg-as-border-image-expected.checksum: Added.
+        * platform/mac/fast/borders/svg-as-border-image-expected.png: Added.
+        * platform/mac/fast/borders/svg-as-border-image-expected.txt: Added.
+
 2007-12-16  Andrew Wellington  <proton@wiretapped.net>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-12-16  Beth Dakin  <bdakin@apple.com>
+
+        Reviewed by Geoff.
+
+        Make relative-size SVGs work in border-image.
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::calculateBackgroundSize):
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::paintBorderImage):
+
 2007-12-16  Darin Adler  <darin@apple.com>
 

trunk/WebCore/rendering/RenderBox.cpp

@@ -421 +421 @@
 {
     CachedImage* bg = bgLayer->backgroundImage();
+    bg->setImageContainerSize(IntSize(m_width, m_height));
 
     if (bgLayer->isBackgroundSizeSet()) {
@@ -461 +462 @@
         }
         return IntSize(max(1, w), max(1, h));
-    } else {
-        bg->setImageContainerSize(IntSize(m_width, m_height));
+    } else
         return bg->imageSize();
-    }
 }
 

trunk/WebCore/rendering/RenderObject.cpp

@@ -1150 +1150 @@
     }
 
+    borderImage->setImageContainerSize(IntSize(w, h));
     int imageWidth = borderImage->image()->width();
     int imageHeight = borderImage->image()->height();