Commit 2cb9bab6 authored by Dmitry Gozman's avatar Dmitry Gozman Committed by Commit Bot

Split FrameLoader start and commit paths part 2

Inline StartLoad and ShouldContinueForNavigationPolicy into
StartNavigation and CommitNavigation, dropping the parts which are not relevant.

Bug: 789577
Change-Id: I5d580bdffed64340fc2396f7a6a274d8242fd96f
Reviewed-on: https://chromium-review.googlesource.com/1107211
Commit-Queue: Dmitry Gozman <dgozman@chromium.org>
Reviewed-by: default avatarDaniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#577287}
parent 37e3cde0
...@@ -65,7 +65,6 @@ namespace blink { ...@@ -65,7 +65,6 @@ namespace blink {
class Document; class Document;
class DocumentLoader; class DocumentLoader;
class ExecutionContext; class ExecutionContext;
class HTMLFormElement;
class LocalFrame; class LocalFrame;
class Frame; class Frame;
class LocalFrameClient; class LocalFrameClient;
...@@ -209,23 +208,6 @@ class CORE_EXPORT FrameLoader final { ...@@ -209,23 +208,6 @@ class CORE_EXPORT FrameLoader final {
void SaveScrollState(); void SaveScrollState();
void RestoreScrollPositionAndViewState(); void RestoreScrollPositionAndViewState();
// The navigation should only be continued immediately in this frame if this
// returns NavigationPolicyCurrentTab.
NavigationPolicy ShouldContinueForNavigationPolicy(
const ResourceRequest&,
Document* origin_document,
const SubstituteData&,
DocumentLoader*,
ContentSecurityPolicyDisposition,
WebNavigationType,
NavigationPolicy,
WebFrameLoadType,
bool is_client_redirect,
WebTriggeringEventInfo,
HTMLFormElement*,
mojom::blink::BlobURLTokenPtr,
bool check_with_client);
// Note: When a PlzNavigtate navigation is handled by the client, we will // Note: When a PlzNavigtate navigation is handled by the client, we will
// have created a dummy provisional DocumentLoader, so this will return true // have created a dummy provisional DocumentLoader, so this will return true
// while the client handles the navigation. // while the client handles the navigation.
...@@ -257,14 +239,6 @@ class CORE_EXPORT FrameLoader final { ...@@ -257,14 +239,6 @@ class CORE_EXPORT FrameLoader final {
// Returns whether we should continue with new navigation. // Returns whether we should continue with new navigation.
bool CancelProvisionalLoaderForNewNavigation(NavigationPolicy); bool CancelProvisionalLoaderForNewNavigation(NavigationPolicy);
void StartLoad(FrameLoadRequest&,
WebFrameLoadType,
NavigationPolicy,
HistoryItem*,
bool check_with_client,
std::unique_ptr<WebDocumentLoader::ExtraData>,
const WebNavigationTimings&);
void ClearInitialScrollState(); void ClearInitialScrollState();
void LoadInSameDocument(const KURL&, void LoadInSameDocument(const KURL&,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment