Bug 1448162 - Remove all XUL overlay tests. r?gijs draft
authorBrendan Dahl <brendan.dahl@gmail.com>
Thu, 22 Mar 2018 16:21:26 -0700
changeset 777364 b3b51760d307ecbe0c7b3f30c0a4247bbc012d3a
parent 776767 a1fb8ffae378963b128deaaf3a76eff9dbb6be21
child 777365 7f36f142d543559b1dd06418a880ea0ea570b30d
push id105183
push userbmo:bdahl@mozilla.com
push dateWed, 04 Apr 2018 17:43:21 +0000
reviewersgijs
bugs1448162
milestone61.0a1
Bug 1448162 - Remove all XUL overlay tests. r?gijs MozReview-Commit-ID: 1hSLa2goMLt
chrome/test/unit/data/test_bug564667/chrome.manifest
chrome/test/unit/test_bug564667.js
dom/xul/crashtests/451311-1.xul
dom/xul/crashtests/495635-1.xul
dom/xul/crashtests/509719-1-overlay.xul
dom/xul/crashtests/509719-1.xul
dom/xul/crashtests/509719-2-overlay.xul
dom/xul/crashtests/509719-2.xul
dom/xul/crashtests/crashtests.list
dom/xul/crashtests/extA1.xul
dom/xul/crashtests/extA2.xul
dom/xul/crashtests/extB1.xul
dom/xul/test/bug497875-iframe.xul
dom/xul/test/chrome.ini
dom/xul/test/overlay1_bug335375.xul
dom/xul/test/overlay2_bug335375.xul
dom/xul/test/overlay_640158.xul
dom/xul/test/test_bug335375.xul
dom/xul/test/test_bug497875.xul
dom/xul/test/test_bug640158_overlay_persist.xul
layout/reftests/xul-document-load/readme.txt
layout/reftests/xul-document-load/reftest.list
layout/reftests/xul-document-load/subdir/test011-overlay.xul
layout/reftests/xul-document-load/subdir/test011.css
layout/reftests/xul-document-load/subdir/test014-overlay-2.xul
layout/reftests/xul-document-load/subdir/test014-overlay.xul
layout/reftests/xul-document-load/subdir/test015-overlay.xul
layout/reftests/xul-document-load/subdir/test015.js
layout/reftests/xul-document-load/test001-overlay.xul
layout/reftests/xul-document-load/test001.css
layout/reftests/xul-document-load/test001.xul
layout/reftests/xul-document-load/test002-overlay-1.xul
layout/reftests/xul-document-load/test002-overlay-2.xul
layout/reftests/xul-document-load/test002.css
layout/reftests/xul-document-load/test002.xul
layout/reftests/xul-document-load/test007-overlay.xul
layout/reftests/xul-document-load/test007.xul
layout/reftests/xul-document-load/test009.xul
layout/reftests/xul-document-load/test010-overlay.xul
layout/reftests/xul-document-load/test010.xul
layout/reftests/xul-document-load/test011.xul
layout/reftests/xul-document-load/test014.xul
layout/reftests/xul-document-load/test015.xul
layout/reftests/xul-document-load/test016-overlay.xul
layout/reftests/xul-document-load/test016.xul
layout/reftests/xul-document-load/test017-020.js
layout/reftests/xul-document-load/test017-overlay-2.xul
layout/reftests/xul-document-load/test017-overlay.xul
layout/reftests/xul-document-load/test017.xul
layout/reftests/xul-document-load/test018-overlay-2.xul
layout/reftests/xul-document-load/test018-overlay.xul
layout/reftests/xul-document-load/test018.xul
layout/reftests/xul-document-load/test019-overlay.xul
layout/reftests/xul-document-load/test019.css
layout/reftests/xul-document-load/test019.xul
layout/reftests/xul-document-load/test020-overlay.xul
layout/reftests/xul-document-load/test020.css
layout/reftests/xul-document-load/test020.xul
layout/reftests/xul-document-load/test021-overlay.xul
layout/reftests/xul-document-load/test021.xul
layout/xul/tree/crashtests/509602-1-overlay.xul
layout/xul/tree/crashtests/509602-1.xul
layout/xul/tree/crashtests/crashtests.list
--- a/chrome/test/unit/data/test_bug564667/chrome.manifest
+++ b/chrome/test/unit/data/test_bug564667/chrome.manifest
@@ -7,10 +7,9 @@ skin     test1 test  test/
 content testOverride  test/
 override chrome://testOverride/content file:///test1/override
 
 
 # Load external manifest
 manifest loaded.manifest
 
 # Failure Cases
