nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1653103 - Part 1: Make nsWebBrowser::InternalDestroy return void; r=nika

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D83706
This commit is contained in:
Edgar Chen 2020-07-16 20:41:12 +00:00
parent 53eace3ac3
commit 2ef1036d17
2 changed files with 2 additions and 5 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

5
toolkit/components/browser/nsWebBrowser.cpp
View file

@ -170,8 +170,7 @@ already_AddRefed<nsWebBrowser> nsWebBrowser::Create(
return browser.forget(); return browser.forget();
} }
NS_IMETHODIMP void nsWebBrowser::InternalDestroy() {
nsWebBrowser::InternalDestroy() {
if (mInternalWidget) { if (mInternalWidget) {
mInternalWidget->SetWidgetListener(nullptr); mInternalWidget->SetWidgetListener(nullptr);
mInternalWidget->Destroy(); mInternalWidget->Destroy();
@ -184,8 +183,6 @@ nsWebBrowser::InternalDestroy() {
mDocShellTreeOwner->WebBrowser(nullptr); mDocShellTreeOwner->WebBrowser(nullptr);
mDocShellTreeOwner = nullptr; mDocShellTreeOwner = nullptr;
} }
return NS_OK;
} }
NS_IMPL_CYCLE_COLLECTING_ADDREF(nsWebBrowser) NS_IMPL_CYCLE_COLLECTING_ADDREF(nsWebBrowser)

2
toolkit/components/browser/nsWebBrowser.h
View file

@ -113,7 +113,7 @@ class nsWebBrowser final : public nsIWebBrowser,
protected: protected:
virtual ~nsWebBrowser(); virtual ~nsWebBrowser();
NS_IMETHOD InternalDestroy(); void InternalDestroy();
// XXXbz why are these NS_IMETHOD? They're not interface methods! // XXXbz why are these NS_IMETHOD? They're not interface methods!
NS_IMETHOD SetDocShell(nsIDocShell* aDocShell); NS_IMETHOD SetDocShell(nsIDocShell* aDocShell);