Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion Source/WebCore/loader/FrameLoader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3241,8 +3241,16 @@ void FrameLoader::continueFragmentScrollAfterNavigationPolicy(const ResourceRequ
// frame to be deallocated.
Ref<Frame> protectedFrame(m_frame);

static bool keepNavigationOnFragmentLoad = false;
static bool keepNavigationOnFragmentLoadInitialized = false;

if (!keepNavigationOnFragmentLoadInitialized) {
keepNavigationOnFragmentLoad = !!getenv("WPE_KEEP_NAVIGATION_ON_FRAGMENT_LOAD");
keepNavigationOnFragmentLoadInitialized = true;
}

// If we have a provisional request for a different document, a fragment scroll should cancel it.
if (m_provisionalDocumentLoader && !equalIgnoringFragmentIdentifier(m_provisionalDocumentLoader->request().url(), request.url())) {
if (m_provisionalDocumentLoader && !equalIgnoringFragmentIdentifier(m_provisionalDocumentLoader->request().url(), request.url()) && !keepNavigationOnFragmentLoad) {
m_provisionalDocumentLoader->stopLoading();
FRAMELOADER_RELEASE_LOG(ResourceLoading, "continueFragmentScrollAfterNavigationPolicy: Clearing provisional document loader (m_provisionalDocumentLoader=%p)", m_provisionalDocumentLoader.get());
setProvisionalDocumentLoader(nullptr);
Expand Down