third_party/WebKit/Source/web/WebLocalFrameImpl.h - Issue 1858533002: Introduce WebCachePolicy to merge cache policy enums

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1858533002: Introduce WebCachePolicy to merge cache policy enums (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: self review, minor fixes Created 4 years, 9 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

Download patch

« content/renderer/render_frame_impl.cc ('K') | « third_party/WebKit/Source/platform/network/ResourceRequestTest.cpp ('k') | third_party/WebKit/Source/web/WebLocalFrameImpl.cpp » ('j') | third_party/WebKit/public/web/WebFrame.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 3056ec8844e828acf0884389a62a0d10284584e2..e7eef87727096fe9f0d07ebe798b62ec0ca7382d 100644

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

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

@@ -127,7 +127,7 @@ public:

void reloadImage(const WebNode&) override;

void reloadLoFiImages() override;

void loadRequest(const WebURLRequest&) override;

- void loadHistoryItem(const WebHistoryItem&, WebHistoryLoadType, WebURLRequest::CachePolicy) override;

+ void loadHistoryItem(const WebHistoryItem&, WebHistoryLoadType, WebCachePolicy) override;

void loadHTMLString(

const WebData& html, const WebURL& baseURL, const WebURL& unreachableURL,

bool replace) override;

@@ -214,8 +214,7 @@ public:

WebLocalFrame* traversePreviousLocal(bool wrap) const override;

WebLocalFrame* traverseNextLocal(bool wrap) const override;

void sendPings(const WebNode& contextNode, const WebURL& destinationURL) override;

- WebURLRequest requestFromHistoryItem(const WebHistoryItem&, WebURLRequest::CachePolicy)

- const override;

+ WebURLRequest requestFromHistoryItem(const WebHistoryItem&, WebCachePolicy) const override;

WebURLRequest requestForReload(WebFrameLoadType, const WebURL&) const override;

void load(const WebURLRequest&, WebFrameLoadType, const WebHistoryItem&,

WebHistoryLoadType, bool isClientRedirect) override;