Title: [134257] branches/chromium/1271
- Revision
- 134257
- Author
- [email protected]
- Date
- 2012-11-12 10:58:45 -0800 (Mon, 12 Nov 2012)
Log Message
Merge 133155
BUG=153228
Review URL: https://codereview.chromium.org/11275265
Modified Paths
Added Paths
Diff
Copied: branches/chromium/1271/LayoutTests/svg/as-image/img-zoom-svg-stylesheet-expected.html (from rev 133155, trunk/LayoutTests/svg/as-image/img-zoom-svg-stylesheet-expected.html) (0 => 134257)
--- branches/chromium/1271/LayoutTests/svg/as-image/img-zoom-svg-stylesheet-expected.html (rev 0)
+++ branches/chromium/1271/LayoutTests/svg/as-image/img-zoom-svg-stylesheet-expected.html 2012-11-12 18:58:45 UTC (rev 134257)
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<html>
+ <p>This test PASSES if you can hit <Ctrl>+ without crashing.</p>
+ <script>
+ if (window.eventSender)
+ eventSender.zoomPageIn();
+ </script>
+</html>
\ No newline at end of file
Copied: branches/chromium/1271/LayoutTests/svg/as-image/img-zoom-svg-stylesheet.html (from rev 133155, trunk/LayoutTests/svg/as-image/img-zoom-svg-stylesheet.html) (0 => 134257)
--- branches/chromium/1271/LayoutTests/svg/as-image/img-zoom-svg-stylesheet.html (rev 0)
+++ branches/chromium/1271/LayoutTests/svg/as-image/img-zoom-svg-stylesheet.html 2012-11-12 18:58:45 UTC (rev 134257)
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+ <p>This test PASSES if you can hit <Ctrl>+ without crashing.</p>
+ <img style="width:10;height:10" src="" _onload_="zoomPage()"/>
+ <script>
+ function zoomPage()
+ {
+ if (window.eventSender)
+ eventSender.zoomPageIn();
+ }
+ </script>
+</html>
\ No newline at end of file
Copied: branches/chromium/1271/LayoutTests/svg/as-image/resources/svg-stylesheet-for-zoom.svg (from rev 133155, trunk/LayoutTests/svg/as-image/resources/svg-stylesheet-for-zoom.svg) (0 => 134257)
--- branches/chromium/1271/LayoutTests/svg/as-image/resources/svg-stylesheet-for-zoom.svg (rev 0)
+++ branches/chromium/1271/LayoutTests/svg/as-image/resources/svg-stylesheet-for-zoom.svg 2012-11-12 18:58:45 UTC (rev 134257)
@@ -0,0 +1,3 @@
+<?xml-stylesheet href="" type="text/css"?>
+<svg width="10" height="10" xmlns="http://www.w3.org/2000/svg">
+</svg>
\ No newline at end of file
Modified: branches/chromium/1271/Source/WebCore/svg/graphics/SVGImage.cpp (134256 => 134257)
--- branches/chromium/1271/Source/WebCore/svg/graphics/SVGImage.cpp 2012-11-12 18:43:19 UTC (rev 134256)
+++ branches/chromium/1271/Source/WebCore/svg/graphics/SVGImage.cpp 2012-11-12 18:58:45 UTC (rev 134257)
@@ -180,7 +180,11 @@
if (zoom != 1)
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())
frame->view()->layout();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
