Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-10 05:47:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 884362 - Play Maybe<> games to root |temp| in the right circumstances. r=bz

Browse Source
This commit is contained in:
Bobby Holley 2013-06-20 11:05:33 -07:00
parent 5c6400b122
commit 7022fc3902
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dom/bindings/Codegen.py
View File

@ -7789,8 +7789,12 @@ class CGDictionary(CGThing):
for m in self.memberInfo]
if memberInits:
body += (
"JS::Rooted<JS::Value> temp(cx);\n"
"bool isNull = val.isNullOrUndefined();\n")
"bool isNull = val.isNullOrUndefined();\n"
"// We only need |temp| if !isNull, in which case we have |cx|.\n"
"Maybe<JS::Rooted<JS::Value> > temp;\n"
"if (!isNull) {\n"
" temp.construct(cx);\n"
"}\n")
body += "\n\n".join(memberInits) + "\n"
body += "return true;"
@ -7959,8 +7963,8 @@ class CGDictionary(CGThing):
def getMemberConversion(self, memberInfo):
(member, conversionInfo) = memberInfo
replacements = { "val": "temp",
"mutableVal": "&temp",
replacements = { "val": "temp.ref()",
"mutableVal": "&temp.ref()",
"declName": self.makeMemberName(member.identifier.name),
# We need a holder name for external interfaces, but
# it's scoped down to the conversion so we can just use
@ -7971,16 +7975,16 @@ class CGDictionary(CGThing):
if conversionInfo.dealWithOptional:
replacements["declName"] = "(" + replacements["declName"] + ".Value())"
if member.defaultValue:
replacements["haveValue"] = "!temp.isUndefined()"
replacements["haveValue"] = "!isNull && !temp.ref().isUndefined()"
# NOTE: jsids are per-runtime, so don't use them in workers
if self.workers:
propName = member.identifier.name
propGet = ('JS_GetProperty(cx, &val.toObject(), "%s", temp.address())' %
propGet = ('JS_GetProperty(cx, &val.toObject(), "%s", temp.ref().address())' %
propName)
else:
propId = self.makeIdName(member.identifier.name);
propGet = ("JS_GetPropertyById(cx, &val.toObject(), %s, temp.address())" %
propGet = ("JS_GetPropertyById(cx, &val.toObject(), %s, temp.ref().address())" %
propId)
conversionReplacements = {
@ -7988,9 +7992,7 @@ class CGDictionary(CGThing):
"convert": string.Template(conversionInfo.template).substitute(replacements),
"propGet": propGet
}
conversion = ("if (isNull) {\n"
" temp.setUndefined();\n"
"} else if (!${propGet}) {\n"
conversion = ("if (!isNull && !${propGet}) {\n"
" return false;\n"
"}\n")
if member.defaultValue:
@ -7998,7 +8000,7 @@ class CGDictionary(CGThing):
"${convert}")
else:
conversion += (
"if (!temp.isUndefined()) {\n"
"if (!isNull && !temp.ref().isUndefined()) {\n"
" ${prop}.Construct();\n"
"${convert}\n"
"}")