Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(295)

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: 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
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 56ac47f8e35b074761f99ac8406e19d32dde287d..febd218d4c997980c6446ec9c48116f865636f87 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
@@ -104,8 +104,8 @@ inline PassRefPtrWillBeRawPtr<RawResource> toRawResource(const PassRefPtrWillBeR
class CORE_EXPORT RawResourceClient : public ResourceClient {
public:
~RawResourceClient() override {}
- static bool isExpectedType(ResourceClient* client) { return client->resourceClientType() == RawResourceType; }
- ResourceClientType resourceClientType() const final { return RawResourceType; }
+ static bool isExpectedType(ResourceClient* client) { return client->getResourceClientType() == RawResourceType; }
+ ResourceClientType getResourceClientType() const final { return RawResourceType; }
virtual void dataSent(Resource*, unsigned long long /* bytesSent */, unsigned long long /* totalBytesToBeSent */) { }
virtual void responseReceived(Resource*, const ResourceResponse&, PassOwnPtr<WebDataConsumerHandle>) { }
« no previous file with comments | « third_party/WebKit/Source/core/fetch/MemoryCache.cpp ('k') | third_party/WebKit/Source/core/fetch/Resource.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698