From d751dbe1a43fb004d45ab7b5a1d407ce795e0835 Mon Sep 17 00:00:00 2001 From: Moonchild Date: Mon, 12 Jul 2021 02:54:51 +0000 Subject: [PATCH] Issue #1792 - Part 1: Remove superfluous check for abstract ancestors. This removes some restrictions on whether an interface that implements QueryInterface can have a non-abstract ancestor. This restriction was put in place back when we automatically added QueryInterface to all rootmost non-abstract interfaces (~Pale Moon 24). At the time, we needed to make sure it did NOT end up on EventTarget, because back then WebIDL quickstubs would replace the QI implementation on non-WebIDL EventTargets with the WebIDL one, which would not work for them. Since then, we have removed WebIDL quickstubs and we now explicitly list which interfaces get QueryInterface, so this check is no longer needed. --- dom/bindings/Codegen.py | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/dom/bindings/Codegen.py b/dom/bindings/Codegen.py index c9a5e9f419..42ce94fcb4 100644 --- a/dom/bindings/Codegen.py +++ b/dom/bindings/Codegen.py @@ -2321,22 +2321,11 @@ class MethodDefiner(PropertyDefiner): if len(signatures) > 1 or len(signatures[0][1]) > 1 or not argTypeIsIID(signatures[0][1][0]): raise TypeError("There should be only one queryInterface method with 1 argument of type IID") - # 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 = self.descriptor.getDescriptor(iface.parent.identifier.name) - if desc.concrete: - return False - return allAncestorsAbstract(iface.parent) + # Make sure to not stick QueryInterface on abstract interfaces. if (not self.descriptor.interface.hasInterfacePrototypeObject() or - not self.descriptor.concrete or - not allAncestorsAbstract(self.descriptor.interface)): + not self.descriptor.concrete): raise TypeError("QueryInterface is only supported on " - "interfaces that are concrete and all " - "of whose ancestors are abstract: " + + "interfaces that are concrete: " + self.descriptor.name) condition = "WantsQueryInterface<%s>::Enabled" % descriptor.nativeType self.regular.append({