third_party/WebKit/Source/web/FrameLoaderClientImpl.h - Issue 2655143002: Drop replacesCurrentHistoryItem, NavigationType

Unified Diff: third_party/WebKit/Source/web/FrameLoaderClientImpl.h

Issue 2655143002: Drop replacesCurrentHistoryItem, NavigationType (Closed)

Patch Set: More compile fixes Created 3 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« no previous file with comments | « third_party/WebKit/Source/core/timing/PerformanceNavigation.cpp ('k') | third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/web/FrameLoaderClientImpl.h

diff --git a/third_party/WebKit/Source/web/FrameLoaderClientImpl.h b/third_party/WebKit/Source/web/FrameLoaderClientImpl.h

index 43fa72f5c206a07ee2a2c50427234e1946418e41..f27c4639de17bd1e446950e3af84803d721fe23f 100644

--- a/third_party/WebKit/Source/web/FrameLoaderClientImpl.h

+++ b/third_party/WebKit/Source/web/FrameLoaderClientImpl.h

@@ -82,20 +82,25 @@ class FrameLoaderClientImpl final : public FrameLoaderClient {

Frame* firstChild() const override;

void willBeDetached() override;

void detached(FrameDetachType) override;

- void dispatchWillSendRequest(ResourceRequest&) override;

+ void willSendRequest(ResourceRequest&, FrameLoadType) override;

void dispatchDidReceiveResponse(const ResourceResponse&) override;

void dispatchDidLoadResourceFromMemoryCache(const ResourceRequest&,

const ResourceResponse&) override;

void dispatchDidHandleOnloadEvents() override;

void dispatchDidReceiveServerRedirectForProvisionalLoad() override;

- void dispatchDidNavigateWithinPage(HistoryItem*,

- HistoryCommitType,

- bool contentInitiated) override;

+ void didNavigateWithinPage(DocumentLoader*,

+ FrameLoadType,

+ HistoryItem*,

+ HistoryCommitType,

+ bool contentInitiated) override;

void dispatchWillCommitProvisionalLoad() override;

- void dispatchDidStartProvisionalLoad() override;

+ void didStartProvisionalLoad(DocumentLoader*, FrameLoadType) override;

void dispatchDidReceiveTitle(const String&) override;

void dispatchDidChangeIcons(IconType) override;

- void dispatchDidCommitLoad(HistoryItem*, HistoryCommitType) override;

+ void didCommitProvisionalLoad(DocumentLoader*,

+ FrameLoadType,

+ HistoryItem*,

+ HistoryCommitType) override;

void dispatchDidFailProvisionalLoad(const ResourceError&,

HistoryCommitType) override;

void dispatchDidFailLoad(const ResourceError&, HistoryCommitType) override;

@@ -105,9 +110,8 @@ class FrameLoaderClientImpl final : public FrameLoaderClient {

void dispatchDidChangeThemeColor() override;

NavigationPolicy decidePolicyForNavigation(const ResourceRequest&,

DocumentLoader*,

- NavigationType,

NavigationPolicy,

- bool shouldReplaceCurrentEntry,

+ FrameLoadType,

bool isClientRedirect,

HTMLFormElement*) override;

void dispatchWillSendSubmitEvent(HTMLFormElement*) override;

@@ -118,7 +122,7 @@ class FrameLoaderClientImpl final : public FrameLoaderClient {

void loadURLExternally(const ResourceRequest&,

NavigationPolicy,

const String& suggestedName,

- bool shouldReplaceCurrentEntry) override;

+ FrameLoadType) override;

void loadErrorPage(int reason) override;

bool navigateBackForward(int offset) const override;

void didAccessInitialDocument() override;