third_party/WebKit/Source/core/loader/FrameLoader.cpp - Issue 1738623004: Rename enums/functions that collide in chromium style.

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/core/loader/FrameLoader.cpp

Issue 1738623004: Rename enums/functions that collide in chromium style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-4

Patch Set: get-names-5: rebase-and-stuff Created 4 years, 10 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

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

Index: third_party/WebKit/Source/core/loader/FrameLoader.cpp

diff --git a/third_party/WebKit/Source/core/loader/FrameLoader.cpp b/third_party/WebKit/Source/core/loader/FrameLoader.cpp

index 9b54797f9dfd70e4e43c52d17b516394e844a1e8..bb530a25bf437a9e699176fb8c2abc8a213c5e7e 100644

--- a/third_party/WebKit/Source/core/loader/FrameLoader.cpp

+++ b/third_party/WebKit/Source/core/loader/FrameLoader.cpp

@@ -757,9 +757,9 @@ FrameLoadType FrameLoader::determineFrameLoadType(const FrameLoadRequest& reques

return FrameLoadTypeStandard;

if (m_provisionalDocumentLoader && request.substituteData().failingURL() == m_provisionalDocumentLoader->url() && m_loadType == FrameLoadTypeBackForward)

return FrameLoadTypeBackForward;

- if (request.resourceRequest().cachePolicy() == ReloadIgnoringCacheData)

+ if (request.resourceRequest().getCachePolicy() == ReloadIgnoringCacheData)

return FrameLoadTypeReload;

- if (request.resourceRequest().cachePolicy() == ReloadBypassingCache)

+ if (request.resourceRequest().getCachePolicy() == ReloadBypassingCache)

return FrameLoadTypeReloadFromOrigin;

// From the HTML5 spec for location.assign():

// "If the browsing context's session history contains only one Document,