From 6374fba0f355985bb090e12468753b3c07bd9a82 Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Sat, 12 Jul 2014 21:34:27 +0200
Subject: [PATCH 1/2] Add a test for interfaces exposed on the window object.

---
 src/test/content/test_interfaces.html | 198 ++++++++++++++++++++++++++
 1 file changed, 198 insertions(+)
 create mode 100644 src/test/content/test_interfaces.html
diff --git a/src/test/content/test_interfaces.html b/src/test/content/test_interfaces.html
new file mode 100644
index 00000000000..5b1460a7c35
--- /dev/null
+++ b/src/test/content/test_interfaces.html
@@ -0,0 +1,198 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<title>Interfaces exposed on the window</title>
+<script src="harness.js"></script>
+<script>
+// This is a list of all interfaces that are exposed to every webpage.
+// Please only add things to this list with great care and proper review
+// from the associated module peers.
+
+// IMPORTANT: Do not change this list without review from
+//            a JavaScript Engine peer!
+var ecmaGlobals = [
+  "Array",
+  "ArrayBuffer",
+  "Boolean",
+  "DataView",
+  "Date",
+  "Error",
+  "EvalError",
+  "Float32Array",
+  "Float64Array",
+  "Function",
+  "Infinity",
+  "Int16Array",
+  "Int32Array",
+  "Int8Array",
+  "InternalError",
+  "Iterator",
+  "JSON",
+  "Map",
+  "Math",
+  "NaN",
+  "Number",
+  "Object",
+  "Proxy",
+  "RangeError",
+  "ReferenceError",
+  "RegExp",
+  "Set",
+  "StopIteration",
+  "String",
+  "SyntaxError",
+  "TypeError",
+  "Uint16Array",
+  "Uint32Array",
+  "Uint8Array",
+  "Uint8ClampedArray",
+  "URIError",
+  "WeakMap",
+];
+
+// IMPORTANT: Do not change the list below without review from a DOM peer!
+var interfaceNamesInGlobalScope = [
+  "Attr",
+  "Blob",
+  "CharacterData",
+  "ClientRect", // #2814
+  "ClientRectList", // #2814
+  "Comment",
+  "Console",
+  "CustomEvent",
+  "Document",
+  "DocumentFragment",
+  "DocumentType",
+  "DOMException",
+  "DOMImplementation",
+  "DOMParser",
+  "DOMTokenList",
+  "Element",
+  "Event",
+  "EventTarget",
+  "File",
+  "FormData",
+  "HTMLAnchorElement",
+  "HTMLAppletElement",
+  "HTMLAreaElement",
+  "HTMLAudioElement",
+  "HTMLBaseElement",
+  "HTMLBodyElement",
+  "HTMLBRElement",
+  "HTMLButtonElement",
+  "HTMLCanvasElement",
+  "HTMLCollection",
+  "HTMLDataElement",
+  "HTMLDataListElement",
+  "HTMLDirectoryElement",
+  "HTMLDivElement",
+  "HTMLDListElement",
+  "HTMLElement",
+  "HTMLEmbedElement",
+  "HTMLFieldSetElement",
+  "HTMLFontElement",
+  "HTMLFormElement",
+  "HTMLFrameElement",
+  "HTMLFrameSetElement",
+  "HTMLHeadElement",
+  "HTMLHeadingElement",
+  "HTMLHRElement",
+  "HTMLHtmlElement",
+  "HTMLIFrameElement",
+  "HTMLImageElement",
+  "HTMLInputElement",
+  "HTMLLabelElement",
+  "HTMLLegendElement",
+  "HTMLLIElement",
+  "HTMLLinkElement",
+  "HTMLMapElement",
+  "HTMLMediaElement",
+  "HTMLMetaElement",
+  "HTMLMeterElement",
+  "HTMLModElement",
+  "HTMLObjectElement",
+  "HTMLOListElement",
+  "HTMLOptGroupElement",
+  "HTMLOptionElement",
+  "HTMLOutputElement",
+  "HTMLParagraphElement",
+  "HTMLParamElement",
+  "HTMLPreElement",
+  "HTMLProgressElement",
+  "HTMLQuoteElement",
+  "HTMLScriptElement",
+  "HTMLSelectElement",
+  "HTMLSourceElement",
+  "HTMLSpanElement",
+  "HTMLStyleElement",
+  "HTMLTableCaptionElement",
+  "HTMLTableCellElement",
+  "HTMLTableColElement",
+  "HTMLTableDataCellElement",
+  "HTMLTableElement",
+  "HTMLTableHeaderCellElement",
+  "HTMLTableRowElement",
+  "HTMLTableSectionElement",
+  "HTMLTemplateElement",
+  "HTMLTextAreaElement",
+  "HTMLTimeElement",
+  "HTMLTitleElement",
+  "HTMLTrackElement",
+  "HTMLUListElement",
+  "HTMLUnknownElement",
+  "HTMLVideoElement",
+  "Location",
+  "MouseEvent",
+  "Navigator",
+  "Node",
+  "NodeList",
+  "Performance",
+  "PerformanceTiming",
+  "ProcessingInstruction",
+  "ProgressEvent",
+  "TestBinding", // XXX
+  "Text",
+  "UIEvent",
+  "URLSearchParams",
+  "ValidityState",
+  "Window",
+  "XMLHttpRequest",
+  "XMLHttpRequestEventTarget", // XXX
+  "XMLHttpRequestUpload",
+];
+
+function createInterfaceMap() {
+  var interfaceMap = {};
+
+  function addInterfaces(interfaces)
+  {
+    for (var entry of interfaces) {
+      interfaceMap[entry] = true;
+    }
+  }
+
+  addInterfaces(ecmaGlobals);
+  addInterfaces(interfaceNamesInGlobalScope);
+  return interfaceMap;
+}
+
+var interfaceMap = createInterfaceMap();
+for (var name of Object.getOwnPropertyNames(window)) {
+  if (!/^[A-Z]/.test(name)) {
+    continue;
+  }
+  is_in(name, interfaceMap,
+        "If this is failing: DANGER, are you sure you want to expose the new " +
+        "interface " + name + " to all webpages as a property on the window? " +
+        "Do not make a change to this file without review from jdm or Ms2ger " +
+        "for that specific change!");
+  if (name in interfaceMap) {
+    delete interfaceMap[name];
+  }
+}
+for (var name of Object.keys(interfaceMap)) {
+  is_in(name, window, name + " should be defined on the global scope");
+}
+is(Object.keys(interfaceMap).length, 0,
+   "The following interface(s) are not enumerated: " + Object.keys(interfaceMap).join(", "));
+finish();
+</script>

