Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 15:25:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 860473 part 1. Root WebIDL dictionary ParseJSON. r=evilpie, smaug

Browse Source
This commit is contained in:
Boris Zbarsky 2013-04-11 14:31:05 -04:00
parent 2dca5a07b2
commit 3987fa669a
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dom/bindings/BindingDeclarations.h
View File

@ -34,9 +34,9 @@ struct MainThreadDictionaryBase
{
protected:
JSContext* ParseJSON(const nsAString& aJSON,
mozilla::Maybe<JSAutoRequest>& aAr,
mozilla::Maybe<JSAutoCompartment>& aAc,
JS::Value& aVal);
Maybe<JSAutoRequest>& aAr,
Maybe<JSAutoCompartment>& aAc,
Maybe< JS::Rooted<JS::Value> >& aVal);
};
struct EnumEntry {

9
dom/bindings/BindingUtils.cpp
View File

@ -1307,21 +1307,22 @@ SetXrayExpandoChain(JSObject* obj, JSObject* chain)
JSContext*
MainThreadDictionaryBase::ParseJSON(const nsAString& aJSON,
mozilla::Maybe<JSAutoRequest>& aAr,
mozilla::Maybe<JSAutoCompartment>& aAc,
JS::Value& aVal)
Maybe<JSAutoRequest>& aAr,
Maybe<JSAutoCompartment>& aAc,
Maybe< JS::Rooted<JS::Value> >& aVal)
{
JSContext* cx = nsContentUtils::ThreadJSContextStack()->GetSafeJSContext();
NS_ENSURE_TRUE(cx, nullptr);
JSObject* global = JS_GetGlobalObject(cx);
aAr.construct(cx);
aAc.construct(cx, global);
aVal.construct(cx, JS::UndefinedValue());
if (aJSON.IsEmpty()) {
return cx;
}
if (!JS_ParseJSON(cx,
static_cast<const jschar*>(PromiseFlatString(aJSON).get()),
aJSON.Length(), &aVal)) {
aJSON.Length(), aVal.ref().address())) {
return nullptr;
}
return cx;

8
dom/bindings/Codegen.py
View File

@ -6817,12 +6817,12 @@ class CGDictionary(CGThing):
"\n" +
(" bool Init(const nsAString& aJSON)\n"
" {\n"
" mozilla::Maybe<JSAutoRequest> ar;\n"
" mozilla::Maybe<JSAutoCompartment> ac;\n"
" jsval json = JSVAL_VOID;\n"
" Maybe<JSAutoRequest> ar;\n"
" Maybe<JSAutoCompartment> ac;\n"
" Maybe< JS::Rooted<JS::Value> > json;\n"
" JSContext* cx = ParseJSON(aJSON, ar, ac, json);\n"
" NS_ENSURE_TRUE(cx, false);\n"
" return Init(cx, nullptr, json);\n"
" return Init(cx, nullptr, json.ref());\n"
" }\n" if not self.workers else "") +
"\n" +
"\n".join(memberDecls) + "\n"