Auto merge of #10684 - Swatinem:hide_svg, r=Ms2ger

do not render svg children, fixes #10646 r? jdm  --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10684)
servo · Apr 25, 2016 · 97a45dc · 97a45dc
2 parents 0efbe5e + 606b11c
commit 97a45dc
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 3 deletions.
diff --git a/resources/servo.css b/resources/servo.css
@@ -60,3 +60,11 @@ details[open]::-servo-details-content {
   display: block;
 }
 
+/*
+ * Until servo supports svg properly, make sure to at least prevent svg
+ * children from being layed out and rendered like usual html.
+ * https://github.com/servo/servo/issues/10646
+ */
+svg > * {
+  display: none;
+}
diff --git a/tests/wpt/metadata-css/css-text-decor-3_dev/html/text-decoration-propagation-01.htm.ini b/tests/wpt/metadata-css/css-text-decor-3_dev/html/text-decoration-propagation-01.htm.ini
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -4588,6 +4588,18 @@
             "url": "/_mozilla/css/submit_focus_a.html"
           }
         ],
+        "css/svg_children.html": [
+          {
+            "path": "css/svg_children.html",
+            "references": [
+              [
+                "/_mozilla/css/svg_children_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/svg_children.html"
+          }
+        ],
         "css/table_auto_width.html": [
           {
             "path": "css/table_auto_width.html",
@@ -11280,6 +11292,18 @@
           "url": "/_mozilla/css/submit_focus_a.html"
         }
       ],
+      "css/svg_children.html": [
+        {
+          "path": "css/svg_children.html",
+          "references": [
+            [
+              "/_mozilla/css/svg_children_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/svg_children.html"
+        }
+      ],
       "css/table_auto_width.html": [
         {
           "path": "css/table_auto_width.html",

diff --git a/tests/wpt/mozilla/tests/css/svg_children.html b/tests/wpt/mozilla/tests/css/svg_children.html
@@ -0,0 +1,9 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>not rendering children of svg</title>
+<link rel="match" href="svg_children_ref.html">
+<svg>
+  <style>
+    /* some text content that should not be rendered */
+  </style>
+</svg>
diff --git a/tests/wpt/mozilla/tests/css/svg_children_ref.html b/tests/wpt/mozilla/tests/css/svg_children_ref.html
@@ -0,0 +1,2 @@
+<!doctype html>
+<meta charset="utf-8">