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 2 - Take advantage of new being infallible in nsXPCWrappedJS::GetNewOrUsed. r=bholley

Browse Source
This commit is contained in:
Andrew McCreight 2014-01-02 11:33:41 -08:00
parent af3de44f9b
commit 5085bb4817
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -364,8 +364,6 @@ nsXPCWrappedJS::GetNewOrUsed(JS::HandleObject jsObj,
if (rootJSObj == jsObj) {
// the root will do double duty as the interface wrapper
wrapper = root = new nsXPCWrappedJS(cx, jsObj, clazz, nullptr);
if (!root)
goto return_wrapper;
map->Add(cx, root);
@ -381,9 +379,6 @@ nsXPCWrappedJS::GetNewOrUsed(JS::HandleObject jsObj,
root = new nsXPCWrappedJS(cx, rootJSObj, rootClazz, nullptr);
NS_RELEASE(rootClazz);
if (!root)
goto return_wrapper;
release_root = true;
map->Add(cx, root);
@ -394,11 +389,8 @@ nsXPCWrappedJS::GetNewOrUsed(JS::HandleObject jsObj,
MOZ_ASSERT(root,"bad root");
MOZ_ASSERT(clazz,"bad clazz");
if (!wrapper) {
if (!wrapper)
wrapper = new nsXPCWrappedJS(cx, jsObj, clazz, root);
if (!wrapper)
goto return_wrapper;
}
wrapper->mNext = root->mNext;
root->mNext = wrapper;