Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 13:10:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

Enter a compartment when calling callbacks.

Browse source
This commit is contained in:
Ms2ger 2014-05-06 12:16:03 +02:00
parent 3a5fc11bb8
commit 8ea3cbf18a
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/components/script/dom/bindings/codegen/CodegenRust.py
View file

@ -4859,14 +4859,21 @@ class CallbackMember(CGNativeMember):
# Avoid weird 0-sized arrays # Avoid weird 0-sized arrays
replacements["argvDecl"] = "" replacements["argvDecl"] = ""
return string.Template( # Newlines and semicolons are in the values
# Newlines and semicolons are in the values pre = string.Template(
"${setupCall}" "${setupCall}"
"${declRval}" "${declRval}"
"${argvDecl}" "${argvDecl}").substitute(replacements)
body = string.Template(
"${convertArgs}" "${convertArgs}"
"${doCall}" "${doCall}"
"${returnResult}").substitute(replacements) "${returnResult}").substitute(replacements)
return CGList([
CGGeneric(pre),
CGWrapper(CGIndenter(CGGeneric(body)),
pre="with_compartment(cx, self.parent.callback, || {\n",
post="})")
], "\n").define()
def getResultConversion(self): def getResultConversion(self):
replacements = { replacements = {
@ -4889,7 +4896,7 @@ class CallbackMember(CGNativeMember):
assignRetval = string.Template( assignRetval = string.Template(
self.getRetvalInfo(self.retvalType, self.getRetvalInfo(self.retvalType,
False)[2]).substitute(replacements) False)[2]).substitute(replacements)
return convertType.define() + "\n" + assignRetval return convertType.define() + "\n" + assignRetval + "\n"
def getArgConversions(self): def getArgConversions(self):
# Just reget the arglist from self.originalSig, because our superclasses # Just reget the arglist from self.originalSig, because our superclasses