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

Bug 797304 - Add special handling for nuked parents in orphan fixup. r=peterv

Browse Source
This commit is contained in:
Bobby Holley 2012-10-16 15:07:54 +02:00
parent ba09c72553
commit 5ab5c9ac07
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
js/xpconnect/src/XPCWrappedNative.cpp
View File

@ -24,6 +24,7 @@
#include "mozilla/StandardInteger.h"
#include "mozilla/Util.h"
#include "mozilla/Likely.h"
using namespace xpc;
@ -1760,6 +1761,20 @@ XPCWrappedNative::RescueOrphans(XPCCallContext& ccx)
return NS_OK; // Global object. We're done.
parentObj = js::UnwrapObject(parentObj, /* stopAtOuter = */ false);
// There's one little nasty twist here. For reasons described in bug 752764,
// we nuke SOW-ed objects after transplanting them. This means that nodes
// parented to an element (such as XUL elements), can end up with a nuked proxy
// in the parent chain, depending on the order of fixup. Because the proxy is
// nuked, we can't follow it anywhere. But we _can_ find the new wrapper for
// the underlying native parent, which is exactly what PreCreate does.
// So do that here.
if (MOZ_UNLIKELY(JS_IsDeadWrapper(parentObj))) {
rv = mScriptableInfo->GetCallback()->PreCreate(mIdentity, ccx,
GetScope()->GetGlobalJSObject(),
&parentObj);
NS_ENSURE_SUCCESS(rv, rv);
}
// Morph any slim wrappers, lest they confuse us.
MOZ_ASSERT(IS_WRAPPER_CLASS(js::GetObjectClass(parentObj)));
if (IS_SLIM_WRAPPER_OBJECT(parentObj)) {