third_party/WebKit/Source/platform/network/ResourceRequest.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/platform/network/ResourceRequest.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/platform/network/ResourceRequest.h ('k') | third_party/WebKit/Source/platform/network/ResourceRequestTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/network/ResourceRequest.cpp

diff --git a/third_party/WebKit/Source/platform/network/ResourceRequest.cpp b/third_party/WebKit/Source/platform/network/ResourceRequest.cpp

index 24fa32ae594091785a8e681ad7b6d7243a493142..f54b7d5cb6387f166b626708c362b87210fd4ca9 100644

--- a/third_party/WebKit/Source/platform/network/ResourceRequest.cpp

+++ b/third_party/WebKit/Source/platform/network/ResourceRequest.cpp

@@ -77,7 +77,7 @@ PassOwnPtr<CrossThreadResourceRequestData> ResourceRequest::copyData() const

{

OwnPtr<CrossThreadResourceRequestData> data = adoptPtr(new CrossThreadResourceRequestData());

data->m_url = url().copy();

- data->m_cachePolicy = cachePolicy();

+ data->m_cachePolicy = getCachePolicy();

data->m_timeoutInterval = timeoutInterval();

data->m_firstPartyForCookies = firstPartyForCookies().copy();

data->m_requestorOrigin = requestorOrigin() ? requestorOrigin()->isolatedCopy() : nullptr;

@@ -143,7 +143,7 @@ void ResourceRequest::removeCredentials()

m_url.setPass(String());

}

-ResourceRequestCachePolicy ResourceRequest::cachePolicy() const

+ResourceRequestCachePolicy ResourceRequest::getCachePolicy() const

{

return m_cachePolicy;

}

@@ -325,7 +325,7 @@ bool equalIgnoringHeaderFields(const ResourceRequest& a, const ResourceRequest&

if (a.url() != b.url())

return false;

- if (a.cachePolicy() != b.cachePolicy())

+ if (a.getCachePolicy() != b.getCachePolicy())

return false;

if (a.timeoutInterval() != b.timeoutInterval())