third_party/WebKit/Source/core/loader/resource/FontResource.h - Issue 2611823003: ABANDONED CL: Changes to compile and pass tests after Big Blink Rename (excluding functions).

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/loader/resource/FontResource.h

Issue 2611823003: ABANDONED CL: Changes to compile and pass tests after Big Blink Rename (excluding functions). (Closed)

Patch Set: Inducing merge conflicts to force human review and changes after rename. Created 3 years, 11 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:

Index: third_party/WebKit/Source/core/loader/resource/FontResource.h

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

index e7cfae30383c4ea97f74801f3cf720cd763d55fd..af04855ba40dac9b21584586f25c26ad3c6527d5 100644

--- a/third_party/WebKit/Source/core/loader/resource/FontResource.h

+++ b/third_party/WebKit/Source/core/loader/resource/FontResource.h

@@ -120,6 +120,8 @@ class CORE_EXPORT FontResource final : public Resource {

};

DEFINE_RESOURCE_TYPE_CASTS(Font);

+/* DO NOT SUBMIT - Conflict resolution helper:

+ * Above we should have Font, not kFont */

class FontResourceClient : public ResourceClient {

public: