Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove invalid assertion hit on 30 API tests since 255719@main #5550

Merged
merged 1 commit into from
Oct 19, 2022
Merged

Remove invalid assertion hit on 30 API tests since 255719@main #5550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions Source/WebKit/UIProcess/FrameLoadState.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,12 @@ void FrameLoadState::didStartProvisionalLoad(const URL& url)
m_provisionalURL = url;
}

void FrameLoadState::didSuspend()
{
m_provisionalURL = { };
m_state = State::Finished;
}

void FrameLoadState::didExplicitOpen(const URL& url)
{
m_url = url;
Expand Down
1 change: 1 addition & 0 deletions Source/WebKit/UIProcess/FrameLoadState.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ class FrameLoadState {
void didExplicitOpen(const URL&);
void didReceiveServerRedirectForProvisionalLoad(const URL&);
void didFailProvisionalLoad();
void didSuspend();

void didCommitLoad();
void didFinishLoad();
Expand Down
1 change: 1 addition & 0 deletions Source/WebKit/UIProcess/WebPageProxy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -962,6 +962,7 @@ bool WebPageProxy::suspendCurrentPageIfPossible(API::Navigation& navigation, Ref
}

WEBPAGEPROXY_RELEASE_LOG(ProcessSwapping, "suspendCurrentPageIfPossible: Suspending current page for process pid %i", m_process->processIdentifier());
mainFrame->frameLoadState().didSuspend();
auto suspendedPage = makeUnique<SuspendedPageProxy>(*this, m_process.copyRef(), mainFrame.releaseNonNull(), shouldDelayClosingUntilFirstLayerFlush);

LOG(ProcessSwapping, "WebPageProxy %" PRIu64 " created suspended page %s for process pid %i, back/forward item %s" PRIu64, identifier().toUInt64(), suspendedPage->loggingString(), m_process->processIdentifier(), fromItem ? fromItem->itemID().logString() : 0);
Expand Down