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

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

index e104dff16ee489a67134c138c0c685c23d6339d2..aa92d4971d607147a487ba97a7f4ab91edff19e4 100644

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

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

@@ -103,8 +103,8 @@ DEFINE_RESOURCE_TYPE_CASTS(Font);

class FontResourceClient : public ResourceClient {

public:

~FontResourceClient() override {}

- static bool isExpectedType(ResourceClient* client) { return client->resourceClientType() == FontType; }

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

+ static bool isExpectedType(ResourceClient* client) { return client->getResourceClientType() == FontType; }

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

virtual void fontLoaded(FontResource*) {}

virtual void didStartFontLoad(FontResource*) {}

virtual void fontLoadShortLimitExceeded(FontResource*) {}

« no previous file with comments | « third_party/WebKit/Source/core/fetch/FetchRequest.h ('k') | third_party/WebKit/Source/core/fetch/ImageResource.h » ('j') | no next file with comments »