Title: [99115] branches/chromium/874/LayoutTests
- Revision
- 99115
- Author
- [email protected]
- Date
- 2011-11-02 16:01:48 -0700 (Wed, 02 Nov 2011)
Log Message
Merge 98263 - <svg> fails to use explicit width and height inside <html> inside IFRAME
https://bugs.webkit.org/show_bug.cgi?id=64823
Reviewed by Nikolas Zimmermann.
Source/WebCore:
Checking that embedded SVG is in an SVG document before negotiating size
with the host document.
Test: svg/as-object/svg-embedded-in-html-in-iframe.html
* rendering/svg/RenderSVGRoot.cpp:
(WebCore::isEmbeddedThroughFrameContainingSVGDocument):
(WebCore::RenderSVGRoot::computeReplacedLogicalWidth):
(WebCore::RenderSVGRoot::computeReplacedLogicalHeight):
LayoutTests:
Fixing a bug where SVG negotiated size when embedded in html inside an iframe.
* platform/chromium/test_expectations.txt: Will update with results on other platforms.
* platform/mac/svg/as-object/svg-embedded-in-html-in-iframe-expected.png: Added.
* platform/mac/svg/as-object/svg-embedded-in-html-in-iframe-expected.txt: Added.
* svg/as-object/svg-embedded-in-html-in-iframe.html: Added.
[email protected]
Review URL: http://codereview.chromium.org/8439060
Added Paths
Diff
Copied: branches/chromium/874/LayoutTests/platform/mac/svg/as-object/svg-embedded-in-html-in-iframe-expected.png (from rev 98263, trunk/LayoutTests/platform/mac/svg/as-object/svg-embedded-in-html-in-iframe-expected.png)
(Binary files differ)
Copied: branches/chromium/874/LayoutTests/platform/mac/svg/as-object/svg-embedded-in-html-in-iframe-expected.txt (from rev 98263, trunk/LayoutTests/platform/mac/svg/as-object/svg-embedded-in-html-in-iframe-expected.txt) (0 => 99115)
--- branches/chromium/874/LayoutTests/platform/mac/svg/as-object/svg-embedded-in-html-in-iframe-expected.txt (rev 0)
+++ branches/chromium/874/LayoutTests/platform/mac/svg/as-object/svg-embedded-in-html-in-iframe-expected.txt 2011-11-02 23:01:48 UTC (rev 99115)
@@ -0,0 +1,15 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x170
+ RenderBlock {HTML} at (0,0) size 800x170
+ RenderBody {BODY} at (8,8) size 784x154
+ RenderPartObject {IFRAME} at (0,0) size 784x150
+ layer at (0,0) size 784x150
+ RenderView at (0,0) size 784x150
+ layer at (0,0) size 784x120
+ RenderBlock {HTML} at (0,0) size 784x120
+ RenderBody {BODY} at (8,8) size 768x104
+ RenderSVGRoot {svg} at (8,8) size 100x100
+ RenderSVGPath {circle} at (8,8) size 100x100 [fill={[type=SOLID] [color=#0000FF]}] [cx=50.00] [cy=50.00] [r=50.00]
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
Copied: branches/chromium/874/LayoutTests/svg/as-object/svg-embedded-in-html-in-iframe.html (from rev 98263, trunk/LayoutTests/svg/as-object/svg-embedded-in-html-in-iframe.html) (0 => 99115)
--- branches/chromium/874/LayoutTests/svg/as-object/svg-embedded-in-html-in-iframe.html (rev 0)
+++ branches/chromium/874/LayoutTests/svg/as-object/svg-embedded-in-html-in-iframe.html 2011-11-02 23:01:48 UTC (rev 99115)
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+<head>
+<script type="text/_javascript_">
+function CreateCircle(){
+var B="";
+B+="<!DOCTYPE html>";
+B+="<html>";
+B+="<body>";
+B+="<svg style=\"width:100px;height:100px;\">";
+B+="<circle cx=\"50%\" cy=\"50%\" r=\"50%\" fill=\"blue\" stroke=\"none\" />";
+B+="</svg>";
+B+="</body></html>";
+return B;
+}
+</script>
+</head>
+<body>
+<iframe src="" width="100%" height="100%" frameborder="0" scrolling="no"></iframe>
+</body>
+</html>
+
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
