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 961551, part 6 - Smart pointerize wrapper. r=bholley

Browse Source
This commit is contained in:
Andrew McCreight 2014-01-21 17:56:15 -08:00
parent e616bf8d69
commit d7fc298807
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -328,7 +328,6 @@ nsXPCWrappedJS::GetNewOrUsed(JS::HandleObject jsObj,
AutoJSContext cx;
JSObject2WrappedJSMap* map;
nsXPCWrappedJS* wrapper = nullptr;
nsRefPtr<nsXPCWrappedJSClass> clasp;
XPCJSRuntime* rt = nsXPConnect::GetRuntimeInstance();
@ -348,11 +347,11 @@ nsXPCWrappedJS::GetNewOrUsed(JS::HandleObject jsObj,
return NS_ERROR_FAILURE;
nsRefPtr<nsXPCWrappedJS> root = map->Find(rootJSObj);
nsRefPtr<nsXPCWrappedJS> wrapper;
if (root) {
wrapper = root->FindOrFindInherited(aIID);
if (wrapper) {
NS_ADDREF(wrapper);
*wrapperResult = wrapper;
wrapper.forget(wrapperResult);
return NS_OK;
}
} else {
@ -360,8 +359,7 @@ nsXPCWrappedJS::GetNewOrUsed(JS::HandleObject jsObj,
if (rootJSObj == jsObj) {
// the root will do double duty as the interface wrapper
wrapper = new nsXPCWrappedJS(cx, jsObj, clasp, nullptr);
NS_ADDREF(wrapper);
*wrapperResult = wrapper;
wrapper.forget(wrapperResult);
return NS_OK;
} else {
// just a root wrapper
@ -382,9 +380,7 @@ nsXPCWrappedJS::GetNewOrUsed(JS::HandleObject jsObj,
MOZ_ASSERT(!wrapper, "no wrapper found yet");
wrapper = new nsXPCWrappedJS(cx, jsObj, clasp, root);
NS_ADDREF(wrapper);
*wrapperResult = wrapper;
wrapper.forget(wrapperResult);
return NS_OK;
}