third_party/WebKit/Source/core/fetch/RawResource.h - 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/fetch/RawResource.h

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 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

« third_party/WebKit/Source/core/editing/CaretBase.h ('K') | « third_party/WebKit/Source/core/fetch/MemoryCache.cpp ('k') | third_party/WebKit/Source/core/fetch/RawResource.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/fetch/RawResource.h

diff --git a/third_party/WebKit/Source/core/fetch/RawResource.h b/third_party/WebKit/Source/core/fetch/RawResource.h

index 16ae106781fa4cd695e1e7f17880d43856fbf82e..94ec09b0586ce1852393b78dc5cc908752f17df2 100644

--- a/third_party/WebKit/Source/core/fetch/RawResource.h

+++ b/third_party/WebKit/Source/core/fetch/RawResource.h

@@ -91,7 +91,7 @@ private:

#if ENABLE(SECURITY_ASSERT)

inline bool isRawResource(const Resource& resource)

{

- Resource::Type type = resource.type();

+ Resource::Type type = resource.getType();

return type == Resource::MainResource || type == Resource::Raw || type == Resource::TextTrack || type == Resource::Media || type == Resource::Manifest || type == Resource::ImportResource;

}

#endif

@@ -105,7 +105,7 @@ class CORE_EXPORT RawResourceClient : public ResourceClient {

public:

~RawResourceClient() override {}

static ResourceClientType expectedType() { return RawResourceType; }

- ResourceClientType resourceClientType() const final { return expectedType(); }

+ ResourceClientType getResourceClientType() const final { return expectedType(); }

virtual void dataSent(Resource*, unsigned long long /* bytesSent */, unsigned long long /* totalBytesToBeSent */) { }

virtual void responseReceived(Resource*, const ResourceResponse&, PassOwnPtr<WebDataConsumerHandle>) { }