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 952660, part 3 - Eliminate goto return_wrapper. r=bholley

Browse Source 
Substitute in the tail of the function for each goto, then eliminate
the resulting branches where possible.
This commit is contained in:
Andrew McCreight 2014-01-02 11:33:41 -08:00
parent 3f5eda09cd
commit 2c95dc4ab5
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -343,19 +343,19 @@ nsXPCWrappedJS::GetNewOrUsed(JS::HandleObject jsObj,
nsXPCWrappedJSClass::GetNewOrUsed(cx, aIID, getter_AddRefs(clazz));
if (!clazz)
return NS_ERROR_FAILURE;
// from here on we need to return through 'return_wrapper'
// always find the root JSObject
JS::RootedObject rootJSObj(cx, clazz->GetRootJSObject(cx, jsObj));
if (!rootJSObj)
goto return_wrapper;
return NS_ERROR_FAILURE;
root = map->Find(rootJSObj);
if (root) {
if ((nullptr != (wrapper = root->Find(aIID))) ||
(nullptr != (wrapper = root->FindInherited(aIID)))) {
NS_ADDREF(wrapper);
goto return_wrapper;
*wrapperResult = wrapper;
return NS_OK;
}
}
@ -367,14 +367,15 @@ nsXPCWrappedJS::GetNewOrUsed(JS::HandleObject jsObj,
map->Add(cx, root);
goto return_wrapper;
*wrapperResult = wrapper;
return NS_OK;
} else {
// just a root wrapper
nsXPCWrappedJSClass* rootClazz = nullptr;
nsXPCWrappedJSClass::GetNewOrUsed(cx, NS_GET_IID(nsISupports),
&rootClazz);
if (!rootClazz)
goto return_wrapper;
return NS_ERROR_FAILURE;
root = new nsXPCWrappedJS(cx, rootJSObj, rootClazz, nullptr);
NS_RELEASE(rootClazz);
@ -395,7 +396,6 @@ nsXPCWrappedJS::GetNewOrUsed(JS::HandleObject jsObj,
wrapper->mNext = root->mNext;
root->mNext = wrapper;
return_wrapper:
if (release_root)
NS_RELEASE(root);