Bug 21910 – REGRESSION (r37146): SVG-as-image is not rendered

• Status: RESOLVED
• Resolution: FIXED
• Component: Layout and Rendering

[Pierre-Olivier Latour]

While re-doing the image bases for https://bugs.webkit.org/show_bug.cgi?id=21821, we noticed that these pixel tests are currently failing (SVG does not seem to be rendering):

fast/backgrounds/svg-as-background-1.html
fast/backgrounds/svg-as-background-2.html
fast/backgrounds/svg-as-background-3.html
fast/backgrounds/svg-as-background-5.html
fast/backgrounds/svg-as-background-6.html
fast/backgrounds/svg-as-mask.html
fast/borders/svg-as-border-image-2.html
fast/borders/svg-as-border-image.html
fast/images/svg-as-background.html
fast/images/svg-as-image.html
fast/images/svg-as-relative-image.html
fast/images/svg-as-tiled-background.html

[David Harrison]

This looks like rdar://problem/6326892

[David Harrison]

... which I tracked to http://trac.webkit.org/changeset/37146

[Simon Fraser (smfr)]

Which is hyatt's.

[Simon Fraser (smfr)]

Maybe fix:

diff --git a/WebCore/svg/graphics/SVGImage.cpp b/WebCore/svg/graphics/SVGImage.cpp
index 4427277..33a6d56 100644
--- a/WebCore/svg/graphics/SVGImage.cpp
+++ b/WebCore/svg/graphics/SVGImage.cpp
@@ -72,6 +72,10 @@ void SVGImage::setContainerSize(const IntSize& containerSize)
 
     if (!m_frame || !m_frame->document())
         return;
+    
+    if (m_frame->view())
+        m_frame->view()->resize(containerSize);
+    
     SVGSVGElement* rootElement = static_cast<SVGDocument*>(m_frame->document())->rootElement();
     if (!rootElement)
         return;

However, LayoutTests/fast/backgrounds/svg-as-background-5.html still renders all red until you cause a repaint to happen. The other tests work.

[Simon Fraser (smfr)]

Hm, that change doesn't fix <img src="foo.svg">

[Simon Fraser (smfr)]

Maybe call 
   m_frame->view()->resize(size());
in SVGImage::draw()?

[Simon Fraser (smfr)]

Created attachment 26233 [details]
Patch, changelog, fixed testcases

[Simon Fraser (smfr)]

Committing to http://svn.webkit.org/repository/webkit/trunk ...
	M	LayoutTests/ChangeLog
	M	LayoutTests/platform/mac/fast/backgrounds/svg-as-background-1-expected.checksum
	M	LayoutTests/platform/mac/fast/backgrounds/svg-as-background-1-expected.png
	M	LayoutTests/platform/mac/fast/backgrounds/svg-as-background-2-expected.checksum
	M	LayoutTests/platform/mac/fast/backgrounds/svg-as-background-2-expected.png
	M	LayoutTests/platform/mac/fast/backgrounds/svg-as-background-3-expected.checksum
	M	LayoutTests/platform/mac/fast/backgrounds/svg-as-background-3-expected.png
	M	LayoutTests/platform/mac/fast/backgrounds/svg-as-background-4-expected.checksum
	M	LayoutTests/platform/mac/fast/backgrounds/svg-as-background-4-expected.png
	M	LayoutTests/platform/mac/fast/backgrounds/svg-as-background-6-expected.checksum
	M	LayoutTests/platform/mac/fast/backgrounds/svg-as-background-6-expected.png
	M	LayoutTests/platform/mac/fast/backgrounds/svg-as-mask-expected.checksum
	M	LayoutTests/platform/mac/fast/backgrounds/svg-as-mask-expected.png
	M	LayoutTests/platform/mac/svg/W3C-SVG-1.1/struct-image-05-b-expected.checksum
	M	LayoutTests/platform/mac/svg/W3C-SVG-1.1/struct-image-05-b-expected.png
	M	WebCore/ChangeLog
	M	WebCore/svg/graphics/SVGImage.cpp
Committed r39462

[Eric Seidel (no email)]

Simon Fraser is my hero.

[Simon Fraser (smfr)]

Some more bases that I missed:
Committing to http://svn.webkit.org/repository/webkit/trunk ...
	M	LayoutTests/ChangeLog
	M	LayoutTests/platform/mac/fast/images/svg-as-background-expected.checksum
	M	LayoutTests/platform/mac/fast/images/svg-as-background-expected.png
	M	LayoutTests/platform/mac/fast/images/svg-as-image-expected.checksum
	M	LayoutTests/platform/mac/fast/images/svg-as-image-expected.png
	M	LayoutTests/platform/mac/fast/images/svg-as-relative-image-expected.checksum
	M	LayoutTests/platform/mac/fast/images/svg-as-relative-image-expected.png
Committed r39469

[Simon Fraser (smfr)]

Final test fixing:
Committing to http://svn.webkit.org/repository/webkit/trunk ...
	M	LayoutTests/ChangeLog
	M	LayoutTests/platform/mac/fast/borders/svg-as-border-image-2-expected.checksum
	M	LayoutTests/platform/mac/fast/borders/svg-as-border-image-2-expected.png
	M	LayoutTests/platform/mac/fast/borders/svg-as-border-image-expected.checksum
	M	LayoutTests/platform/mac/fast/borders/svg-as-border-image-expected.png
Committed r39479

[Simon Fraser (smfr)]

*** Bug 17552 has been marked as a duplicate of this bug. ***