corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 547140, part 2 - Remove flags argument from JS_GetPropertyDescriptor and friends. r=Waldo.

Browse Source
This commit is contained in:
Jason Orendorff
2014-04-25 16:11:01 -05:00
parent 708529b088
commit d3d65bb33a
36 changed files with 170 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
js/ipc/JavaScriptChild.cpp
View File

@@ -174,8 +174,7 @@ EmptyDesc(PPropertyDescriptor *desc)
bool
JavaScriptChild::AnswerGetPropertyDescriptor(const ObjectId &objId, const nsString &id,
const uint32_t &flags, ReturnStatus *rs,
PPropertyDescriptor *out)
ReturnStatus *rs, PPropertyDescriptor *out)
{
AutoSafeJSContext cx;
JSAutoRequest request(cx);
@@ -193,7 +192,7 @@ JavaScriptChild::AnswerGetPropertyDescriptor(const ObjectId &objId, const nsStri
return fail(cx, rs);
Rooted<JSPropertyDescriptor> desc(cx);
if (!JS_GetPropertyDescriptorById(cx, obj, internedId, flags, &desc))
if (!JS_GetPropertyDescriptorById(cx, obj, internedId, &desc))
return fail(cx, rs);
if (!desc.object())
@@ -207,8 +206,7 @@ JavaScriptChild::AnswerGetPropertyDescriptor(const ObjectId &objId, const nsStri
bool
JavaScriptChild::AnswerGetOwnPropertyDescriptor(const ObjectId &objId, const nsString &id,
const uint32_t &flags, ReturnStatus *rs,
PPropertyDescriptor *out)
ReturnStatus *rs, PPropertyDescriptor *out)
{
AutoSafeJSContext cx;
JSAutoRequest request(cx);
@@ -226,7 +224,7 @@ JavaScriptChild::AnswerGetOwnPropertyDescriptor(const ObjectId &objId, const nsS
return fail(cx, rs);
Rooted<JSPropertyDescriptor> desc(cx);
if (!JS_GetPropertyDescriptorById(cx, obj, internedId, flags, &desc))
if (!JS_GetPropertyDescriptorById(cx, obj, internedId, &desc))
return fail(cx, rs);
if (desc.object() != obj)
@@ -344,7 +342,7 @@ JavaScriptChild::AnswerHasOwn(const ObjectId &objId, const nsString &id, ReturnS
return fail(cx, rs);
Rooted<JSPropertyDescriptor> desc(cx);
if (!JS_GetPropertyDescriptorById(cx, obj, internedId, 0, &desc))
if (!JS_GetPropertyDescriptorById(cx, obj, internedId, &desc))
return fail(cx, rs);
*bp = (desc.object() == obj);