third_party/WebKit/Source/core/css/CSSFontFace.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/CSSFontFace.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

« no previous file with comments | « third_party/WebKit/Source/core/css/CSSFontFace.h ('k') | third_party/WebKit/Source/core/css/CSSImageGeneratorValue.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/css/CSSFontFace.cpp

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

index eb1cc2b5263b7a8b64bbb05d65ae496b04834e57..b464c6a36f930a31847e1c9a2a8a3b0744626564 100644

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

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

@@ -63,7 +63,7 @@ void CSSFontFace::fontLoaded(RemoteFontFaceSource* source)

if (loadStatus() == FontFace::Loading) {

if (source->isValid()) {

setLoadStatus(FontFace::Loaded);

- } else if (source->displayPeriod() == RemoteFontFaceSource::FailurePeriod) {

+ } else if (source->getDisplayPeriod() == RemoteFontFaceSource::FailurePeriod) {

m_sources.clear();

setLoadStatus(FontFace::Error);

} else {

@@ -166,7 +166,7 @@ void CSSFontFace::load(const FontDescription& fontDescription)

setLoadStatus(FontFace::Error);

}

-void CSSFontFace::setLoadStatus(FontFace::LoadStatus newStatus)

+void CSSFontFace::setLoadStatus(FontFace::LoadStatusType newStatus)

{

ASSERT(m_fontFace);

if (newStatus == FontFace::Error)

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