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 1064439, part 15 - Convert nsWebBrowser::mListenerArray to an nsAutoPtr. r=jst

Browse Source
This commit is contained in:
Andrew McCreight 2014-12-16 09:18:02 -08:00
parent 060d938f74
commit ff849158b9
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
embedding/browser/nsWebBrowser.cpp
View File

@ -76,8 +76,7 @@ nsWebBrowser::nsWebBrowser() :
mPersistCurrentState(nsIWebBrowserPersist::PERSIST_STATE_READY),
mPersistResult(NS_OK),
mPersistFlags(nsIWebBrowserPersist::PERSIST_FLAGS_NONE),
mParentWidget(nullptr),
mListenerArray(nullptr)
mParentWidget(nullptr)
{
mWWatch = do_GetService(NS_WINDOWWATCHER_CONTRACTID);
NS_ASSERTION(mWWatch, "failed to get WindowWatcher");
@ -110,7 +109,6 @@ NS_IMETHODIMP nsWebBrowser::InternalDestroy()
nsWebBrowserListenerState *state = mListenerArray->ElementAt(i);
delete state;
}
delete mListenerArray;
mListenerArray = nullptr;
}
@ -264,7 +262,6 @@ NS_IMETHODIMP nsWebBrowser::RemoveWebBrowserListener(nsIWeakReference *aListener
nsWebBrowserListenerState *state = mListenerArray->ElementAt(i);
delete state;
}
delete mListenerArray;
mListenerArray = nullptr;
}
@ -1188,7 +1185,6 @@ NS_IMETHODIMP nsWebBrowser::Create()
nsWebBrowserListenerState *state = mListenerArray->ElementAt(i);
delete state;
}
delete mListenerArray;
mListenerArray = nullptr;
}

2
embedding/browser/nsWebBrowser.h
View File

@ -160,7 +160,7 @@ protected:
//Weak Reference interfaces...
nsIWidget* mParentWidget;
nsTArray<nsWebBrowserListenerState*>* mListenerArray;
nsAutoPtr<nsTArray<nsWebBrowserListenerState*>> mListenerArray;
};
#endif /* nsWebBrowser_h__ */