From c5bb7219e2adcb39f8e468008d67ebc539ae7303 Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Sat, 12 Jul 2014 21:37:53 +0200
Subject: [PATCH 2/2] Stop exposing XMLHttpRequestEventTarget on the window
 object.

---
 .../script/dom/webidls/XMLHttpRequestEventTarget.webidl       | 4 ++--
 src/test/content/test_interfaces.html                         | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/components/script/dom/webidls/XMLHttpRequestEventTarget.webidl b/src/components/script/dom/webidls/XMLHttpRequestEventTarget.webidl
index 0a7d044f121..0d772edca0b 100644
--- a/src/components/script/dom/webidls/XMLHttpRequestEventTarget.webidl
+++ b/src/components/script/dom/webidls/XMLHttpRequestEventTarget.webidl
@@ -13,7 +13,7 @@
  * http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0.
  */
 
-/* https://github.com/mozilla/servo/issues/1223:  [NoInterfaceObject] */
+[NoInterfaceObject]
 interface XMLHttpRequestEventTarget : EventTarget {
   // event handlers
   attribute EventHandler onloadstart;
@@ -23,4 +23,4 @@ interface XMLHttpRequestEventTarget : EventTarget {
   attribute EventHandler onload;
   attribute EventHandler ontimeout;
   attribute EventHandler onloadend;
-};
\ No newline at end of file
+};
diff --git a/src/test/content/test_interfaces.html b/src/test/content/test_interfaces.html
index 5b1460a7c35..5d851b39092 100644
--- a/src/test/content/test_interfaces.html
+++ b/src/test/content/test_interfaces.html
@@ -156,7 +156,6 @@ var interfaceNamesInGlobalScope = [
   "ValidityState",
   "Window",
   "XMLHttpRequest",
-  "XMLHttpRequestEventTarget", // XXX
   "XMLHttpRequestUpload",
 ];
 
