Backed out 6 changesets (bug 1489301) for Linting opt failure at /builds/worker/checkouts/gecko/dom/bindings/parser/WebIDL.py

Backed out changeset 1c0823540b44 (bug 1489301)
Backed out changeset 529524df76a6 (bug 1489301)
Backed out changeset f34bc8a40bec (bug 1489301)
Backed out changeset 168cf9cea716 (bug 1489301)
Backed out changeset 19ca10fa3772 (bug 1489301)
Backed out changeset ff8fb091198e (bug 1489301)

Author: dvarga1989

dom/base/nsGlobalWindowInner.cpp

@@ -3095,8 +3095,7 @@ nsGlobalWindowInner::GetOwnPropertyNames(JSContext* aCx, JS::AutoIdVector& aName
 nsGlobalWindowInner::IsPrivilegedChromeWindow(JSContext* aCx, JSObject* aObj)
 {
   // For now, have to deal with XPConnect objects here.
-  nsGlobalWindowInner* win = xpc::WindowOrNull(aObj);
-  return win && win->IsChromeWindow() &&
+  return xpc::WindowOrNull(aObj)->IsChromeWindow() &&
          nsContentUtils::ObjectPrincipal(aObj) == nsContentUtils::GetSystemPrincipal();
 }
 

dom/base/test/chrome/file_bug1139964.xul

@@ -32,7 +32,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1139964
     ppm.removeMessageListener(msgName, processListener);
     ok(m.data.hasPromise, "ProcessGlobal should have Promise object in the global scope!");
     ok(m.data.hasTextEncoder, "ProcessGlobal should have TextEncoder object in the global scope!");
-    ok(m.data.hasWindow, "ProcessGlobal should have Window object in the global scope!");
+    ok(!m.data.hasWindow, "ProcessGlobal should not have Window object in the global scope!");
 
     messageManager.addMessageListener(msgName, tabListener)
     messageManager.loadFrameScript("data:,(" + mmScriptForPromiseTest.toString() + ")()", true);
@@ -42,7 +42,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1139964
     messageManager.removeMessageListener(msgName, tabListener);
     ok(m.data.hasPromise, "TabChildGlobal should have Promise object in the global scope!");
     ok(m.data.hasTextEncoder, "TabChildGlobal should have TextEncoder object in the global scope!");
-    ok(m.data.hasWindow, "TabChildGlobal should have Window object in the global scope!");
+    ok(!m.data.hasWindow, "TabChildGlobal should not have Window object in the global scope!");
 
     opener.setTimeout("done()", 0);
     window.close();

dom/bindings/Codegen.py

@@ -17199,7 +17199,7 @@ def ResolveSystemBinding(config):
         curr = CGList([], "\n")
 
         descriptors = config.getDescriptors(hasInterfaceObject=True,
-                                            isExposedInWindow=True,
+                                            isExposedInSystemGlobals=True,
                                             register=True)
         properties = [desc.name for desc in descriptors]
 
@@ -17244,7 +17244,7 @@ def ResolveSystemBinding(config):
         defineIncludes = [CGHeaders.getDeclarationFilename(desc.interface)
                           for desc in config.getDescriptors(hasInterfaceObject=True,
                                                             register=True,
-                                                            isExposedInWindow=True)]
+                                                            isExposedInSystemGlobals=True)]
         defineIncludes.append("nsThreadUtils.h")  # For NS_IsMainThread
         defineIncludes.append("js/Id.h")  # For jsid
         defineIncludes.append("mozilla/dom/WebIDLGlobalNameHash.h")

dom/bindings/Configuration.py

@@ -250,6 +250,8 @@ def getDescriptors(self, **filters):
                 getter = lambda x: x.interface.isExposedInWorkerDebugger()
             elif key == 'isExposedInAnyWorklet':
                 getter = lambda x: x.interface.isExposedInAnyWorklet()
+            elif key == 'isExposedInSystemGlobals':
+                getter = lambda x: x.interface.isExposedInSystemGlobals()
             elif key == 'isExposedInWindow':
                 getter = lambda x: x.interface.isExposedInWindow()
             else:

