Bug 869195. Make QueryInterface be exposed for both chrome and xbl scopes, not just in chrome. r=bholley,peterv

content/xbl/test/file_bug821850.xhtml

@@ -43,6 +43,12 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=821850
           is(bound.primitiveField, undefined, "Xrays don't show fields");
           is(bound.wrappedJSObject.primitiveField, 2, "Waiving Xrays show fields");
 
+          // Check that here document.QueryInterface works
+          ok("QueryInterface" in document,
+             "Should have a document.QueryInterface here");
+          is(document.QueryInterface(Components.interfaces.nsIDOMDocument),
+             document, "Should be able to QI the document");
+
           // This gets invoked by an event handler.
           window.finish = function() {
             // Content messed with stuff. Make sure we still see the right thing.
@@ -103,6 +109,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=821850
   window.contentVal = { foo: 10, rabbit: { hole: { bar: 100, win: window} } };
   ok(true, "Set contentVal");
 
+  // Check that we're not exposing QueryInterface to non-XBL code
+  ok(!("QueryInterface" in document),
+     "Should not have a document.QueryInterface here");
+
   function go() {
     "use strict";
 

dom/bindings/Codegen.py

@@ -1460,14 +1460,28 @@ class MethodDefiner(PropertyDefiner):
                                  "flags": "JSPROP_ENUMERATE",
                                  "condition": MemberCondition(None, None) })
 
-        if (not descriptor.interface.parent and not static and
+        # Make sure to not stick QueryInterface on abstract interfaces that
+        # have hasXPConnectImpls (like EventTarget).  So only put it on
+        # interfaces that are concrete and all of whose ancestors are abstract.
+        def allAncestorsAbstract(iface):
+            if not iface.parent:
+                return True
+            desc = descriptor.getDescriptor(iface.parent.identifier.name)
+            if desc.concrete:
+                return False
+            return allAncestorsAbstract(iface.parent)
+        if (not static and
             descriptor.nativeOwnership == 'nsisupports' and
-            descriptor.interface.hasInterfacePrototypeObject()):
-            self.chrome.append({"name": 'QueryInterface',
-                                "methodInfo": False,
-                                "length": 1,
-                                "flags": "0",
-                                "condition": MemberCondition(None, None) })
+            descriptor.interface.hasInterfacePrototypeObject() and
+            descriptor.concrete and
+            allAncestorsAbstract(descriptor.interface)):
+            self.regular.append({"name": 'QueryInterface',
+                                 "methodInfo": False,
+                                 "length": 1,
+                                 "flags": "0",
+                                 "condition":
+                                     MemberCondition(None,
+                                                     "nsINode::IsChromeOrXBL") })
 
         if not static:
             stringifier = descriptor.operations['Stringifier']