mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1730120, close ContentViewer properly if initialization fails, r=nika 

Differential Revision: https://phabricator.services.mozilla.com/D130211
This commit is contained in:
Olli Pettay 2021-11-09 22:09:48 +00:00
Родитель eaeec96d4b
Коммит 91122391ce
2 изменённых файлов: 4 добавлений и 2 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
docshell/base/nsDocShell.cpp
Просмотреть файл

@ -8107,7 +8107,11 @@ nsresult nsDocShell::SetupNewViewer(nsIContentViewer* aNewViewer,
mContentViewer->SetNavigationTiming(mTiming); mContentViewer->SetNavigationTiming(mTiming);
if (NS_FAILED(mContentViewer->Init(widget, bounds, aWindowActor))) { if (NS_FAILED(mContentViewer->Init(widget, bounds, aWindowActor))) {
nsCOMPtr<nsIContentViewer> viewer = mContentViewer;
viewer->Close(nullptr);
viewer->Destroy();
mContentViewer = nullptr; mContentViewer = nullptr;
mCurrentURI = nullptr;
NS_WARNING("ContentViewer Initialization failed"); NS_WARNING("ContentViewer Initialization failed");
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
} }

2
layout/base/nsDocumentViewer.cpp
Просмотреть файл

@ -1597,8 +1597,6 @@ static void DetachContainerRecurse(nsIDocShell* aShell) {
NS_IMETHODIMP NS_IMETHODIMP
nsDocumentViewer::Destroy() { nsDocumentViewer::Destroy() {
NS_ASSERTION(mDocument, "No document in Destroy()!");
// Don't let the document get unloaded while we are printing. // Don't let the document get unloaded while we are printing.
// this could happen if we hit the back button during printing. // this could happen if we hit the back button during printing.
// We also keep the viewer from being cached in session history, since // We also keep the viewer from being cached in session history, since