Bug 1384427 - Update more tests within layout/ to comply with new data: URI inheritance model. r=smaug
authorChristoph Kerschbaumer <ckerschb@christophkerschbaumer.com>
Wed, 26 Jul 2017 11:42:31 +0200
changeset 419995 fa85602bf2e2354fcc12ce7981553878bdc18df3
parent 419994 e3dcfc6597d1ab79736a6b5c7284bb498b42060d
child 419996 7eb9728ad2a1b4af4cd7e7a78f676cb0f7333c89
push id7566
push usermtabara@mozilla.com
push dateWed, 02 Aug 2017 08:25:16 +0000
treeherdermozilla-beta@86913f512c3c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmaug
bugs1384427
milestone56.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1384427 - Update more tests within layout/ to comply with new data: URI inheritance model. r=smaug
layout/base/tests/bug558663.html
layout/base/tests/file_bug465448.html
layout/base/tests/file_bug607529-1.html
layout/base/tests/mochitest.ini
layout/base/tests/test_bug465448.xul
layout/base/tests/test_bug469170.html
layout/base/tests/test_bug518777.html
layout/base/tests/test_bug607529.html
--- a/layout/base/tests/bug558663.html
+++ b/layout/base/tests/bug558663.html
@@ -5,17 +5,17 @@ https://bugzilla.mozilla.org/show_bug.cg
 -->
 <head>
   <title>Test for Bug 558663</title>
 </head>
 <body>
 <p><a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=558663">Mozilla Bug 558663</a></p>
 
  <!-- 20x20 of red -->
-<iframe id="iframe" src="data:text/html,<img id='image' border='0' src='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAIAAAAC64paAAAAG0lEQVR42mP8z0A%2BYKJA76jmUc2jmkc1U0EzACKcASfOgGoMAAAAAElFTkSuQmCC'>"></iframe>
+<iframe id="iframe" srcdoc="<img id='image' border='0' src='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAIAAAAC64paAAAAG0lEQVR42mP8z0A%2BYKJA76jmUc2jmkc1U0EzACKcASfOgGoMAAAAAElFTkSuQmCC'>"></iframe>
 
 <pre id="test">
 <script type="application/javascript">
 
 /** Test for Bug 558663 **/
 var ok = parent.ok;
 var SimpleTest = parent.SimpleTest;
 var compareSnapshots = parent.compareSnapshots;
new file mode 100644
--- /dev/null
+++ b/layout/base/tests/file_bug465448.html
@@ -0,0 +1,1 @@
+<body onload='window.opener.loaded()'><div style='height:200px; width:100px;'>
new file mode 100644
--- /dev/null
+++ b/layout/base/tests/file_bug607529-1.html
@@ -0,0 +1,1 @@
+<script>window.onload = function() { opener.postMessage('goback', '*'); }</script>
--- a/layout/base/tests/mochitest.ini
+++ b/layout/base/tests/mochitest.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 support-files =
   Ahem.ttf
+  file_bug465448.html
   file_bug842853.html
   file_bug842853.sjs
   selection-utils.js
   ../../../dom/plugins/test/mochitest/plugin-utils.js
 
 [test_after_paint_pref.html]
 [test_border_radius_hit_testing.html]
 support-files = border_radius_hit_testing_iframe.html
@@ -57,17 +58,19 @@ support-files = bug558663.html
 [test_bug583889.html]
 support-files =
   bug583889_inner1.html
   bug583889_inner2.html
 [test_bug588174.html]
 [test_bug603550.html]
 skip-if = toolkit == 'android' # Doesn't work on Android
 [test_bug607529.html]
-support-files = file_bug607529.html
+support-files =
+  file_bug607529.html
+  file_bug607529-1.html
 [test_bug629838.html]
 skip-if = toolkit == 'android' # Requires plugin support
 [test_bug644768.html]
 [test_bug646757.html]
 [test_bug667512.html]
 [test_bug677878.html]
 [test_bug687297.html]
 support-files =
--- a/layout/base/tests/test_bug465448.xul
+++ b/layout/base/tests/test_bug465448.xul
@@ -8,17 +8,17 @@
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>      
   <script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script>      
 
 <script><![CDATA[
 SimpleTest.waitForExplicitFinish();
 var loadedCalled = false;
-var win = window.open("data:text/html,<body onload='window.opener.loaded()'><div style='height:200px; width:100px;'>", "_blank", "width=600,height=600");
+var win = window.open("file_bug465448.html", "_blank", "width=600,height=600");
 
 function loaded() {
   if (!loadedCalled) {
     loadedCalled = true;
     return;
   }
   win.sizeToContent();
   win.sizeToContent();
--- a/layout/base/tests/test_bug469170.html
+++ b/layout/base/tests/test_bug469170.html
@@ -6,18 +6,17 @@ https://bugzilla.mozilla.org/show_bug.cg
 <head>
   <title>Test for Bug 469170</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body onload="runTest();">
 <p><a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=469170">Mozilla Bug 469170</a></p>
 
-<iframe id="source" width="50" height="50"
-       src="data:text/html,%3Chtml%3E%3C%2Fhtml%3E"></iframe>
+<iframe id="source" width="50" height="50" srcdoc="<html></html>"></iframe>
 
 <pre id="test">
 <script type="application/javascript">
 
 /** Test for Bug 469170 **/
 
 SimpleTest.waitForExplicitFinish();
 
--- a/layout/base/tests/test_bug518777.html
+++ b/layout/base/tests/test_bug518777.html
@@ -30,19 +30,15 @@ https://bugzilla.mozilla.org/show_bug.cg
 
     SimpleTest.finish();
   }
   </script>
 </head>
 <body>
 <p><a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=518777">Mozilla Bug 518777</a></p>
 
-<!--
-iframe source is
-<html><body onload='window.scrollTo(0,99999999); document.documentElement.offsetWidth; window.parent.dotest();' style='background: rgb(0,0,255); width: 100px; height: 50100px;'></body></html>
--->
 <iframe id="source" width="50" height="50"
-       src="data:text/html,%3Chtml%3E%3Cbody%20onload%3D%27window.scrollTo%280%2C99999999%29%3B%20document.documentElement.offsetWidth%3B%20window.parent.dotest%28%29%3B%27%20style%3D%27background%3A%20rgb%280%2C0%2C255%29%3B%20width%3A%20100px%3B%20height%3A%2050100px%3B%27%3E%3C%2Fbody%3E%3C%2Fhtml%3E"></iframe>
+       srcdoc="<html><body onload='window.scrollTo(0,99999999); document.documentElement.offsetWidth; window.parent.dotest();' style='background: rgb(0,0,255); width: 100px; height: 50100px;'></body></html>"></iframe>
 
 <pre id="test">
 </pre>
 </body>
 </html>
--- a/layout/base/tests/test_bug607529.html
+++ b/layout/base/tests/test_bug607529.html
@@ -26,17 +26,17 @@ https://bugzilla.mozilla.org/show_bug.cg
 
   /** Test for Bug 607529 **/
   var done = false;
   window.onmessage = function(e) {
     isnot(e.data, "notcached", "Should never end up not being cached");
   
     if (e.data == "loaded" && !doneOneLoad) {
       doneOneLoad = true;
-      w.location = "data:text/html,<script>window.onload = function() { opener.postMessage('goback', '*'); }</" + "script>";
+      w.location = "file_bug607529-1.html";
     }
     else if (e.data == "goback") {
       w.history.back();
     }
     else if (e.data == "revived") {
       w.postMessage("report", "*");
     }
     else if (e.data == "callbackHappened") {