Changeset 133155 in webkit

Timestamp:

Nov 1, 2012 6:39:54 AM (11 years ago)

Author:

schenney@chromium.org

Message:

SVG as an image may recreate the renderer on zoom
​https://bugs.webkit.org/show_bug.cgi?id=99508

Reviewed by Abhishek Arya.

Source/WebCore:

The SVGImage code, when SVG is used in <img> tags, caches the renderer
at the start of the painting method and re-uses the pointer at the end
of the method. However, when the page is zoomed the renderer may be
detached mid-method, thus leaving a stray pointer. The fix is to
re-fetch the pointer after the zooms.

Test: svg/as-image/img-zoom-svg-stylesheet.html

• svg/graphics/SVGImage.cpp:

(WebCore::SVGImage::drawSVGToImageBuffer): Re-fetch the renderer after
the zoom operations.

LayoutTests:

Test and ref-test-result for zooming of SVG content when loaded as-image, and the svg is actually a css file.

• svg/as-image/img-zoom-svg-stylesheet-expected.html: Added.
• svg/as-image/img-zoom-svg-stylesheet.html: Added.
• svg/as-image/resources/svg-stylesheet-for-zoom.svg: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/svg/as-image/img-zoom-svg-stylesheet-expected.html (added)
• LayoutTests/svg/as-image/img-zoom-svg-stylesheet.html (added)
• LayoutTests/svg/as-image/resources/svg-stylesheet-for-zoom.svg (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/svg/graphics/SVGImage.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-11-01  Stephen Chenney  <schenney@chromium.org>
+
+        SVG as an image may recreate the renderer on zoom
+        https://bugs.webkit.org/show_bug.cgi?id=99508
+
+        Reviewed by Abhishek Arya.
+
+        Test and ref-test-result for zooming of SVG content when loaded as-image, and the svg is actually a css file.
+
+        * svg/as-image/img-zoom-svg-stylesheet-expected.html: Added.
+        * svg/as-image/img-zoom-svg-stylesheet.html: Added.
+        * svg/as-image/resources/svg-stylesheet-for-zoom.svg: Added.
+
 2012-11-01  Vsevolod Vlasov  <vsevik@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-11-01  Stephen Chenney  <schenney@chromium.org>
+
+        SVG as an image may recreate the renderer on zoom
+        https://bugs.webkit.org/show_bug.cgi?id=99508
+
+        Reviewed by Abhishek Arya.
+
+        The SVGImage code, when SVG is used in <img> tags, caches the renderer
+        at the start of the painting method and re-uses the pointer at the end
+        of the method. However, when the page is zoomed the renderer may be
+        detached mid-method, thus leaving a stray pointer. The fix is to
+        re-fetch the pointer after the zooms.
+
+        Test: svg/as-image/img-zoom-svg-stylesheet.html
+
+        * svg/graphics/SVGImage.cpp:
+        (WebCore::SVGImage::drawSVGToImageBuffer): Re-fetch the renderer after
+        the zoom operations.
+
 2012-11-01  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/Source/WebCore/svg/graphics/SVGImage.cpp

@@ -154 +154 @@
         frame->setPageZoomFactor(1);
 
-    renderer->setContainerSize(IntSize());
+    // Renderer may have been recreated by frame->setPageZoomFactor(zoom). So fetch it again.
+    renderer = toRenderSVGRoot(rootElement->renderer());
+    if (renderer)
+        renderer->setContainerSize(IntSize());
+
     frame->view()->resize(this->size());
     if (frame->view()->needsLayout())