wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Back out d093de44e850 (bug 774953) for test_postMessage_chrome.html timeouts

Browse Source
This commit is contained in:
Phil Ringnalda 2012-08-12 20:54:31 -07:00
parent f2d58c0e08
commit 5797d3d5ca
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
js/src/jsobj.cpp
View File

@ -2980,13 +2980,7 @@ JSObject::ReserveForTradeGuts(JSContext *cx, JSObject *a, JSObject *b,
Debug_SetSlotRangeToCrashOnTouch(reserved.newbslots, bdynamic);
}
RootedObject na(cx, a), aProto(cx, a->getProto()), nb(cx, b), bProto(cx, b->getProto());
/*
* Swap prototypes on the two objects, so that TradeGuts can preserve
* the types of the two objects.
*/
return SetProto(cx, na, bProto, true) && SetProto(cx, nb, aProto, true);
return true;
}
void
@ -3117,14 +3111,6 @@ JSObject::TradeGuts(JSContext *cx, JSObject *a, JSObject *b, TradeGutsReserved &
a->lastProperty()->listp = &a->shape_;
if (b->inDictionaryMode())
b->lastProperty()->listp = &b->shape_;
/*
* Swap the object's types, to restore their initial type information.
* The prototypes of the objects were swapped in ReserveForTradeGuts.
*/
TypeObject *tmp = a->type_;
a->type_ = b->type_;
b->type_ = tmp;
}
/*