Skip to content
Permalink
Browse files

Add support for attributes to the inCompartments binding parameter

  • Loading branch information...
Eijebong committed May 25, 2019
1 parent 7dbff6e commit 0b29caa5548b0e307f2a891f5082b940c10d5762
@@ -48,6 +48,10 @@ DOMInterfaces = {

'WorkerGlobalScope': {
'inCompartments': ['Fetch'],
}
},

'TestBinding': {
'inCompartments': ['PromiseAttribute'],
},

}
@@ -5627,13 +5627,16 @@ class CGInterfaceTrait(CGThing):
def __init__(self, descriptor):
CGThing.__init__(self)

def attribute_arguments(needCx, argument=None):
def attribute_arguments(needCx, argument=None, inCompartment=False):
if needCx:
yield "cx", "*mut JSContext"

if argument:
yield "value", argument_type(descriptor, argument)

if inCompartment:
yield "_comp", "InCompartment"

def members():
for m in descriptor.interface.members:
if (m.isMethod() and not m.isStatic() and
@@ -5649,7 +5652,7 @@ def members():
name = CGSpecializedGetter.makeNativeName(descriptor, m)
infallible = 'infallible' in descriptor.getExtendedAttributes(m, getter=True)
yield (name,
attribute_arguments(typeNeedsCx(m.type, True)),
attribute_arguments(typeNeedsCx(m.type, True), inCompartment=name in descriptor.inCompartmentMethods),
return_type(descriptor, m.type, infallible))

if not m.readonly:
@@ -5659,7 +5662,7 @@ def members():
rettype = "()"
else:
rettype = "ErrorResult"
yield name, attribute_arguments(typeNeedsCx(m.type, False), m.type), rettype
yield name, attribute_arguments(typeNeedsCx(m.type, False), m.type, inCompartment=name in descriptor.inCompartmentMethods), rettype

if descriptor.proxy:
for name, operation in descriptor.operations.iteritems():
@@ -1048,11 +1048,10 @@ impl TestBindingMethods for TestBinding {
}
}

fn PromiseAttribute(&self) -> Rc<Promise> {
let in_compartment_proof = AlreadyInCompartment::assert(&self.global());
fn PromiseAttribute(&self, comp: InCompartment) -> Rc<Promise> {
Promise::new_in_current_compartment(
&self.global(),
InCompartment::Already(&in_compartment_proof),
comp
)
}

0 comments on commit 0b29caa

Please sign in to comment.
You can’t perform that action at this time.