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

Bug 1112778, part 6 - Rename JSObject::lookupGeneric, etc. -> js::LookupProperty and JSObject::hasProperty -> js::HasProperty. r=Waldo.

Browse Source
This commit is contained in:
Jason Orendorff
2014-12-18 07:32:36 -06:00
parent b41daa37f2
commit 776fbd3af1
21 changed files with 95 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
js/src/jsiter.cpp
View File

@@ -1172,7 +1172,7 @@ SuppressDeletedPropertyHelper(JSContext *cx, HandleObject obj, StringPredicate p
RootedValue idv(cx, StringValue(*idp));
if (!ValueToId<CanGC>(cx, idv, &id))
return false;
if (!JSObject::lookupGeneric(cx, proto, id, &obj2, &prop))
if (!LookupProperty(cx, proto, id, &obj2, &prop))
return false;
if (prop) {
unsigned attrs;
@@ -1330,11 +1330,11 @@ js::IteratorMore(JSContext *cx, HandleObject iterobj, MutableHandleValue rval)
// it's using the new style protocol. Otherwise just return the object.
RootedObject result(cx, &rval.toObject());
bool found = false;
if (!JSObject::hasProperty(cx, result, cx->names().done, &found))
if (!HasProperty(cx, result, cx->names().done, &found))
return false;
if (!found)
return true;
if (!JSObject::hasProperty(cx, result, cx->names().value, &found))
if (!HasProperty(cx, result, cx->names().value, &found))
return false;
if (!found)
return true;