Bug 1931496. Some missed contentViewer to documentViewer renames. r=baku DONTBUILD
Differential Revision: https://phabricator.services.mozilla.com/D229104
This commit is contained in:
@@ -7308,7 +7308,7 @@ nsresult nsDocShell::RestoreFromHistory() {
|
||||
mIsRestoringDocument = false;
|
||||
|
||||
// Hack to keep nsDocShellEditorData alive across the
|
||||
// SetContentViewer(nullptr) call below.
|
||||
// SetDocumentViewer(nullptr) call below.
|
||||
UniquePtr<nsDocShellEditorData> data(mLSHE->ForgetEditorData());
|
||||
|
||||
// Now remove it from the cached presentation.
|
||||
@@ -7841,7 +7841,7 @@ nsresult nsDocShell::SetupNewViewer(nsIDocumentViewer* aNewViewer,
|
||||
//
|
||||
// In this block of code, if we get an error result, we return it
|
||||
// but if we get a null pointer, that's perfectly legal for parent
|
||||
// and parentContentViewer.
|
||||
// and parentDocumentViewer.
|
||||
//
|
||||
|
||||
int32_t x = 0;
|
||||
@@ -7940,7 +7940,7 @@ nsresult nsDocShell::SetupNewViewer(nsIDocumentViewer* aNewViewer,
|
||||
viewer->Destroy();
|
||||
mDocumentViewer = nullptr;
|
||||
SetCurrentURIInternal(nullptr);
|
||||
NS_WARNING("ContentViewer Initialization failed");
|
||||
NS_WARNING("DocumentViewer Initialization failed");
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user