corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1962976 - Cancel lazy loading already in InternalLoad. r=sefeng,dom-core

Browse Source 
According to the spec, canceling lazy loading should happen before
navigating to a fragment. If we cancel lazy loading in DoURILoad,
we won't cancel for same document navigation.

To my knowledge, this hasn't been an issue. But with sync-about-blank,
this would break wpt iframe-loading-lazy-nav-link-click-fragment.html.

Differential Revision: https://phabricator.services.mozilla.com/D234665
This commit is contained in:
Vincent Hilla
2025-04-28 14:25:52 +00:00
parent 6af72126fa
commit 7f27d00f15
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
docshell/base/nsDocShell.cpp
View File

@@ -9384,6 +9384,19 @@ nsresult nsDocShell::InternalLoad(nsDocShellLoadState* aLoadState,
INTERNAL_LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP); INTERNAL_LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP);
mURIResultedInDocument = false; // reset the clock... mURIResultedInDocument = false; // reset the clock...
// If container is an iframe element and will lazy load element steps given
// container returns true, then stop intersection-observing a lazy loading
// element container and set container's lazy load resumption steps to null.
if (IsSubframe()) {
if (auto* iframe = HTMLIFrameElement::FromNodeOrNull(
mBrowsingContext->GetEmbedderElement())) {
// Per spec, reload doesn't cancel lazy loading iframes.
if (!(aLoadState->LoadType() & LOAD_RELOAD_NORMAL)) {
iframe->CancelLazyLoading(true /* aClearLazyLoadState */);
}
}
}
// See if this is actually a load between two history entries for the same // See if this is actually a load between two history entries for the same
// document. If the process fails, or if we successfully navigate within the // document. If the process fails, or if we successfully navigate within the
// same document, return. // same document, return.
@@ -10192,15 +10205,6 @@ nsresult nsDocShell::DoURILoad(nsDocShellLoadState* aLoadState,
MOZ_ASSERT(contentPolicyType == nsIContentPolicy::TYPE_INTERNAL_IFRAME || MOZ_ASSERT(contentPolicyType == nsIContentPolicy::TYPE_INTERNAL_IFRAME ||
contentPolicyType == nsIContentPolicy::TYPE_INTERNAL_FRAME, contentPolicyType == nsIContentPolicy::TYPE_INTERNAL_FRAME,
"DoURILoad thinks this is a frame and InternalLoad does not"); "DoURILoad thinks this is a frame and InternalLoad does not");
if (auto* iframe = HTMLIFrameElement::FromNodeOrNull(
mBrowsingContext->GetEmbedderElement())) {
// Per spec, reload doesn't cacel lazy loading iframes.
if (!(aLoadState->LoadType() & LOAD_RELOAD_NORMAL)) {
iframe->CancelLazyLoading(true /* aClearLazyLoadState */);
}
}
if (StaticPrefs::dom_block_external_protocol_in_iframes()) { if (StaticPrefs::dom_block_external_protocol_in_iframes()) {
// Only allow URLs able to return data in iframes. // Only allow URLs able to return data in iframes.
if (nsContentUtils::IsExternalProtocol(aLoadState->URI())) { if (nsContentUtils::IsExternalProtocol(aLoadState->URI())) {