dom/bindings/parser/WebIDL.py

@@ -327,13 +327,6 @@ def lookupIdentifier(self, identifier):
         assert identifier.scope == self
         return self._lookupIdentifier(identifier)
 
-    def addIfaceGlobalNames(self, interfaceName, globalNames):
-        """Record the global names (from |globalNames|) that can be used in
-        [Exposed] to expose things in a global named |interfaceName|"""
-        self.globalNames.update(globalNames)
-        for name in globalNames:
-            self.globalNameMapping[name].add(interfaceName)
-
 
 class IDLIdentifier(IDLObject):
     def __init__(self, location, scope, name):
@@ -511,10 +504,8 @@ def isExposedInWindow(self):
         return 'Window' in self.exposureSet
 
     def isExposedOnMainThread(self):
-        return self.isExposedInWindow()
-
-    def isExposedOffMainThread(self):
-        return len(self.exposureSet - {'Window'}) > 0
+        return (self.isExposedInWindow() or
+                self.isExposedInSystemGlobals())
 
     def isExposedInAnyWorker(self):
         return len(self.getWorkerExposureSet()) > 0
@@ -525,6 +516,9 @@ def isExposedInWorkerDebugger(self):
     def isExposedInAnyWorklet(self):
         return len(self.getWorkletExposureSet()) > 0
 
