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

Unified Diff: third_party/WebKit/Source/core/fetch/FontResource.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
Index: third_party/WebKit/Source/core/fetch/FontResource.h
diff --git a/third_party/WebKit/Source/core/fetch/FontResource.h b/third_party/WebKit/Source/core/fetch/FontResource.h
index 3bda896ad77978342f13dfe305e4ece218fb10d8..b223f115a4f6bbfc3eb3204f85295e4e8e0587f3 100644
--- a/third_party/WebKit/Source/core/fetch/FontResource.h
+++ b/third_party/WebKit/Source/core/fetch/FontResource.h
@@ -104,7 +104,7 @@ class FontResourceClient : public ResourceClient {
public:
~FontResourceClient() override {}
static ResourceClientType expectedType() { return FontType; }
- ResourceClientType resourceClientType() const final { return expectedType(); }
+ ResourceClientType getResourceClientType() const final { return expectedType(); }
virtual void fontLoaded(FontResource*) {}
virtual void didStartFontLoad(FontResource*) {}
virtual void fontLoadShortLimitExceeded(FontResource*) {}

Powered by Google App Engine
This is Rietveld 408576698