commit 4b85427200b8777c3b5aa49f9804409bc9910d5a
parent 34902b99939d1c5cef324b94c5816186c61901d5
Author: Atila Butkovits <abutkovits@mozilla.com>
Date: Tue, 16 Dec 2025 15:59:08 +0200
Revert "Bug 2003759 - Add crash annotations for docshell initialization failure reasons. r=hsivonen,gsvelto" for causing bustages at nsWebBrowser.cpp.
This reverts commit 857dc0c7fe05bc2af62f6f608b1f668256ab426b.
Diffstat:
4 files changed, 13 insertions(+), 61 deletions(-)
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
@@ -444,19 +444,19 @@ nsresult nsDocShell::InitWindow(nsIWidget* aParentWidget, int32_t aX,
mozilla::dom::WindowGlobalChild* aWindowActor) {
SetParentWidget(aParentWidget);
SetPositionAndSize(aX, aY, aWidth, aHeight, 0);
- return Initialize(aOpenWindowInfo, aWindowActor);
+ NS_ENSURE_TRUE(Initialize(aOpenWindowInfo, aWindowActor), NS_ERROR_FAILURE);
+
+ return NS_OK;
}
-nsresult nsDocShell::Initialize(nsIOpenWindowInfo* aOpenWindowInfo,
- mozilla::dom::WindowGlobalChild* aWindowActor) {
+bool nsDocShell::Initialize(nsIOpenWindowInfo* aOpenWindowInfo,
+ mozilla::dom::WindowGlobalChild* aWindowActor) {
if (mInitialized) {
// We've already been initialized.
MOZ_ASSERT(!aOpenWindowInfo,
"Tried to reinitialize with override principal");
MOZ_ASSERT(!aWindowActor, "Tried to reinitialize with a window actor");
- CrashReporter::AppendAppNotesToCrashReport(
- "nsDocShell::Initialize mInitialized."_ns);
- return NS_ERROR_UNEXPECTED;
+ return true;
}
MOZ_ASSERT(aOpenWindowInfo,
@@ -465,14 +465,15 @@ nsresult nsDocShell::Initialize(nsIOpenWindowInfo* aOpenWindowInfo,
NS_ASSERTION(mItemType == typeContent || mItemType == typeChrome,
"Unexpected item type in docshell");
- NS_ENSURE_TRUE(Preferences::GetRootBranch(), NS_ERROR_NOT_AVAILABLE);
+ NS_ENSURE_TRUE(Preferences::GetRootBranch(), false);
mInitialized = true;
mDisableMetaRefreshWhenInactive =
Preferences::GetBool("browser.meta_refresh_when_inactive.disabled",
mDisableMetaRefreshWhenInactive);
- nsresult rv = CreateInitialDocumentViewer(aOpenWindowInfo, aWindowActor);
+ bool succeeded =
+ NS_SUCCEEDED(CreateInitialDocumentViewer(aOpenWindowInfo, aWindowActor));
if (nsCOMPtr<nsIObserverService> serv = services::GetObserverService()) {
const char* msg = mItemType == typeContent ? NS_WEBNAVIGATION_CREATE
@@ -480,7 +481,7 @@ nsresult nsDocShell::Initialize(nsIOpenWindowInfo* aOpenWindowInfo,
serv->NotifyWhenScriptSafe(GetAsSupports(this), msg, nullptr);
}
- return rv;
+ return succeeded;
}
/* static */
@@ -6659,8 +6660,6 @@ nsresult nsDocShell::CreateInitialDocumentViewer(
nsIOpenWindowInfo* aOpenWindowInfo,
mozilla::dom::WindowGlobalChild* aWindowActor) {
if (mIsBeingDestroyed) {
- CrashReporter::AppendAppNotesToCrashReport(
- "nsDocShell initially mIsBeingDestroyed."_ns);
return NS_ERROR_FAILURE;
}
MOZ_ASSERT(!mDocumentViewer);
@@ -6686,10 +6685,6 @@ nsresult nsDocShell::CreateInitialDocumentViewer(
/* aTryToSaveOldPresentation */ true,
/* aCheckPermitUnload */ true, aWindowActor);
- if (!mDocumentViewer) {
- CrashReporter::AppendAppNotesToCrashReport(
- "nsDocShell no viewer after create viewer."_ns);
- }
NS_ENSURE_STATE(mDocumentViewer);
if (NS_SUCCEEDED(rv)) {
@@ -6734,15 +6729,12 @@ nsresult nsDocShell::CreateAboutBlankDocumentViewer(
NS_ASSERTION(!mCreatingDocument,
"infinite(?) loop creating document averted");
if (mCreatingDocument) {
- CrashReporter::AppendAppNotesToCrashReport(
- "nsDocShell mCreatingDocument."_ns);
return NS_ERROR_FAILURE;
}
if (!mBrowsingContext->AncestorsAreCurrent() ||
(mozilla::SessionHistoryInParent() && mBrowsingContext->IsInBFCache())) {
mBrowsingContext->RemoveRootFromBFCacheSync();
- CrashReporter::AppendAppNotesToCrashReport("nsDocShell BFCache check."_ns);
return NS_ERROR_NOT_AVAILABLE;
}
@@ -6790,21 +6782,13 @@ nsresult nsDocShell::CreateAboutBlankDocumentViewer(
rv = mDocumentViewer->PermitUnload(&okToUnload);
if (mIsBeingDestroyed) {
// unload handler destroyed this docshell.
- CrashReporter::AppendAppNotesToCrashReport(
- "nsDocShell mIsBeingDestroyed after PermitUnload."_ns);
return NS_ERROR_NOT_AVAILABLE;
}
if (NS_SUCCEEDED(rv) && !okToUnload) {
// The user chose not to unload the page, interrupt the load.
MaybeResetInitTiming(toBeReset);
- CrashReporter::AppendAppNotesToCrashReport(
- "nsDocShell !okToUnload."_ns);
return NS_ERROR_FAILURE;
}
- if (NS_FAILED(rv)) {
- CrashReporter::AppendAppNotesToCrashReport(
- "nsDocShell failed PermitUnload."_ns);
- }
if (mTiming) {
mTiming->NotifyUnloadAccepted(mCurrentURI);
}
@@ -6832,8 +6816,6 @@ nsresult nsDocShell::CreateAboutBlankDocumentViewer(
(void)FirePageHideNotification(!mSavingOldViewer);
// pagehide notification might destroy this docshell.
if (mIsBeingDestroyed) {
- CrashReporter::AppendAppNotesToCrashReport(
- "nsDocShell mIsBeingDestroyed after PageHide."_ns);
return NS_ERROR_DOCSHELL_DYING;
}
}
@@ -6903,8 +6885,6 @@ nsresult nsDocShell::CreateAboutBlankDocumentViewer(
};
nsresult rv = csp->SetRequestContextWithDocument(blankDoc);
if (NS_WARN_IF(NS_FAILED(rv))) {
- CrashReporter::AppendAppNotesToCrashReport(
- "nsDocShell failed SetRequestContextWithDocument."_ns);
return rv;
}
}
@@ -6948,20 +6928,12 @@ nsresult nsDocShell::CreateAboutBlankDocumentViewer(
mLoadingEntry->mInfo.SetTransient();
}
rv = Embed(viewer, aActor, true, nullptr, mCurrentURI);
- if (NS_FAILED(rv)) {
- CrashReporter::AppendAppNotesToCrashReport(
- "nsDocShell failed Embed."_ns);
- }
NS_ENSURE_SUCCESS(rv, rv);
SetCurrentURI(blankDoc->GetDocumentURI(), nullptr,
/* aFireLocationChange */ true,
/* aIsInitialAboutBlank */ aIsInitialDocument,
/* aLocationFlags */ 0);
- if (mIsBeingDestroyed) {
- CrashReporter::AppendAppNotesToCrashReport(
- "nsDocShell mIsBeingDestroyed at the end."_ns);
- }
rv = mIsBeingDestroyed ? NS_ERROR_NOT_AVAILABLE : NS_OK;
}
@@ -8291,8 +8263,6 @@ nsresult nsDocShell::SetupNewViewer(nsIDocumentViewer* aNewViewer,
mDocumentViewer = nullptr;
SetCurrentURIInternal(nullptr);
NS_WARNING("DocumentViewer Initialization failed");
- CrashReporter::AppendAppNotesToCrashReport(
- "nsDocShell failed viewer init."_ns);
return NS_ERROR_FAILURE;
}
@@ -8302,10 +8272,6 @@ nsresult nsDocShell::SetupNewViewer(nsIDocumentViewer* aNewViewer,
newViewer->SetReloadEncodingAndSource(reloadEncoding, reloadEncodingSource);
}
- if (!mDocumentViewer) {
- CrashReporter::AppendAppNotesToCrashReport(
- "nsDocShell no viewer after initializing viewer."_ns);
- }
NS_ENSURE_TRUE(mDocumentViewer, NS_ERROR_FAILURE);
// Stuff the bgcolor from the old pres shell into the new
diff --git a/docshell/base/nsDocShell.h b/docshell/base/nsDocShell.h
@@ -190,8 +190,8 @@ class nsDocShell final : public nsDocLoader,
mozilla::dom::BrowsingContext* aBrowsingContext,
uint64_t aContentWindowID = 0);
- nsresult Initialize(nsIOpenWindowInfo* aOpenWindowInfo,
- mozilla::dom::WindowGlobalChild* aWindowActor);
+ bool Initialize(nsIOpenWindowInfo* aOpenWindowInfo,
+ mozilla::dom::WindowGlobalChild* aWindowActor);
nsresult InitWindow(nsIWidget* aParentWidget, int32_t aX, int32_t aY,
int32_t aWidth, int32_t aHeight,
diff --git a/dom/base/nsFrameLoader.cpp b/dom/base/nsFrameLoader.cpp
@@ -2299,7 +2299,7 @@ nsresult nsFrameLoader::MaybeCreateDocShell() {
doc->GetPolicyContainer();
openWindowInfo->mCoepToInheritForAboutBlank = doc->GetEmbedderPolicy();
openWindowInfo->mBaseUriToInheritForAboutBlank = mOwnerContent->GetBaseURI();
- if (NS_FAILED(docShell->Initialize(openWindowInfo, nullptr))) {
+ if (!docShell->Initialize(openWindowInfo, nullptr)) {
// Do not call Destroy() here. See bug 472312.
NS_WARNING("Something wrong when creating the docshell for a frameloader!");
return NS_ERROR_FAILURE;
diff --git a/toolkit/components/browser/nsWebBrowser.cpp b/toolkit/components/browser/nsWebBrowser.cpp
@@ -112,12 +112,6 @@ already_AddRefed<nsWebBrowser> nsWebBrowser::Create(
RefPtr<nsDocShell> docShell =
nsDocShell::Create(aBrowsingContext, outerWindowId);
if (NS_WARN_IF(!docShell)) {
- if (aInitialWindowChild) {
- // If aInitialWindowChild, we were called from
- // ContentChild::RecvConstructBrowser and would crash there. Let's already
- // crash here to help diagnose bug 2003244.
- MOZ_CRASH("Failed to create docshell.");
- }
return nullptr;
}
browser->SetDocShell(docShell);
@@ -148,14 +142,6 @@ already_AddRefed<nsWebBrowser> nsWebBrowser::Create(
nsresult rv = docShell->InitWindow(docShellParentWidget, 0, 0, 0, 0,
aOpenWindowInfo, aInitialWindowChild);
if (NS_WARN_IF(NS_FAILED(rv))) {
- if (aInitialWindowChild) {
- // If aInitialWindowChild, we were called from
- // ContentChild::RecvConstructBrowser and would crash there. Let's already
- // crash here to help diagnose bug 2003244. Since bug 543435, InitWindow
- // also involves creating viewer and document.
- CrashReporter::AppendAppNotesToCrashReport(nsPrintfCString("rv=%u.", rv));
- MOZ_CRASH("Failed to initialize docshell, check app notes.");
- }
return nullptr;
}