+    def isExposedInSystemGlobals(self):
+        return 'BackstagePass' in self.exposureSet
+
     def isExposedInSomeButNotAllWorkers(self):
         """
         Returns true if the Exposed extended attribute for this interface
@@ -1329,9 +1323,10 @@ def checkDuplicateNames(member, name, attributeName):
                     checkDuplicateNames(member, bindingAlias, "BindingAlias")
 
 
-        if self.getExtendedAttribute("Pref") and self.isExposedOffMainThread():
-            raise WebIDLError("[Pref] used on an interface that is not "
-                              "main-thread-only",
+        if (self.getExtendedAttribute("Pref") and
+            self._exposureGlobalNames != set([self.parentScope.primaryGlobalName])):
+            raise WebIDLError("[Pref] used on an interface that is not %s-only" %
+                              self.parentScope.primaryGlobalName,
                               [self.location])
 
         # Conditional exposure makes no sense for interfaces with no
@@ -1715,8 +1710,9 @@ def addExtendedAttributes(self, attrs):
                     self.globalNames = attr.args()
                 else:
                     self.globalNames = [self.identifier.name]
-                self.parentScope.addIfaceGlobalNames(self.identifier.name,
-                                                     self.globalNames)
+                self.parentScope.globalNames.update(self.globalNames)
+                for globalName in self.globalNames:
+                    self.parentScope.globalNameMapping[globalName].add(self.identifier.name)
                 self._isOnGlobalProtoChain = True
             elif identifier == "PrimaryGlobal":
                 if not attr.noArguments():
@@ -1729,8 +1725,8 @@ def addExtendedAttributes(self, attrs):
                          self.parentScope.primaryGlobalAttr.location])
                 self.parentScope.primaryGlobalAttr = attr
                 self.parentScope.primaryGlobalName = self.identifier.name
-                self.parentScope.addIfaceGlobalNames(self.identifier.name,
-                                                     [self.identifier.name])
+                self.parentScope.globalNames.add(self.identifier.name)
+                self.parentScope.globalNameMapping[self.identifier.name].add(self.identifier.name)
                 self._isOnGlobalProtoChain = True
             elif identifier == "SecureContext":
                 if not attr.noArguments():
@@ -3576,9 +3572,10 @@ def finish(self, scope):
         IDLExposureMixins.finish(self, scope)
 
     def validate(self):
-        if self.getExtendedAttribute("Pref") and self.isExposedOffMainThread():
+        if (self.getExtendedAttribute("Pref") and
+            self.exposureSet != set([self._globalScope.primaryGlobalName])):
             raise WebIDLError("[Pref] used on an interface member that is not "
-                              "main-thread-only",
+                              "%s-only" % self._globalScope.primaryGlobalName,
                               [self.location])
 
         if self.isAttr() or self.isMethod():
@@ -6899,13 +6896,16 @@ def __init__(self, outputdir='', lexer=None):
             logger.reportGrammarErrors()
 
         self._globalScope = IDLScope(BuiltinLocation("<Global Scope>"), None, None)
-
         # To make our test harness work, pretend like we have a primary global already.
         # Note that we _don't_ set _globalScope.primaryGlobalAttr,
         # so we'll still be able to detect multiple PrimaryGlobal extended attributes.
         self._globalScope.primaryGlobalName = "FakeTestPrimaryGlobal"
-        self._globalScope.addIfaceGlobalNames("FakeTestPrimaryGlobal", ["FakeTestPrimaryGlobal"])
-
+        self._globalScope.globalNames.add("FakeTestPrimaryGlobal")
+        self._globalScope.globalNameMapping["FakeTestPrimaryGlobal"].add("FakeTestPrimaryGlobal")
+        # And we add the special-cased "System" global name, which
+        # doesn't have any corresponding interfaces.
+        self._globalScope.globalNames.add("System")
+        self._globalScope.globalNameMapping["System"].add("BackstagePass")
         self._installBuiltins(self._globalScope)
         self._productions = []
 

dom/chrome-webidl/BrowsingContext.webidl

@@ -5,7 +5,7 @@
 
 interface nsIDocShell;
 
-[Exposed=Window, ChromeOnly]
+[Exposed=(Window, System), ChromeOnly]
 interface BrowsingContext {
   readonly attribute BrowsingContext? parent;
 

dom/chrome-webidl/ChannelWrapper.webidl

@@ -41,7 +41,7 @@ enum MozContentPolicyType {
  * A thin wrapper around nsIChannel and nsIHttpChannel that allows JS
  * callers to access them without XPConnect overhead.
  */
-[ChromeOnly, Exposed=Window]
+[ChromeOnly, Exposed=System]
 interface ChannelWrapper : EventTarget {
   /**
    * Returns the wrapper instance for the given channel. The same wrapper is

dom/chrome-webidl/ChromeUtils.webidl

@@ -14,7 +14,7 @@
  * C++ callers use a fast path, and never call the JSAPI or WebIDL methods of
  * this object.
  */
-[ChromeOnly, Exposed=Window]
+[ChromeOnly, Exposed=(Window,System)]
 interface MozQueryInterface {
   [Throws]
   legacycaller any (IID aIID);
@@ -25,7 +25,7 @@ interface MozQueryInterface {
  * This is exposed in all the system globals where we can expose stuff by
  * default, so should only include methods that are **thread-safe**.
  */
-[ChromeOnly, Exposed=(Window,Worker)]
+[ChromeOnly, Exposed=(Window,System,Worker)]
 namespace ChromeUtils {
   /**
    * Serialize a snapshot of the heap graph, as seen by |JS::ubi::Node| and
@@ -148,7 +148,7 @@ namespace ChromeUtils {
  * Additional ChromeUtils methods that are _not_ thread-safe, and hence not
  * exposed in workers.
  */
-[Exposed=Window]
+[Exposed=(Window,System)]
 partial namespace ChromeUtils {
   /**
    * A helper that converts OriginAttributesDictionary to a opaque suffix string.

dom/chrome-webidl/DominatorTree.webidl

@@ -38,7 +38,7 @@ typedef unsigned long long NodeSize;
  *     its retained size is therefore significant (assuming no external
  *     references into the tree).
  */
-[ChromeOnly, Exposed=(Window,Worker)]
+[ChromeOnly, Exposed=(Window,System,Worker)]
 interface DominatorTree {
   /**
    * The `NodeId` for the root of the dominator tree. This is a "meta-root" in

dom/chrome-webidl/HeapSnapshot.webidl

@@ -7,7 +7,7 @@
 /**
  * A HeapSnapshot represents a snapshot of the heap graph
  */
-[ChromeOnly, Exposed=(Window,Worker)]
+[ChromeOnly, Exposed=(Window,System,Worker)]
 interface HeapSnapshot {
   /**
    * A time stamp of when the heap snapshot was taken, if available. Units are