Changeset 54865 in webkit

Timestamp:

Feb 16, 2010 7:54:23 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-02-16 Yael Aharon <​yael.aharon@nokia.com>

Reviewed by Nikolas Zimmermann.

SVG not rendered as background-image from data URI
​https://bugs.webkit.org/show_bug.cgi?id=33630

• platform/mac/svg/css/background-image-svg-expected.checksum: Added.
• platform/mac/svg/css/background-image-svg-expected.png: Added.
• platform/qt/svg/css/background-image-svg-expected.checksum: Added.
• platform/qt/svg/css/background-image-svg-expected.png: Added.
• svg/css/background-image-svg.html: Added.
• svg/css/background-image-svg-expected.txt: Added.

2010-02-16 Yael Aharon <​yael.aharon@nokia.com>

Reviewed by Nikolas Zimmermann.

SVG not rendered as background-image from data URI
​https://bugs.webkit.org/show_bug.cgi?id=33630

When the background image is an SVG image, and it is smaller than the area
it is supposed to fill, we were using renderSubTreeToImage to draw it.
That call was not going through all the drawing phases, and so the SVG itself
would not be drawn.

Test: svg/css/background-image-svg.html

• svg/graphics/SVGImage.cpp: (WebCore::SVGImage::nativeImageForCurrentFrame):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/svg/css/background-image-svg-expected.checksum (added)
• LayoutTests/platform/mac/svg/css/background-image-svg-expected.png (added)
• LayoutTests/platform/qt/svg/css/background-image-svg-expected.checksum (added)
• LayoutTests/platform/qt/svg/css/background-image-svg-expected.png (added)
• LayoutTests/svg/css/background-image-svg-expected.txt (added)
• LayoutTests/svg/css/background-image-svg.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/svg/graphics/SVGImage.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-02-16  Yael Aharon  <yael.aharon@nokia.com>
+
+        Reviewed by Nikolas Zimmermann.
+
+        SVG not rendered as background-image from data URI
+        https://bugs.webkit.org/show_bug.cgi?id=33630
+
+        * platform/mac/svg/css/background-image-svg-expected.checksum: Added.
+        * platform/mac/svg/css/background-image-svg-expected.png: Added.
+        * platform/qt/svg/css/background-image-svg-expected.checksum: Added.
+        * platform/qt/svg/css/background-image-svg-expected.png: Added.
+        * svg/css/background-image-svg.html: Added.
+        * svg/css/background-image-svg-expected.txt: Added.
+
 2010-02-16  Nikolas Zimmermann  <nzimmermann@rim.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-02-16  Yael Aharon  <yael.aharon@nokia.com>
+
+        Reviewed by Nikolas Zimmermann.
+
+        SVG not rendered as background-image from data URI
+        https://bugs.webkit.org/show_bug.cgi?id=33630
+
+        When the background image is an SVG image, and it is smaller than the area
+        it is supposed to fill, we were using renderSubTreeToImage to draw it.
+        That call was not going through all the drawing phases, and so the SVG itself
+        would not be drawn.
+
+        Test: svg/css/background-image-svg.html
+
+        * svg/graphics/SVGImage.cpp:
+        (WebCore::SVGImage::nativeImageForCurrentFrame):
+
 2010-02-16  Bryan Yeung  <bryeung@chromium.org>
 

trunk/WebCore/svg/graphics/SVGImage.cpp

@@ -216 +216 @@
         if (!m_frameCache) // failed to allocate image
             return 0;
-        renderSubtreeToImage(m_frameCache.get(), m_page->mainFrame()->contentRenderer());
+        draw(m_frameCache->context(), rect(), rect(), DeviceColorSpace, CompositeSourceOver);
     }
     return m_frameCache->image()->nativeImageForCurrentFrame();