-overlay   chrome://test1/content/overlay.xul   chrome://test1/content/test1.xul
 style     chrome://test1/content/style.xul     chrome://test1/content/test1.css
--- a/chrome/test/unit/test_bug564667.js
+++ b/chrome/test/unit/test_bug564667.js
@@ -33,32 +33,26 @@ function test_removed_mapping(chromeURL,
     gCR.convertChromeURL(uri);
     do_throw(chromeURL + " not removed");
   } catch (ex) {
     // This should throw
   }
 }
 
 /*
- * Checks if any overlay was added after loading
+ * Checks if any style overlays were added after loading
  * the manifest files
- *
- * @param type The type of overlay: overlay|style
  */
-function test_no_overlays(chromeURL, target, type = "overlay") {
+function test_no_overlays(chromeURL, target) {
   var uri = Services.io.newURI(chromeURL);
-  var overlays = (type == "overlay") ?
-      gCR.getXULOverlays(uri) : gCR.getStyleOverlays(uri);
+  var overlays = gCR.getStyleOverlays(uri);
 
-  // We shouldn't be allowed to register overlays nor styles
+  // We shouldn't be allowed to register styles
   if (overlays.hasMoreElements()) {
-    if (type == "styles")
-      do_throw("Style Registered: " + chromeURL);
-    else
-      do_throw("Overlay Registered: " + chromeURL);
+    do_throw("Style Registered: " + chromeURL);
   }
 }
 
 function testManifest(manifestPath, baseURI) {
 
   // ------------------  Add manifest file ------------------------
   Components.manager.addBootstrappedManifestLocation(manifestPath);
 
@@ -73,25 +67,20 @@ function testManifest(manifestPath, base
 
   // Test Adding Manifest URL
   test_mapping("chrome://test2/content", baseURI + "test/test2.xul");
   test_mapping("chrome://test2/locale", baseURI + "test/test2.dtd");
 
   // Test Adding Override
   test_mapping("chrome://testOverride/content", "file:///test1/override");
 
-  // Test Not-Adding Overlays
-  test_no_overlays("chrome://test1/content/overlay.xul",
-                   "chrome://test1/content/test1.xul");
-
   // Test Not-Adding Styles
   test_no_overlays("chrome://test1/content/style.xul",
                    "chrome://test1/content/test1.css", "styles");
 
-
   // ------------------  Remove manifest file ------------------------
   Components.manager.removeBootstrappedManifestLocation(manifestPath);
 
   // Test Removing Content URL
   test_removed_mapping("chrome://test1/content", baseURI + "test/test1.xul");
 
   // Test Removing Content URL
   test_removed_mapping("chrome://test1/locale", baseURI + "test/test1.dtd");
deleted file mode 100644
--- a/dom/xul/crashtests/451311-1.xul
+++ /dev/null
@@ -1,1 +0,0 @@
-<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"><iframe/></overlay>
deleted file mode 100644
--- a/dom/xul/crashtests/495635-1.xul
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<?xul-overlay href="extA1.xul"?>
-<?xul-overlay href="extB1.xul"?>
-<?xul-overlay href="extA2.xul"?>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-<vbox id="browser-bottombox">
-</vbox>
-</window>
deleted file mode 100644
--- a/dom/xul/crashtests/509719-1-overlay.xul
+++ /dev/null
@@ -1,3 +0,0 @@
-<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <window id="win" removeelement="true"/>
-</overlay>
deleted file mode 100644
--- a/dom/xul/crashtests/509719-1.xul
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xul-overlay href="509719-1-overlay.xul"?>
-<window id="win" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-</window>
deleted file mode 100644
--- a/dom/xul/crashtests/509719-2-overlay.xul
+++ /dev/null
@@ -1,8 +0,0 @@
-<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script>
-    if (document.getElementById("testnode")) {
-      document.loadOverlay(window.location.href.substr(0,window.location.href.lastIndexOf('/')+1)+'509719-2-overlay.xul', null);
-    }
-  </script>
-  <box xmlns="http://www.w3.org/1999/xhtml" id="testnode" removeelement="true"/>
-</overlay>
deleted file mode 100644
--- a/dom/xul/crashtests/509719-2.xul
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
-<window id="win" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <box id="testnode" onDOMAttrModified="this.parentNode.removeChild(this)"/>
-  <script>
-document.loadOverlay(window.location.href.substr(0,window.location.href.lastIndexOf('/')+1)+'509719-2-overlay.xul', null);
-  </script>
-</window>
--- a/dom/xul/crashtests/crashtests.list
+++ b/dom/xul/crashtests/crashtests.list
@@ -17,16 +17,12 @@ load 363791-1.xul
 load 384740-1.xul
 load 384877-1.html
 load 386914-1.html
 load 386947-1.xul
 load 425821-1.xul
 load 428951-1.xul
 load 429085-1.xhtml
 load 431906-1.html
-load 451311-1.xul
 load 461917-1.xhtml
 load 468211-1.xul
 load 468211-2.xul
 load 468211-3.xul
-load 495635-1.xul
-load 509719-1.xul
-asserts(3) load 509719-2.xul # bug 909819
deleted file mode 100644
--- a/dom/xul/crashtests/extA1.xul
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay SYSTEM "chrome://exta/locale/exta.dtd">
-<overlay id="extA1"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <vbox id="browser-bottombox">
-    <statusbar id="extAbar" />
-  </vbox>
-</overlay>
deleted file mode 100644
--- a/dom/xul/crashtests/extA2.xul
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay SYSTEM "chrome://exta/locale/exta.dtd">
-<overlay id="extA2"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <statusbar id="extAbar">
-    <statusbarpanel id="extApanel" label="panel 1">
-    </statusbarpanel>
-    <statusbarpanel id="extApanel2" label="panel 2" />
-  </statusbar>
-</overlay>
deleted file mode 100644
--- a/dom/xul/crashtests/extB1.xul
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<overlay id="extA2"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <statusbar id="extAbar" removeelement="true" />
-</overlay>
deleted file mode 100644
--- a/dom/xul/test/bug497875-iframe.xul
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
-<box onerror="document.loadOverlay('file:///does-not-exist', null);" >
-<html:script src="ftp://some.website.that.will.cause.an.error"/>
-</box>
-</window>
--- a/dom/xul/test/chrome.ini
+++ b/dom/xul/test/chrome.ini
@@ -1,29 +1,23 @@
 [DEFAULT]
 support-files =
   398289-resource.xul
-  bug497875-iframe.xul
-  overlay1_bug335375.xul
-  overlay2_bug335375.xul
   window_bug583948.xul
   window_bug757137.xul
 
 [test_bug199692.xul]
 [test_bug233643.xul]
 [test_bug311681.xul]
-[test_bug335375.xul]
 [test_bug391002.xul]
 [test_bug398289.html]
 [test_bug403868.xul]
 [test_bug414907.xul]
 [test_bug418216.xul]
 [test_bug445177.xul]
 [test_bug449457.xul]
 [test_bug468176.xul]
-[test_bug497875.xul]
 [test_bug583948.xul]
-[test_bug640158_overlay_persist.xul]
 [test_bug757137.xul]
 [test_bug775972.xul]
 [test_bug1070049_throw_from_script.xul]
 [test_import_xul_to_content.xul]
 [test_bug1290965.xul]
deleted file mode 100644
--- a/dom/xul/test/overlay1_bug335375.xul
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<overlay id="overlay1"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <commandset id="test_commandset">
-    <command id="cmd_test"/>
-  </commandset>
-  <toolbarbutton id="button_test"
-                 command="cmd_test"/>
-</overlay>
deleted file mode 100644
--- a/dom/xul/test/overlay2_bug335375.xul
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<overlay id="overlay2"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <command id="cmd_test" accesskey="C"/>
-</overlay>
deleted file mode 100644
--- a/dom/xul/test/overlay_640158.xul
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<overlay id="overlay1"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <window id="rootwin">
-    <box id="bar" testattr="original"/>
-  </window>
-</overlay>
-
deleted file mode 100644
--- a/dom/xul/test/test_bug335375.xul
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?>
-<?xul-overlay href="overlay1_bug335375.xul"?>
-<?xul-overlay href="overlay2_bug335375.xul"?>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=335375
--->
-<window title="Mozilla Bug 335375"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        onload="RunTest();">
-
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>      
-
-  <script type="application/javascript">
-    <![CDATA[
-      SimpleTest.waitForExplicitFinish();
-
-      function RunTest()
-      {
-        var cmd = document.getElementById("cmd_test");
-        var button = document.getElementById("button_test");
-
-        is(cmd.getAttribute("accesskey"), "C",
-           "checking command has an accesskey");
-        is(button.getAttribute("accesskey"), cmd.getAttribute("accesskey"),
-           "checking command and button have the same accesskey");
-
-        cmd.setAttribute("accesskey", "D");
-        is(button.getAttribute("accesskey"), "D",
-           "checking button has inherited new accesskey from command");
-
-        SimpleTest.finish();
-      }
-    ]]>
-  </script>
-
-  <body xmlns="http://www.w3.org/1999/xhtml">
-    <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=335375"
-       target="_blank">Mozilla Bug 335375</a>
-    <p id="display"></p>
-    <div id="content" style="display: none"></div>
-    <pre id="test"></pre>
-  </body>
-
-  <commandset id="test_commandset"/>
-  <toolbarbutton id="button_test"/>
-
-</window>
deleted file mode 100644
--- a/dom/xul/test/test_bug497875.xul
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css"
-                 type="text/css"?>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=497875
--->
-<window title="Mozilla Bug 497875"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
-
-<body  xmlns="http://www.w3.org/1999/xhtml">
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=497875">Mozilla Bug 497875</a>
-<p id="display"><iframe id="iframe" src="bug497875-iframe.xul"></iframe></p>
-<div id="content" style="display: none">
-  
-</div>
-<pre id="test">
-</pre>
-</body>
-
-<script class="testbody" type="application/javascript">
-<![CDATA[
-
-/** Test for Bug 497875 **/
-
-SimpleTest.waitForExplicitFinish();
-
-function done_test() {
-  var f = document.getElementById('iframe')
-  f.src="about:blank"
-  f.remove()
-  ok(true, "this is a crashtest");
-  SimpleTest.finish();
-}
-
-function do_test() {
-  setTimeout(function () {document.getElementById('iframe').contentWindow.location.reload()}, 500);
-  setTimeout(function () {document.getElementById('iframe').contentWindow.location.reload()}, 1000);
-  setTimeout(function () {document.getElementById('iframe').contentWindow.location.reload()}, 1500);
-  setTimeout(done_test, 2000);
-}
-
-do_test();
-
-
-]]>
-</script>
-
-</window>
deleted file mode 100644
--- a/dom/xul/test/test_bug640158_overlay_persist.xul
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=640158
--->
-<window title="Mozilla Bug 640158" id="rootwin"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
-
-  <!-- test results are displayed in the html:body -->
-  <body xmlns="http://www.w3.org/1999/xhtml">
-  <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=640158"
-     target="_blank">Mozilla Bug 640158</a>
-  </body>
-
-  <!-- test code goes here -->
-  <script type="application/javascript"><![CDATA[
-
-  SimpleTest.waitForExplicitFinish();
-  window.onload = function onload() {
-    is($("foo").getAttribute("testattr"), "original", "Attribute should be in original state");
-    // Change and persist another value:
-    $("foo").setAttribute("testattr", "changed");
-    document.persist("foo", "testattr");
-    $("foo").setAttribute("testattr", "original");
-
-    // Hacky times: check that items which are overlaid do get persisted into correctly,
-    // by first creating an extra element and persisting the value before loading an
-    // overlay that changes that value - the persisted value should be reinstated.
-    let root = document.documentElement;
-    let bar = document.createElement("box");
-    bar.id = "bar";
-    bar.setAttribute("testattr", "changed"); // The overlay we load has 'original'
-    root.appendChild(bar);
-    document.persist("bar", "testattr");
-    document.loadOverlay(location.href.replace(/[^\\\/]*.xul/, "overlay_bug640158.xul"), function() {
-      is($("foo").getAttribute("testattr"), "original",
-         "Non-overlaid attribute should still be in original state");
-      is($("bar").getAttribute("testattr"), "changed",
-         "Overlaid attribute should have been changed.");
-      SimpleTest.finish();
-    });
-  }
-
-  ]]></script>
-
-  <box id="foo" testattr="original"/>
-
-</window>
-
--- a/layout/reftests/xul-document-load/readme.txt
+++ b/layout/reftests/xul-document-load/readme.txt
@@ -1,63 +1,27 @@
 This directory contains various XUL document (mozilla/dom/xul/document) testcases for reftest.
 
-test001: Checks that stylesheets referenced from an overlay via an
-         xml-stylesheet PI are applied to the master document appropriately.
-
-test002: Same as #1, but there's additional overlay between the master doc and
-         the overlay with the stylesheet.
-
 test003: Checks that dynamically removing the stylesheet PI from an inline
          script has expected effect.
 
 test004: Same as test003, but removing the stylesheet PI happens from a "load"
          event handler.
 
 test005: Same as test003, but removing the stylesheet PI happens from a top-level
          script in an external JS file.
 
 test006: Simple <?xml-stylesheet ?> instruction in the prolog has an effect and exists
          in the DOM.
 
-test007: Same as #006 for xul-overlay PI.
-
 test008: Handle stylesheet PIs pointing to nonexistent resources gracefully.
 
-test009: Same as #008 for xul-overlay PIs
-
 test010: PIs in the master document, outside the prolog, don't have any effect but get
          added to the DOM.
 
-test011: (bug 363406) Relative URIs in overlay's <?xml-stylesheet ?> PI are
-         resolved against overlay's URI, not the document URI.
-
 test012: Tests that sheets references from <?xml-stylesheet ?> PIs are added to the
          document in the same order as the PIs themselves are in - the simple case.
 
 test013: Tests the same thing as #012, but for the case when the first sheet contains
          an @import statement, which makes it -finish- loading earlier than the
          second sheet.
 
-test014: (bug 363406) Relative URIs in overlay's <?xul-overlay ?> PI are resolved
-         against overlay's URI, not the document URI.
-
-test015: Relative URIs in overlay's <xul:script> are resolved against overlay's 
-         URI, not the document URI.
-
-test016: Non-XUL elements work in overlays.
-
-test017: (bug 359959) <?xul-overlay ?> used as a direct child of <overlay>
-         should be inserted into the DOM, but not cause the overlay to be
-         applied.
-
-test018: <?xul-overlay ?> used deep inside another overlay (i.e. as a child of
-         a 'hookup' node) should be inserted into the DOM, but not cause the
-         overlay to be applied.
-
-test019: Same as #017 for <?xml-stylesheet ?>
-
-test020: Same as #018 for <?xml-stylesheet ?>
-
-test021: (bug 363419) Non-XUL elements directly underneath <overlay> should
-         be merged correctly into the base document.
-
 test022: (bug 369828) <html:style> works in XUL documents
--- a/layout/reftests/xul-document-load/reftest.list
+++ b/layout/reftests/xul-document-load/reftest.list
@@ -1,23 +1,9 @@
-== test001.xul reference-green-window.xul
-== test002.xul reference-green-window.xul
 == test003.xul reference-green-window.xul
 == test004.xul reference-green-window.xul
 == test005.xul reference-green-window.xul
 == test006.xul reference-green-window.xul
-== test007.xul reference-green-window.xul
 == test008.xul reference-green-window.xul
-== test009.xul reference-green-window.xul
 == test010.xul reference-green-window.xul
-== test011.xul reference-green-window.xul
 == test012.xul reference-green-window.xul
 == test013.xul reference-green-window.xul
-== test014.xul reference-green-window.xul
-# Disabled due to compartments for now.
-#== test015.xul reference-green-window.xul
-== test016.xul reference-green-window.xul
-== test017.xul reference-green-window.xul
-== test018.xul reference-green-window.xul
-== test019.xul reference-green-window.xul
-== test020.xul reference-green-window.xul
-== test021.xul reference-green-window.xul
 == test022.xul reference-green-window.xul
deleted file mode 100644
--- a/layout/reftests/xul-document-load/subdir/test011-overlay.xul
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Any copyright is dedicated to the Public Domain.
-http://creativecommons.org/licenses/publicdomain/
--->
-<?xml-stylesheet href="test011.css" type="text/css"?>
-
-<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"/>
deleted file mode 100644
--- a/layout/reftests/xul-document-load/subdir/test011.css
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/licenses/publicdomain/  */
-
-window { 
-  background-color: green !important;
-}
deleted file mode 100644
--- a/layout/reftests/xul-document-load/subdir/test014-overlay-2.xul
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Any copyright is dedicated to the Public Domain.
-http://creativecommons.org/licenses/publicdomain/
--->
-<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <window id="main" style="background-color: green"/>
-</overlay>
deleted file mode 100644
--- a/layout/reftests/xul-document-load/subdir/test014-overlay.xul
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Any copyright is dedicated to the Public Domain.
-http://creativecommons.org/licenses/publicdomain/
--->
-<?xul-overlay href="test014-overlay-2.xul"?>
- 
-<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"/>
deleted file mode 100644
--- a/layout/reftests/xul-document-load/subdir/test015-overlay.xul
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Any copyright is dedicated to the Public Domain.
-http://creativecommons.org/licenses/publicdomain/
--->
-<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script src="test015.js"/>
-</overlay>
deleted file mode 100644
--- a/layout/reftests/xul-document-load/subdir/test015.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/licenses/publicdomain/  */
-
-function onLoad() {
-  document.documentElement.style.backgroundColor = "green";
-}
-
-addEventListener("load", onLoad, false);
deleted file mode 100644
--- a/layout/reftests/xul-document-load/test001-overlay.xul
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Any copyright is dedicated to the Public Domain.
-http://creativecommons.org/licenses/publicdomain/
--->
-<?xml-stylesheet href="test001.css" type="text/css"?>
-<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"/>
deleted file mode 100644
--- a/layout/reftests/xul-document-load/test001.css
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/licenses/publicdomain/  */
-
-window { 
-  background-color: green !important;
-}
deleted file mode 100644
--- a/layout/reftests/xul-document-load/test001.xul
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Any copyright is dedicated to the Public Domain.
-http://creativecommons.org/licenses/publicdomain/
--->
-<?xul-overlay href="test001-overlay.xul" ?>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        style="background-color: red"/>
deleted file mode 100644
--- a/layout/reftests/xul-document-load/test002-overlay-1.xul
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Any copyright is dedicated to the Public Domain.
-http://creativecommons.org/licenses/publicdomain/
--->
-<?xul-overlay href="test002-overlay-2.xul"?>
-<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"/>
deleted file mode 100644
--- a/layout/reftests/xul-document-load/test002-overlay-2.xul
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Any copyright is dedicated to the Public Domain.
-http://creativecommons.org/licenses/publicdomain/
--->
-<?xml-stylesheet href="test002.css" type="text/css"?>
-<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"/>
deleted file mode 100644
--- a/layout/reftests/xul-document-load/test002.css
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/licenses/publicdomain/  */
-
-window { 
-  background-color: green !important;
-}
deleted file mode 100644
--- a/layout/reftests/xul-document-load/test002.xul
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Any copyright is dedicated to the Public Domain.
-http://creativecommons.org/licenses/publicdomain/
--->
-<?xul-overlay href="test002-overlay-1.xul" ?>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        style="background-color: red"/>
deleted file mode 100644
--- a/layout/reftests/xul-document-load/test007-overlay.xul
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Any copyright is dedicated to the Public Domain.
-http://creativecommons.org/licenses/publicdomain/
--->
-<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <window id="main" style="background-color: green"/>
-</overlay>
deleted file mode 100644
--- a/layout/reftests/xul-document-load/test007.xul
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Any copyright is dedicated to the Public Domain.
-http://creativecommons.org/licenses/publicdomain/
--->
-<?xul-overlay href="test007-overlay.xul"?>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        id="main"
-        style="background-color: red"
-        onload="checkDOM('xul-overlay', 'href=&quot;test007-overlay.xul&quot;');">
-  <script src="test006-007.js"/>
-</window>
\ No newline at end of file
deleted file mode 100644
--- a/layout/reftests/xul-document-load/test009.xul
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Any copyright is dedicated to the Public Domain.
-http://creativecommons.org/licenses/publicdomain/
--->
-<?xul-overlay href="not-existing.css"?>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        style="background-color: green">
-</window>
deleted file mode 100644
--- a/layout/reftests/xul-document-load/test010-overlay.xul
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Any copyright is dedicated to the Public Domain.
-http://creativecommons.org/licenses/publicdomain/
--->
-<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <window id="main" style="background-color: red !important"/>
-</overlay>
--- a/layout/reftests/xul-document-load/test010.xul
+++ b/layout/reftests/xul-document-load/test010.xul
@@ -2,29 +2,27 @@
 <!--
 Any copyright is dedicated to the Public Domain.
 http://creativecommons.org/licenses/publicdomain/
 -->
 <window id="main"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         style="background-color: green">
   <?xml-stylesheet href="test010.css" type="text/css"?>
-  <?xul-overlay href="test010-overlay.xul" ?>
   <script>
   function assert(x, msg) {
     if(!x) {
       dump("assertion failed! " + msg + "\n");
       document.getElementById("main").style.backgroundColor = "red";
     }
   }
   
   try {
     assert(document.firstChild.id == "main", "nothing in prolog");
     var winEl = document.documentElement;
     assert(winEl.childNodes[0].nodeName == "xml-stylesheet", "xml-stylesheet PI is in the correct place");
-    assert(winEl.childNodes[1].nodeName == "xul-overlay", "xul-overlay PI is in the correct place");
   } catch(e) {
     dump(e);
     assert(false, e);
     throw e;
   }
   </script>
 </window>
\ No newline at end of file
deleted file mode 100644
--- a/layout/reftests/xul-document-load/test011.xul
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Any copyright is dedicated to the Public Domain.
-http://creativecommons.org/licenses/publicdomain/
--->
-<?xul-overlay href="subdir/test011-overlay.xul"?> 
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        style="background-color: red;"/>
deleted file mode 100644
--- a/layout/reftests/xul-document-load/test014.xul
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Any copyright is dedicated to the Public Domain.
-http://creativecommons.org/licenses/publicdomain/
--->
-<?xul-overlay href="subdir/test014-overlay.xul"?> 
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        id="main"
-        style="background-color: red;"/>
deleted file mode 100644
--- a/layout/reftests/xul-document-load/test015.xul
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Any copyright is dedicated to the Public Domain.
-http://creativecommons.org/licenses/publicdomain/
--->
-<?xul-overlay href="subdir/test015-overlay.xul"?> 
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        id="main"
-        style="background-color: red;"/>
deleted file mode 100644
--- a/layout/reftests/xul-document-load/test016-overlay.xul
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Any copyright is dedicated to the Public Domain.
-http://creativecommons.org/licenses/publicdomain/
--->
-<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-<window id="main">
-  <style xmlns="http://www.w3.org/1999/xhtml">
-    window {
-      background-color: green !important;
-    }
-  </style>
-</window>
-</overlay>
deleted file mode 100644
--- a/layout/reftests/xul-document-load/test016.xul
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Any copyright is dedicated to the Public Domain.
-http://creativecommons.org/licenses/publicdomain/
--->
-<?xul-overlay href="test016-overlay.xul"?> 
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        id="main"
-        style="background-color: red;"/>
deleted file mode 100644
--- a/layout/reftests/xul-document-load/test017-020.js
+++ /dev/null
@@ -1,13 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/licenses/publicdomain/  */
-
-// check that the second node under the document element is a PI with the
-// specified .target and .data
-function checkDOM(target, data) {
-  // assume there are no whitespace nodes in XUL
-  var piNode = document.documentElement.childNodes[1];
-  if (!piNode || piNode.nodeType != Node.PROCESSING_INSTRUCTION_NODE ||
-      piNode.target != target || piNode.data != data) {
-    document.documentElement.style.backgroundColor = "red";
-  }
-}
deleted file mode 100644
--- a/layout/reftests/xul-document-load/test017-overlay-2.xul
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Any copyright is dedicated to the Public Domain.
-http://creativecommons.org/licenses/publicdomain/
--->
-<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-          id="main"
-          style="background-color: red"/> 
-</overlay>
deleted file mode 100644
--- a/layout/reftests/xul-document-load/test017-overlay.xul
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Any copyright is dedicated to the Public Domain.
-http://creativecommons.org/licenses/publicdomain/
--->
-<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <?xul-overlay href="test017-overlay-2.xul"?>
-</overlay>
deleted file mode 100644
--- a/layout/reftests/xul-document-load/test017.xul
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Any copyright is dedicated to the Public Domain.
-http://creativecommons.org/licenses/publicdomain/
--->
-<?xul-overlay href="test017-overlay.xul" ?>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        id="main"
-        style="background-color: green"
-        onload="checkDOM('xul-overlay', 'href=&quot;test017-overlay-2.xul&quot;');">
-  <script src="test017-020.js"/>
-</window>
deleted file mode 100644
--- a/layout/reftests/xul-document-load/test018-overlay-2.xul
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Any copyright is dedicated to the Public Domain.
-http://creativecommons.org/licenses/publicdomain/
--->
-<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-          id="main"
-          style="background-color: red"/> 
-</overlay>
deleted file mode 100644
--- a/layout/reftests/xul-document-load/test018-overlay.xul
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Any copyright is dedicated to the Public Domain.
-http://creativecommons.org/licenses/publicdomain/
--->
-<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <window id="main">
-    <?xul-overlay href="test018-overlay-2.xul"?>
-  </window>
-</overlay>
\ No newline at end of file
deleted file mode 100644
--- a/layout/reftests/xul-document-load/test018.xul
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Any copyright is dedicated to the Public Domain.
-http://creativecommons.org/licenses/publicdomain/
--->
-<?xul-overlay href="test018-overlay.xul" ?>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        id="main"
-        style="background-color: green"
-        onload="checkDOM('xul-overlay', 'href=&quot;test018-overlay-2.xul&quot;');">
-  <script src="test017-020.js"/>
-</window>
\ No newline at end of file
deleted file mode 100644
--- a/layout/reftests/xul-document-load/test019-overlay.xul
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Any copyright is dedicated to the Public Domain.
-http://creativecommons.org/licenses/publicdomain/
--->
-<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <?xml-stylesheet href="test019.css" type="text/css"?>
-</overlay>
deleted file mode 100644
--- a/layout/reftests/xul-document-load/test019.css
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/licenses/publicdomain/  */
-
-window { 
-  background-color: red !important;
-}
deleted file mode 100644
--- a/layout/reftests/xul-document-load/test019.xul
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Any copyright is dedicated to the Public Domain.
-http://creativecommons.org/licenses/publicdomain/
--->
-<?xul-overlay href="test019-overlay.xul" ?>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        id="main"
-        style="background-color: green"
-        onload="checkDOM('xml-stylesheet', 'href=&quot;test019.css&quot; type=&quot;text/css&quot;');">
-  <script src="test017-020.js"/>
-</window>
deleted file mode 100644
--- a/layout/reftests/xul-document-load/test020-overlay.xul
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Any copyright is dedicated to the Public Domain.
-http://creativecommons.org/licenses/publicdomain/
--->
-<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <window id="main">
-    <?xml-stylesheet href="test020.css" type="text/css"?>
-  </window>
-</overlay>
deleted file mode 100644
--- a/layout/reftests/xul-document-load/test020.css
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/licenses/publicdomain/  */
-
-window { 
-  background-color: red !important;
-}
deleted file mode 100644
--- a/layout/reftests/xul-document-load/test020.xul
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Any copyright is dedicated to the Public Domain.
-http://creativecommons.org/licenses/publicdomain/
--->
-<?xul-overlay href="test020-overlay.xul" ?>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        id="main"
-        style="background-color: green"
-        onload="checkDOM('xml-stylesheet', 'href=&quot;test020.css&quot; type=&quot;text/css&quot;');">
-  <script src="test017-020.js"/>
-</window>
deleted file mode 100644
--- a/layout/reftests/xul-document-load/test021-overlay.xul
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Any copyright is dedicated to the Public Domain.
-http://creativecommons.org/licenses/publicdomain/
--->
-<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <style xmlns="http://www.w3.org/1999/xhtml">
-    window {
-      background-color: green !important;
-    }
-  </style>
-</overlay>
deleted file mode 100644
--- a/layout/reftests/xul-document-load/test021.xul
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Any copyright is dedicated to the Public Domain.
-http://creativecommons.org/licenses/publicdomain/
--->
-<?xul-overlay href="test021-overlay.xul"?> 
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        id="main"
-        style="background-color: red;"/>
deleted file mode 100644
--- a/layout/xul/tree/crashtests/509602-1-overlay.xul
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-<box id="b">
-<box onDOMAttrModified="event.target.parentNode.removeChild(event.target)" id="d"/>
-<tree/>
-</box>
-
-<tree>
-<box  id="b" observes="d"/>
-<treechildren observes="b"/>
-</tree>
-</overlay>
\ No newline at end of file
deleted file mode 100644
--- a/layout/xul/tree/crashtests/509602-1.xul
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xul-overlay href="509602-1-overlay.xul"?>
-<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"/>
\ No newline at end of file
--- a/layout/xul/tree/crashtests/crashtests.list
+++ b/layout/xul/tree/crashtests/crashtests.list
@@ -10,14 +10,13 @@ load 393665-1.xul
 load 399227-1.xul
 load 399227-2.xul
 load 399692-1.xhtml
 load 399715-1.xhtml
 load 409807-1.xul
 load 414170-1.xul
 load 430394-1.xul
 load 479931-1.xhtml
-load 509602-1.xul
 load 585815.html
 load 601427.html
 load 730441-1.xul
 load 730441-2.xul
 load 730441-3.xul