diff --git a/dom/events/test/bug545268.html b/dom/events/test/bug545268.html new file mode 100644 index 000000000000..1f90149a547b --- /dev/null +++ b/dom/events/test/bug545268.html @@ -0,0 +1 @@ + +

Normal text

diff --git a/dom/events/test/test_bug944011.html b/dom/events/test/test_bug944011.html index eab74ee32b0a..49e05fea5160 100644 --- a/dom/events/test/test_bug944011.html +++ b/dom/events/test/test_bug944011.html @@ -24,7 +24,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=944011 ok(true, "Got onclick"); SimpleTest.finish(); } - $('ifr').setAttribute('src', 'data:text/html,Second frame'); + $('ifr').setAttribute('srcdoc', 'Second frame'); break; case 2: ok(true, "Got second load"); @@ -43,7 +43,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=944011 Mozilla Bug 944011 

diff --git a/dom/events/test/test_onerror_handler_args.html b/dom/events/test/test_onerror_handler_args.html
index 62943481403c..7b958d148c04 100644
--- a/dom/events/test/test_onerror_handler_args.html
+++ b/dom/events/test/test_onerror_handler_args.html
@@ -28,7 +28,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1007790
 Mozilla Bug 1007790
 

 
 
 

diff --git a/dom/html/test/file_fullscreen-hidden.html b/dom/html/test/file_fullscreen-hidden.html
index b458a1714fcd..eb624a976738 100644
--- a/dom/html/test/file_fullscreen-hidden.html
+++ b/dom/html/test/file_fullscreen-hidden.html
@@ -10,7 +10,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=697636
 
 
 
-
+
 
 Mozilla Bug 697636
 

@@ -27,9 +27,10 @@ var e1;
 
 function begin()
 {
-  frameWin = document.getElementById("f").contentWindow;
+  var f = document.getElementById("f");
+  frameWin = f.contentWindow;
   e1 = frameWin.document.documentElement;
-  frameWin.location = "data:text/html,2";
+  f.srcdoc = "2";
 }
 
 function b2()
diff --git a/dom/html/test/file_fullscreen-navigation.html b/dom/html/test/file_fullscreen-navigation.html
index e0420e89ffb1..9639832cbad8 100644
--- a/dom/html/test/file_fullscreen-navigation.html
+++ b/dom/html/test/file_fullscreen-navigation.html
@@ -10,7 +10,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=685402
 
 
 
-
+
 
 Mozilla Bug 685402
 

@@ -29,11 +29,12 @@ var prevTrusted;
 
 function begin()
 {
-  frameWin = document.getElementById("f").contentWindow;
+  var f = document.getElementById("f");
+  frameWin = f.contentWindow;
   e1 = frameWin.document.body;
   document.addEventListener("fullscreenchange", function() {
     opener.ok(document.fullscreenElement, "[navigation] Request should be granted");
-    frameWin.location = "data:text/html,2";
+    f.srcdoc = "2";
   }, {once: true});
 
   e1.requestFullscreen();
diff --git a/dom/html/test/file_fullscreen-rollback.html b/dom/html/test/file_fullscreen-rollback.html
index e9c88baf9ee2..7d992e5a760a 100644
--- a/dom/html/test/file_fullscreen-rollback.html
+++ b/dom/html/test/file_fullscreen-rollback.html
@@ -26,7 +26,7 @@ Tests:
 
 

   

-    
+    
   

 

 
diff --git a/dom/html/test/file_srcdoc.html b/dom/html/test/file_srcdoc.html
index 70fbff42f701..7f084bc74b03 100644
--- a/dom/html/test/file_srcdoc.html
+++ b/dom/html/test/file_srcdoc.html
@@ -9,7 +9,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=802895
 
 
-
 
 
diff --git a/dom/html/test/file_srcdoc_iframe3.html b/dom/html/test/file_srcdoc_iframe3.html
new file mode 100644
index 000000000000..233692734f3b
--- /dev/null
+++ b/dom/html/test/file_srcdoc_iframe3.html
@@ -0,0 +1 @@
+Gone
diff --git a/dom/html/test/mochitest.ini b/dom/html/test/mochitest.ini
index 00d94b0ac356..058680a3e88b 100644
--- a/dom/html/test/mochitest.ini
+++ b/dom/html/test/mochitest.ini
@@ -169,6 +169,7 @@ support-files =
   file_iframe_sandbox_worker.js
   file_srcdoc-2.html
   file_srcdoc.html
+  file_srcdoc_iframe3.html
   file_window_open_close_outer.html
   file_window_open_close_inner.html
   formSubmission_chrome.js
diff --git a/dom/html/test/test_fullscreen-api-race.html b/dom/html/test/test_fullscreen-api-race.html
index 03c6c6da3aa5..74a2393f64fa 100644
--- a/dom/html/test/test_fullscreen-api-race.html
+++ b/dom/html/test/test_fullscreen-api-race.html
@@ -53,7 +53,7 @@ const ACTION_FUNCS = [
   function navigate(win) {
     info("About to navigate to another page");
     var deferred = new Deferred();
-    win.location = "data:text/html,";
+    win.location = "dummy_page.html";
     setTimeout(() => {
       SimpleTest.waitForFocus(() => {
         checkIsChromeFullscreen(win, false).then(() => {
diff --git a/dom/html/test/test_srcdoc.html b/dom/html/test/test_srcdoc.html
index e15d7ac2b9b8..b3137f4e0aba 100644
--- a/dom/html/test/test_srcdoc.html
+++ b/dom/html/test/test_srcdoc.html
@@ -84,7 +84,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=802895
     // Test srcdoc attribute removal
     iframe3.onload = function () {
       var innerDoc3 = iframe3.contentDocument;
-      is(innerDoc3.body.innerHTML, "Gone", "Bad srcdoc attribute removal");
+      is(innerDoc3.body.innerText, "Gone", "Bad srcdoc attribute removal");
       finish3 = true;
       if (finish && finish1 && finish3) {
         SimpleTest.finish();