third_party/WebKit/Source/core/fetch/FontResource.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/core/fetch/FontResource.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 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/FontResource.h ('k') | third_party/WebKit/Source/core/fetch/ImageResource.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/fetch/FontResource.cpp

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

index f349b91ef349d13ebea03f38a678448fcf47156a..c4b70e828cf308577c92ed6c52fc6a5d884ef832 100644

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

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

@@ -113,7 +113,7 @@ void FontResource::load(ResourceFetcher*, const ResourceLoaderOptions& options)

void FontResource::didAddClient(ResourceClient* c)

{

- ASSERT(c->resourceClientType() == FontResourceClient::expectedType());

+ ASSERT(c->getResourceClientType() == FontResourceClient::expectedType());

Resource::didAddClient(c);

if (!isLoading())

static_cast<FontResourceClient*>(c)->fontLoaded(this);