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

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/animation/CSSColorInterpolationType.cpp ('k') | third_party/WebKit/Source/core/css/CSSFontFace.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 90b3b80f4c1b50d9e1c91d2be617c55f33513cff..662b2e03b724988294417608eca7932dd98dca09 100644

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

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

@@ -108,7 +108,7 @@ public:

Vector<UnicodeRange> m_ranges; // If empty, represents the whole code space.

};

- FontFace::LoadStatus loadStatus() const { return m_fontFace->loadStatus(); }

+ FontFace::LoadStatusType loadStatus() const { return m_fontFace->loadStatus(); }

bool maybeScheduleFontLoad(const FontDescription&, UChar32);

bool maybeScheduleFontLoad(const FontDescription&, const FontDataRange&);

void load();

@@ -119,7 +119,7 @@ public:

DECLARE_TRACE();

private:

- void setLoadStatus(FontFace::LoadStatus);

+ void setLoadStatus(FontFace::LoadStatusType);

UnicodeRangeSet m_ranges;

RawPtrWillBeMember<CSSSegmentedFontFace> m_segmentedFontFace;