Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 22:32:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1843968 - Hold some strong references. r=mccr8, a=dmeehan

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D184803
This commit is contained in:
Peter Van der Beken 2023-08-01 12:09:36 +00:00
parent 6a60ff392c
commit 4fbf4ef6d8
20 changed files with 101 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
docshell/base/BrowsingContext.cpp
View File

@ -1933,7 +1933,8 @@ nsresult BrowsingContext::LoadURI(nsDocShellLoadState* aLoadState,
"Targeting occurs in InternalLoad");
if (mDocShell) {
return mDocShell->LoadURI(aLoadState, aSetNavigating);
nsCOMPtr<nsIDocShell> docShell = mDocShell;
return docShell->LoadURI(aLoadState, aSetNavigating);
}
// Note: We do this check both here and in `nsDocShell::InternalLoad`, since
@ -2029,7 +2030,8 @@ nsresult BrowsingContext::InternalLoad(nsDocShellLoadState* aLoadState) {
"must be targeting this BrowsingContext");
if (mDocShell) {
return nsDocShell::Cast(mDocShell)->InternalLoad(aLoadState);
RefPtr<nsDocShell> docShell = nsDocShell::Cast(mDocShell);
return docShell->InternalLoad(aLoadState);
}
// Note: We do this check both here and in `nsDocShell::InternalLoad`, since
@ -2091,9 +2093,10 @@ void BrowsingContext::DisplayLoadError(const nsAString& aURI) {
if (mDocShell) {
bool didDisplayLoadError = false;
mDocShell->DisplayLoadError(NS_ERROR_MALFORMED_URI, nullptr,
PromiseFlatString(aURI).get(), nullptr,
&didDisplayLoadError);
nsCOMPtr<nsIDocShell> docShell = mDocShell;
docShell->DisplayLoadError(NS_ERROR_MALFORMED_URI, nullptr,
PromiseFlatString(aURI).get(), nullptr,
&didDisplayLoadError);
} else {
if (ContentParent* cp = Canonical()->GetContentParent()) {
Unused << cp->SendDisplayLoadError(this, PromiseFlatString(aURI));
@ -3680,7 +3683,8 @@ void BrowsingContext::HistoryGo(
[](mozilla::ipc::
ResponseRejectReason) { /* FIXME Is ignoring this fine? */ });
} else {
aResolver(Canonical()->HistoryGo(
RefPtr<CanonicalBrowsingContext> self = Canonical();
aResolver(self->HistoryGo(
aOffset, aHistoryEpoch, aRequireUserInteraction, aUserActivation,
Canonical()->GetContentParent()
? Some(Canonical()->GetContentParent()->ChildID())

8
docshell/base/CanonicalBrowsingContext.cpp
View File

@ -1489,7 +1489,7 @@ void CanonicalBrowsingContext::GoBack(
mCurrentLoad->Cancel(NS_BINDING_CANCELLED_OLD_LOAD, ""_ns);
}
if (nsDocShell* docShell = nsDocShell::Cast(GetDocShell())) {
if (RefPtr<nsDocShell> docShell = nsDocShell::Cast(GetDocShell())) {
if (aCancelContentJSEpoch.WasPassed()) {
docShell->SetCancelContentJSEpoch(aCancelContentJSEpoch.Value());
}
@ -1515,7 +1515,7 @@ void CanonicalBrowsingContext::GoForward(
mCurrentLoad->Cancel(NS_BINDING_CANCELLED_OLD_LOAD, ""_ns);
}
if (auto* docShell = nsDocShell::Cast(GetDocShell())) {
if (RefPtr<nsDocShell> docShell = nsDocShell::Cast(GetDocShell())) {
if (aCancelContentJSEpoch.WasPassed()) {
docShell->SetCancelContentJSEpoch(aCancelContentJSEpoch.Value());
}
@ -1541,7 +1541,7 @@ void CanonicalBrowsingContext::GoToIndex(
mCurrentLoad->Cancel(NS_BINDING_CANCELLED_OLD_LOAD, ""_ns);
}
if (auto* docShell = nsDocShell::Cast(GetDocShell())) {
if (RefPtr<nsDocShell> docShell = nsDocShell::Cast(GetDocShell())) {
if (aCancelContentJSEpoch.WasPassed()) {
docShell->SetCancelContentJSEpoch(aCancelContentJSEpoch.Value());
}
@ -1565,7 +1565,7 @@ void CanonicalBrowsingContext::Reload(uint32_t aReloadFlags) {
mCurrentLoad->Cancel(NS_BINDING_CANCELLED_OLD_LOAD, ""_ns);
}
if (auto* docShell = nsDocShell::Cast(GetDocShell())) {
if (RefPtr<nsDocShell> docShell = nsDocShell::Cast(GetDocShell())) {
docShell->Reload(aReloadFlags);
} else if (ContentParent* cp = GetContentParent()) {
Unused << cp->SendReload(this, aReloadFlags);

26
docshell/base/nsDocShell.cpp
View File

@ -784,7 +784,8 @@ nsresult nsDocShell::LoadURI(nsDocShellLoadState* aLoadState,
("nsDocShell[%p]: loading from session history", this));
if (!mozilla::SessionHistoryInParent()) {
return LoadHistoryEntry(aLoadState->SHEntry(), aLoadState->LoadType(),
nsCOMPtr<nsISHEntry> entry = aLoadState->SHEntry();
return LoadHistoryEntry(entry, aLoadState->LoadType(),
aLoadState->HasValidUserGestureActivation());
}
@ -4125,8 +4126,11 @@ nsDocShell::Reload(uint32_t aReloadFlags) {
} else {
MOZ_LOG(gSHLog, LogLevel::Debug,
("nsDocShell %p ReloadDocument", this));
ReloadDocument(this, GetDocument(), loadType, mBrowsingContext,
mCurrentURI, mReferrerInfo);
RefPtr<Document> doc = GetDocument();
RefPtr<BrowsingContext> bc = mBrowsingContext;
nsCOMPtr<nsIURI> currentURI = mCurrentURI;
nsCOMPtr<nsIReferrerInfo> referrerInfo = mReferrerInfo;
ReloadDocument(this, doc, loadType, bc, currentURI, referrerInfo);
}
}
}
@ -4144,19 +4148,24 @@ nsDocShell::Reload(uint32_t aReloadFlags) {
/* If you change this part of code, make sure bug 45297 does not re-occur */
if (mOSHE) {
nsCOMPtr<nsISHEntry> oshe = mOSHE;
return LoadHistoryEntry(
mOSHE, loadType,
oshe, loadType,
aReloadFlags & nsIWebNavigation::LOAD_FLAGS_USER_ACTIVATION);
}
if (mLSHE) { // In case a reload happened before the current load is done
nsCOMPtr<nsISHEntry> lshe = mLSHE;
return LoadHistoryEntry(
mLSHE, loadType,
lshe, loadType,
aReloadFlags & nsIWebNavigation::LOAD_FLAGS_USER_ACTIVATION);
}
return ReloadDocument(this, GetDocument(), loadType, mBrowsingContext,
mCurrentURI, mReferrerInfo);
RefPtr<Document> doc = GetDocument();
RefPtr<BrowsingContext> bc = mBrowsingContext;
nsCOMPtr<nsIURI> currentURI = mCurrentURI;
nsCOMPtr<nsIReferrerInfo> referrerInfo = mReferrerInfo;
return ReloadDocument(this, doc, loadType, bc, currentURI, referrerInfo);
}
/* static */
@ -9644,7 +9653,8 @@ nsresult nsDocShell::InternalLoad(nsDocShellLoadState* aLoadState,
if (NS_FAILED(rv)) {
nsCOMPtr<nsIChannel> chan(do_QueryInterface(req));
UnblockEmbedderLoadEventForFailure();
if (DisplayLoadError(rv, aLoadState->URI(), nullptr, chan) &&
nsCOMPtr<nsIURI> uri = aLoadState->URI();
if (DisplayLoadError(rv, uri, nullptr, chan) &&
// FIXME: At this point code was using internal load flags, but checking
// non-internal load flags?
aLoadState->HasLoadFlags(LOAD_FLAGS_ERROR_LOAD_CHANGES_RV)) {

3
docshell/base/nsDocShellTreeOwner.cpp
View File

@ -926,7 +926,8 @@ nsDocShellTreeOwner::HandleEvent(Event* aEvent) {
aEvent->PreventDefault();
}
} else if (eventType.EqualsLiteral("drop")) {
nsIWebNavigation* webnav = static_cast<nsIWebNavigation*>(mWebBrowser);
nsCOMPtr<nsIWebNavigation> webnav =
static_cast<nsIWebNavigation*>(mWebBrowser);
// The page might have cancelled the dragover event itself, so check to
// make sure that the link can be dropped first.

11
docshell/shistory/ChildSHistory.cpp
View File

@ -108,7 +108,7 @@ void ChildSHistory::SetIndexAndLength(uint32_t aIndex, uint32_t aLength,
void ChildSHistory::Reload(uint32_t aReloadFlags, ErrorResult& aRv) {
if (mozilla::SessionHistoryInParent()) {
if (XRE_IsParentProcess()) {
nsISHistory* shistory =
nsCOMPtr<nsISHistory> shistory =
mBrowsingContext->Canonical()->GetSessionHistory();
if (shistory) {
aRv = shistory->Reload(aReloadFlags);
@ -120,7 +120,8 @@ void ChildSHistory::Reload(uint32_t aReloadFlags, ErrorResult& aRv) {
return;
}
aRv = mHistory->Reload(aReloadFlags);
nsCOMPtr<nsISHistory> shistory = mHistory;
aRv = shistory->Reload(aReloadFlags);
}
bool ChildSHistory::CanGo(int32_t aOffset) {
@ -207,7 +208,8 @@ void ChildSHistory::GotoIndex(int32_t aIndex, int32_t aOffset,
}
nsCOMPtr<nsISHistory> shistory = mHistory;
mBrowsingContext->HistoryGo(
RefPtr<BrowsingContext> bc = mBrowsingContext;
bc->HistoryGo(
aOffset, mHistoryEpoch, aRequireUserInteraction, aUserActivation,
[shistory](Maybe<int32_t>&& aRequestedIndex) {
// FIXME Should probably only do this for non-fission.
@ -216,7 +218,8 @@ void ChildSHistory::GotoIndex(int32_t aIndex, int32_t aOffset,
}
});
} else {
aRv = mHistory->GotoIndex(aIndex, aUserActivation);
nsCOMPtr<nsISHistory> shistory = mHistory;
aRv = shistory->GotoIndex(aIndex, aUserActivation);
}
}

4
docshell/shistory/nsSHistory.cpp
View File

@ -1398,7 +1398,9 @@ void nsSHistory::LoadURIOrBFCache(LoadEntryResult& aLoadEntry) {
}
}
aLoadEntry.mBrowsingContext->LoadURI(aLoadEntry.mLoadState, false);
RefPtr<BrowsingContext> bc = aLoadEntry.mBrowsingContext;
RefPtr<nsDocShellLoadState> loadState = aLoadEntry.mLoadState;
bc->LoadURI(loadState, false);
}
/* static */

4
dom/base/Location.cpp
View File

@ -548,7 +548,7 @@ void Location::Reload(bool aForceget, nsIPrincipal& aSubjectPrincipal,
return;
}
nsCOMPtr<nsIDocShell> docShell(GetDocShell());
RefPtr<nsDocShell> docShell(GetDocShell().downcast<nsDocShell>());
if (!docShell) {
return aRv.Throw(NS_ERROR_FAILURE);
}
@ -595,7 +595,7 @@ void Location::Reload(bool aForceget, nsIPrincipal& aSubjectPrincipal,
nsIWebNavigation::LOAD_FLAGS_BYPASS_PROXY;
}
rv = nsDocShell::Cast(docShell)->Reload(reloadFlags);
rv = docShell->Reload(reloadFlags);
if (NS_FAILED(rv) && rv != NS_BINDING_ABORTED) {
// NS_BINDING_ABORTED is returned when we attempt to reload a POST result
// and the user says no at the "do you want to reload?" prompt. Don't

3
dom/base/nsFrameLoader.cpp
View File

@ -775,7 +775,8 @@ nsresult nsFrameLoader::ReallyStartLoadingInternal() {
bool tmpState = mNeedsAsyncDestroy;
mNeedsAsyncDestroy = true;
rv = GetDocShell()->LoadURI(loadState, false);
RefPtr<nsDocShell> docShell = GetDocShell();
rv = docShell->LoadURI(loadState, false);
mNeedsAsyncDestroy = tmpState;
mURIToLoad = nullptr;
NS_ENSURE_SUCCESS(rv, rv);

11
dom/html/HTMLFormElement.cpp
View File

@ -559,7 +559,8 @@ nsresult HTMLFormElement::PostHandleEvent(EventChainPostVisitor& aVisitor) {
OwnerDoc()->WarnOnceAbout(
DeprecatedOperations::eFormSubmissionUntrustedEvent);
}
DoSubmit(aVisitor.mDOMEvent);
RefPtr<Event> event = aVisitor.mDOMEvent;
DoSubmit(event);
break;
}
default:
@ -755,7 +756,8 @@ nsresult HTMLFormElement::SubmitSubmission(
// If there is no link handler, then we won't actually be able to submit.
Document* doc = GetComposedDoc();
nsCOMPtr<nsIDocShell> container = doc ? doc->GetDocShell() : nullptr;
RefPtr<nsDocShell> container =
doc ? nsDocShell::Cast(doc->GetDocShell()) : nullptr;
if (!container || IsEditable()) {
return NS_OK;
}
@ -800,7 +802,6 @@ nsresult HTMLFormElement::SubmitSubmission(
//
// Submit
//
nsCOMPtr<nsIDocShell> docShell;
uint64_t currentLoadId = 0;
{
@ -827,8 +828,8 @@ nsresult HTMLFormElement::SubmitSubmission(
loadState->SetCsp(GetCsp());
loadState->SetAllowFocusMove(UserActivation::IsHandlingUserInput());
rv = nsDocShell::Cast(container)->OnLinkClickSync(this, loadState, false,
NodePrincipal());
nsCOMPtr<nsIPrincipal> nodePrincipal = NodePrincipal();
rv = container->OnLinkClickSync(this, loadState, false, nodePrincipal);
NS_ENSURE_SUBMIT_SUCCESS(rv);
mTargetContext = loadState->TargetBrowsingContext().GetMaybeDiscarded();

14
dom/ipc/ContentChild.cpp
View File

@ -4361,7 +4361,7 @@ mozilla::ipc::IPCResult ContentChild::RecvLoadURI(
if (aContext.IsNullOrDiscarded()) {
return IPC_OK();
}
BrowsingContext* context = aContext.get();
RefPtr<BrowsingContext> context = aContext.get();
if (!context->IsInProcess()) {
// The DocShell has been torn down or the BrowsingContext has changed
// process in the middle of the load request. There's not much we can do at
@ -4407,7 +4407,7 @@ mozilla::ipc::IPCResult ContentChild::RecvInternalLoad(
if (aLoadState->TargetBrowsingContext().IsDiscarded()) {
return IPC_OK();
}
BrowsingContext* context = aLoadState->TargetBrowsingContext().get();
RefPtr<BrowsingContext> context = aLoadState->TargetBrowsingContext().get();
context->InternalLoad(aLoadState);
@ -4437,7 +4437,7 @@ mozilla::ipc::IPCResult ContentChild::RecvDisplayLoadError(
if (aContext.IsNullOrDiscarded()) {
return IPC_OK();
}
BrowsingContext* context = aContext.get();
RefPtr<BrowsingContext> context = aContext.get();
context->DisplayLoadError(aURI);
@ -4550,7 +4550,7 @@ mozilla::ipc::IPCResult ContentChild::RecvGoBack(
}
BrowsingContext* bc = aContext.get();
if (auto* docShell = nsDocShell::Cast(bc->GetDocShell())) {
if (RefPtr<nsDocShell> docShell = nsDocShell::Cast(bc->GetDocShell())) {
if (aCancelContentJSEpoch) {
docShell->SetCancelContentJSEpoch(*aCancelContentJSEpoch);
}
@ -4573,7 +4573,7 @@ mozilla::ipc::IPCResult ContentChild::RecvGoForward(
}
BrowsingContext* bc = aContext.get();
if (auto* docShell = nsDocShell::Cast(bc->GetDocShell())) {
if (RefPtr<nsDocShell> docShell = nsDocShell::Cast(bc->GetDocShell())) {
if (aCancelContentJSEpoch) {
docShell->SetCancelContentJSEpoch(*aCancelContentJSEpoch);
}
@ -4595,7 +4595,7 @@ mozilla::ipc::IPCResult ContentChild::RecvGoToIndex(
}
BrowsingContext* bc = aContext.get();
if (auto* docShell = nsDocShell::Cast(bc->GetDocShell())) {
if (RefPtr<nsDocShell> docShell = nsDocShell::Cast(bc->GetDocShell())) {
if (aCancelContentJSEpoch) {
docShell->SetCancelContentJSEpoch(*aCancelContentJSEpoch);
}
@ -4617,7 +4617,7 @@ mozilla::ipc::IPCResult ContentChild::RecvReload(
}
BrowsingContext* bc = aContext.get();
if (auto* docShell = nsDocShell::Cast(bc->GetDocShell())) {
if (RefPtr<nsDocShell> docShell = nsDocShell::Cast(bc->GetDocShell())) {
docShell->Reload(aReloadFlags);
}

10
dom/ipc/ContentParent.cpp
View File

@ -7808,9 +7808,10 @@ mozilla::ipc::IPCResult ContentParent::RecvHistoryGo(
uint64_t aHistoryEpoch, bool aRequireUserInteraction, bool aUserActivation,
HistoryGoResolver&& aResolveRequestedIndex) {
if (!aContext.IsDiscarded()) {
aResolveRequestedIndex(aContext.get_canonical()->HistoryGo(
aOffset, aHistoryEpoch, aRequireUserInteraction, aUserActivation,
Some(ChildID())));
RefPtr<CanonicalBrowsingContext> canonical = aContext.get_canonical();
aResolveRequestedIndex(
canonical->HistoryGo(aOffset, aHistoryEpoch, aRequireUserInteraction,
aUserActivation, Some(ChildID())));
}
return IPC_OK();
}
@ -8033,7 +8034,8 @@ mozilla::ipc::IPCResult ContentParent::RecvHistoryReload(
const MaybeDiscarded<BrowsingContext>& aContext,
const uint32_t aReloadFlags) {
if (!aContext.IsDiscarded()) {
nsISHistory* shistory = aContext.get_canonical()->GetSessionHistory();
nsCOMPtr<nsISHistory> shistory =
aContext.get_canonical()->GetSessionHistory();
if (shistory) {
shistory->Reload(aReloadFlags);
}

7
dom/ipc/WindowGlobalParent.cpp
View File

@ -319,7 +319,7 @@ mozilla::ipc::IPCResult WindowGlobalParent::RecvLoadURI(
return IPC_FAIL(this, "Illegal cross-process javascript: load attempt");
}
CanonicalBrowsingContext* targetBC = aTargetBC.get_canonical();
RefPtr<CanonicalBrowsingContext> targetBC = aTargetBC.get_canonical();
// FIXME: For cross-process loads, we should double check CanAccess() for the
// source browsing context in the parent process.
@ -352,7 +352,7 @@ mozilla::ipc::IPCResult WindowGlobalParent::RecvInternalLoad(
return IPC_FAIL(this, "Illegal cross-process javascript: load attempt");
}
CanonicalBrowsingContext* targetBC =
RefPtr<CanonicalBrowsingContext> targetBC =
aLoadState->TargetBrowsingContext().get_canonical();
// FIXME: For cross-process loads, we should double check CanAccess() for the
@ -1354,7 +1354,8 @@ mozilla::ipc::IPCResult WindowGlobalParent::RecvReloadWithHttpsOnlyException() {
loadState->SetTriggeringPrincipal(nsContentUtils::GetSystemPrincipal());
loadState->SetLoadType(LOAD_NORMAL_REPLACE);
BrowsingContext()->Top()->LoadURI(loadState, /* setNavigating */ true);
RefPtr<CanonicalBrowsingContext> topBC = BrowsingContext()->Top();
topBC->LoadURI(loadState, /* setNavigating */ true);
return IPC_OK();
}

7
dom/l10n/DocumentL10n.cpp
View File

@ -318,12 +318,13 @@ void DocumentL10n::InitialTranslationCompleted(bool aL10nCached) {
MaybeRecordTelemetry();
mDocument->InitialTranslationCompleted(aL10nCached);
RefPtr<Document> doc = mDocument;
doc->InitialTranslationCompleted(aL10nCached);
// In XUL scenario contentSink is nullptr.
if (mContentSink) {
mContentSink->InitialTranslationCompleted();
mContentSink = nullptr;
nsCOMPtr<nsIContentSink> sink = mContentSink.forget();
sink->InitialTranslationCompleted();
}
// From now on, the state of Localization is unconditionally

7
dom/prototype/PrototypeDocumentContentSink.cpp
View File

@ -680,14 +680,15 @@ nsresult PrototypeDocumentContentSink::DoneWalking() {
}
mDocument->SetDelayFrameLoaderInitialization(false);
mDocument->MaybeInitializeFinalizeFrameLoaders();
RefPtr<Document> doc = mDocument;
doc->MaybeInitializeFinalizeFrameLoaders();
// If the document we are loading has a reference or it is a
// frameset document, disable the scroll bars on the views.
mDocument->SetScrollToRef(mDocument->GetDocumentURI());
doc->SetScrollToRef(mDocument->GetDocumentURI());
mDocument->EndLoad();
doc->EndLoad();
return NS_OK;
}

2
netwerk/ipc/DocumentLoadListener.cpp
View File

@ -2319,7 +2319,7 @@ bool DocumentLoadListener::DocShellWillDisplayContent(nsresult aStatus) {
}
bool DocumentLoadListener::MaybeHandleLoadErrorWithURIFixup(nsresult aStatus) {
auto* bc = GetDocumentBrowsingContext();
RefPtr<CanonicalBrowsingContext> bc = GetDocumentBrowsingContext();
if (!bc) {
return false;
}

2
parser/html/nsHtml5TreeOpExecutor.cpp
View File

@ -996,7 +996,7 @@ void nsHtml5TreeOpExecutor::NeedsCharsetSwitchTo(
return;
}
nsDocShell* docShell = static_cast<nsDocShell*>(mDocShell.get());
RefPtr<nsDocShell> docShell = static_cast<nsDocShell*>(mDocShell.get());
if (NS_SUCCEEDED(docShell->CharsetChangeStopDocumentLoad())) {
docShell->CharsetChangeReloadDocument(aEncoding, aSource);

5
parser/prototype/PrototypeDocumentParser.cpp
View File

@ -8,6 +8,7 @@
#include "nsXULPrototypeCache.h"
#include "nsXULContentSink.h"
#include "nsXULPrototypeDocument.h"
#include "mozilla/Encoding.h"
#include "nsCharsetSource.h"
#include "nsParser.h"
@ -161,7 +162,9 @@ nsresult PrototypeDocumentParser::OnPrototypeLoadDone() {
MOZ_ASSERT(!mIsComplete, "Should not be called more than once.");
mIsComplete = true;
return mOriginalSink->OnPrototypeLoadDone(mCurrentPrototype);
RefPtr<PrototypeDocumentContentSink> sink = mOriginalSink;
RefPtr<nsXULPrototypeDocument> prototype = mCurrentPrototype;
return sink->OnPrototypeLoadDone(prototype);
}
nsresult PrototypeDocumentParser::PrepareToLoadPrototype(

18
toolkit/components/browser/nsWebBrowser.cpp
View File

@ -459,14 +459,16 @@ NS_IMETHODIMP
nsWebBrowser::GoBack(bool aRequireUserInteraction, bool aUserActivation) {
NS_ENSURE_STATE(mDocShell);
return mDocShell->GoBack(aRequireUserInteraction, aUserActivation);
RefPtr<nsDocShell> docShell = mDocShell;
return docShell->GoBack(aRequireUserInteraction, aUserActivation);
}
NS_IMETHODIMP
nsWebBrowser::GoForward(bool aRequireUserInteraction, bool aUserActivation) {
NS_ENSURE_STATE(mDocShell);
return mDocShell->GoForward(aRequireUserInteraction, aUserActivation);
RefPtr<nsDocShell> docShell = mDocShell;
return docShell->GoForward(aRequireUserInteraction, aUserActivation);
}
nsresult nsWebBrowser::LoadURI(nsIURI* aURI,
@ -477,7 +479,8 @@ nsresult nsWebBrowser::LoadURI(nsIURI* aURI,
#endif
NS_ENSURE_STATE(mDocShell);
return mDocShell->LoadURI(aURI, aLoadURIOptions);
RefPtr<nsDocShell> docShell = mDocShell;
return docShell->LoadURI(aURI, aLoadURIOptions);
}
NS_IMETHODIMP
@ -501,7 +504,8 @@ nsresult nsWebBrowser::FixupAndLoadURIString(
#endif
NS_ENSURE_STATE(mDocShell);
return mDocShell->FixupAndLoadURIString(aURI, aLoadURIOptions);
RefPtr<nsDocShell> docShell = mDocShell;
return docShell->FixupAndLoadURIString(aURI, aLoadURIOptions);
}
NS_IMETHODIMP
@ -528,14 +532,16 @@ NS_IMETHODIMP
nsWebBrowser::Reload(uint32_t aReloadFlags) {
NS_ENSURE_STATE(mDocShell);
return mDocShell->Reload(aReloadFlags);
RefPtr<nsDocShell> docShell = mDocShell;
return docShell->Reload(aReloadFlags);
}
NS_IMETHODIMP
nsWebBrowser::GotoIndex(int32_t aIndex, bool aUserActivation) {
NS_ENSURE_STATE(mDocShell);
return mDocShell->GotoIndex(aIndex, aUserActivation);
RefPtr<nsDocShell> docShell = mDocShell;
return docShell->GotoIndex(aIndex, aUserActivation);
}
NS_IMETHODIMP

5
toolkit/components/sessionstore/SessionStoreUtils.cpp
View File

@ -1487,8 +1487,9 @@ already_AddRefed<Promise> SessionStoreUtils::InitializeRestore(
return nullptr;
}
MOZ_DIAGNOSTIC_ASSERT(aContext.GetSessionHistory());
aContext.GetSessionHistory()->ReloadCurrentEntry();
nsCOMPtr<nsISHistory> shistory = aContext.GetSessionHistory();
MOZ_DIAGNOSTIC_ASSERT(shistory);
shistory->ReloadCurrentEntry();
return aContext.GetRestorePromise();
}

2
xpfe/appshell/nsAppShellService.cpp
View File

@ -685,7 +685,7 @@ nsresult nsAppShellService::JustCreateTopWindow(
isPrivateBrowsingWindow = parentContext->UsePrivateBrowsing();
}
if (nsDocShell* docShell = window->GetDocShell()) {
if (RefPtr<nsDocShell> docShell = window->GetDocShell()) {
MOZ_ASSERT(docShell->GetBrowsingContext()->IsChrome());
docShell->SetPrivateBrowsing(isPrivateBrowsingWindow);