third_party/WebKit/Source/core/css/FontFace.cpp - Issue 1729013002: blink: Rename enums and functions to not collide with 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/css/FontFace.cpp

Issue 1729013002: blink: Rename enums and functions to not collide with chromium style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: get-names-3: . 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/css/FontFace.cpp

diff --git a/third_party/WebKit/Source/core/css/FontFace.cpp b/third_party/WebKit/Source/core/css/FontFace.cpp

index 11a1c2a6f9ed5d1f3342abfad4e09bb9532d3c73..3c49e503f5fe142314b280f1ab76e4e95eafd2ff 100644

--- a/third_party/WebKit/Source/core/css/FontFace.cpp

+++ b/third_party/WebKit/Source/core/css/FontFace.cpp

@@ -327,7 +327,7 @@ String FontFace::status() const

return emptyString();

}

-void FontFace::setLoadStatus(LoadStatus status)

+void FontFace::setLoadStatus(LoadStatusType status)

{

m_status = status;

ASSERT(m_status != Error || m_error);

« no previous file with comments | « third_party/WebKit/Source/core/css/FontFace.h ('k') | third_party/WebKit/Source/core/css/MediaQuery.h » ('j') | no next file with comments »