mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-25 13:51:41 +00:00
Bug 1379688 part 1. Remove some restrictions on whether an interface that implements QueryInterface can have a non-abstract ancestor. r=smaug
This restriction was put in place back when we automatically added QueryInterface to all rootmost non-abstract interfaces. At the time, we needed to make sure it did NOT end up on EventTarget, because then webidl quickstubs would replace the QI impl 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. MozReview-Commit-ID: 5B13ymdyLp3
This commit is contained in:
parent
486cc0b4e7
commit
3dd8d0e9c1
@ -2381,22 +2381,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({
|
||||
|
Loading…
Reference in New Issue
Block a user