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

Merge mozilla-inbound to mozilla-central. a=merge

Browse Source
This commit is contained in:
Cosmin Sabou 2018-08-20 00:49:12 +03:00
commit 26f912b5d4
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
js/src/vm/StructuredClone.cpp
View File

@ -519,7 +519,7 @@ struct JSStructuredCloneWriter {
bool writeSharedWasmMemory(HandleObject obj);
bool startObject(HandleObject obj, bool* backref);
bool startWrite(HandleValue v);
bool traverseObject(HandleObject obj);
bool traverseObject(HandleObject obj, ESClass cls);
bool traverseMap(HandleObject obj);
bool traverseSet(HandleObject obj);
bool traverseSavedFrame(HandleObject obj);
@ -1376,7 +1376,7 @@ JSStructuredCloneWriter::startObject(HandleObject obj, bool* backref)
}
bool
JSStructuredCloneWriter::traverseObject(HandleObject obj)
JSStructuredCloneWriter::traverseObject(HandleObject obj, ESClass cls)
{
// Get enumerable property ids and put them in reverse order so that they
// will come off the stack in forward order.
@ -1397,11 +1397,14 @@ JSStructuredCloneWriter::traverseObject(HandleObject obj)
checkStack();
// Write the header for obj.
ESClass cls;
if (!GetBuiltinClass(context(), obj, &cls))
#if DEBUG
ESClass cls2;
if (!GetBuiltinClass(context(), obj, &cls2))
return false;
MOZ_ASSERT(cls2 == cls);
#endif
// Write the header for obj.
if (cls == ESClass::Array) {
uint32_t length = 0;
if (!JS_GetArrayLength(context(), obj, &length))
@ -1614,7 +1617,7 @@ JSStructuredCloneWriter::startWrite(HandleValue v)
switch (cls) {
case ESClass::Object:
case ESClass::Array:
return traverseObject(obj);
return traverseObject(obj, cls);
case ESClass::Number: {
RootedValue unboxed(context());
if (!Unbox(context(), obj, &unboxed))