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 947336, part 1 - Make nsXPCWrappedJS::mOuter into a smart pointer. r=bholley

Browse Source
This commit is contained in:
Andrew McCreight 2014-01-02 11:33:40 -08:00
parent 6a6b2859fa
commit d9c65a6e80
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/xpconnect/src/XPCWrappedJS.cpp
View File

@ -424,8 +424,7 @@ nsXPCWrappedJS::nsXPCWrappedJS(JSContext* cx,
: mJSObj(aJSObj),
mClass(aClass),
mRoot(root ? root : MOZ_THIS_IN_INITIALIZER_LIST()),
mNext(nullptr),
mOuter(nullptr)
mNext(nullptr)
{
InitStub(GetClass()->GetIID());
@ -501,10 +500,9 @@ nsXPCWrappedJS::Unlink()
if (mOuter) {
XPCJSRuntime* rt = nsXPConnect::GetRuntimeInstance();
if (rt->GCIsRunning()) {
nsContentUtils::DeferredFinalize(mOuter);
mOuter = nullptr;
nsContentUtils::DeferredFinalize(mOuter.forget().get());
} else {
NS_RELEASE(mOuter);
mOuter = nullptr;
}
}
}

4
js/xpconnect/src/xpcprivate.h
View File

@ -2515,7 +2515,7 @@ public:
"Only one aggregated native can be set");
return;
}
NS_ADDREF(mRoot->mOuter = aNative);
mRoot->mOuter = aNative;
}
void TraceJS(JSTracer* trc);
@ -2538,7 +2538,7 @@ private:
nsXPCWrappedJSClass* mClass;
nsXPCWrappedJS* mRoot;
nsXPCWrappedJS* mNext;
nsISupports* mOuter; // only set in root
nsCOMPtr<nsISupports> mOuter; // only set in root
};
/***************************************************************************/