From 1ed92648d194edd60f95cabbba29fc5c778858d2 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Fri, 8 Jul 2016 00:37:55 -0400 Subject: [PATCH] Bug 1257037 part 15. Get rid of the wantsXrays configuration annotation. Just set bindings to want Xrays if they're exposed in Window. r=khuey --- dom/bindings/Bindings.conf | 4 ---- dom/bindings/Configuration.py | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/dom/bindings/Bindings.conf b/dom/bindings/Bindings.conf index ad0ff029fbb3..9a13c0fa18b4 100644 --- a/dom/bindings/Bindings.conf +++ b/dom/bindings/Bindings.conf @@ -37,10 +37,6 @@ # XPConnect wrapping. Always false for callback interfaces. # Defaults to true for non-callback descriptors. # -# A descriptor can have 'wantsXrays': False specified if it -# should not have Xray hooks generated. Make sure to have someone -# familiar with Xrays review any use of this! -# # The following fields are either a string, an array (defaults to an empty # array) or a dictionary with three possible keys (all, getterOnly and # setterOnly) each having such an array as the value diff --git a/dom/bindings/Configuration.py b/dom/bindings/Configuration.py index 8958c1a30fbe..b82df60963e3 100644 --- a/dom/bindings/Configuration.py +++ b/dom/bindings/Configuration.py @@ -279,7 +279,7 @@ class Descriptor(DescriptorProvider): self.config = config self.interface = interface - self.wantsXrays = desc.get('wantsXrays', True) + self.wantsXrays = interface.isExposedInWindow() # Read the desc, and fill in the relevant defaults. ifaceName = self.interface.identifier.name