diff options
author | Gaming4JC <g4jc@hyperbola.info> | 2019-06-08 19:26:40 -0400 |
---|---|---|
committer | Gaming4JC <g4jc@hyperbola.info> | 2019-07-18 22:38:23 -0400 |
commit | 6bbc8d66646f49a1aa8a02765c1111bb3a92ee80 (patch) | |
tree | b77ebf0048d8bddf12b51f8942bb38606f06ca2a /js/src/jsobj.cpp | |
parent | 2d1d2cefbbaff4b0380bfbcdab4631a1dcf142af (diff) | |
download | UXP-6bbc8d66646f49a1aa8a02765c1111bb3a92ee80.tar UXP-6bbc8d66646f49a1aa8a02765c1111bb3a92ee80.tar.gz UXP-6bbc8d66646f49a1aa8a02765c1111bb3a92ee80.tar.lz UXP-6bbc8d66646f49a1aa8a02765c1111bb3a92ee80.tar.xz UXP-6bbc8d66646f49a1aa8a02765c1111bb3a92ee80.zip |
1320408 - Part 6: Change JSObject::splicePrototype to static method.
Diffstat (limited to 'js/src/jsobj.cpp')
-rw-r--r-- | js/src/jsobj.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/src/jsobj.cpp b/js/src/jsobj.cpp index ce2f9a614..f4a524d44 100644 --- a/js/src/jsobj.cpp +++ b/js/src/jsobj.cpp @@ -884,7 +884,7 @@ CreateThisForFunctionWithGroup(JSContext* cx, HandleObjectGroup group, if (newKind == SingletonObject) { Rooted<TaggedProto> proto(cx, TaggedProto(templateObject->staticPrototype())); - if (!res->splicePrototype(cx, &PlainObject::class_, proto)) + if (!JSObject::splicePrototype(cx, res, &PlainObject::class_, proto)) return nullptr; } else { res->setGroup(group); @@ -1722,7 +1722,7 @@ DefineConstructorAndPrototype(JSContext* cx, HandleObject obj, JSProtoKey key, H /* Bootstrap Function.prototype (see also JS_InitStandardClasses). */ Rooted<TaggedProto> tagged(cx, TaggedProto(proto)); - if (ctor->getClass() == clasp && !ctor->splicePrototype(cx, clasp, tagged)) + if (ctor->getClass() == clasp && !JSObject::splicePrototype(cx, ctor, clasp, tagged)) goto bad; } @@ -1862,7 +1862,7 @@ js::SetClassAndProto(JSContext* cx, HandleObject obj, * Just splice the prototype, but mark the properties as unknown for * consistent behavior. */ - if (!obj->splicePrototype(cx, clasp, proto)) + if (!JSObject::splicePrototype(cx, obj, clasp, proto)) return false; MarkObjectGroupUnknownProperties(cx, obj->group()); return true; |