Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(319)

Unified Diff: third_party/WebKit/Source/core/css/FontFace.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
Index: third_party/WebKit/Source/core/css/FontFace.h
diff --git a/third_party/WebKit/Source/core/css/FontFace.h b/third_party/WebKit/Source/core/css/FontFace.h
index ce45e44282cd39d244dc65e8a07490183c7f78d2..d243d62f7a8f27eb7f6e0f313482c5999a402e6a 100644
--- a/third_party/WebKit/Source/core/css/FontFace.h
+++ b/third_party/WebKit/Source/core/css/FontFace.h
@@ -60,7 +60,7 @@ class FontFace : public RefCountedWillBeGarbageCollectedFinalized<FontFace>, pub
DEFINE_WRAPPERTYPEINFO();
WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(FontFace);
public:
- enum LoadStatus { Unloaded, Loading, Loaded, Error };
+ enum LoadStatusType { Unloaded, Loading, Loaded, Error };
static PassRefPtrWillBeRawPtr<FontFace> create(ExecutionContext*, const AtomicString& family, StringOrArrayBufferOrArrayBufferView&, const FontFaceDescriptors&);
static PassRefPtrWillBeRawPtr<FontFace> create(Document*, const StyleRuleFontFace*);
@@ -89,8 +89,8 @@ public:
ScriptPromise load(ScriptState*);
- LoadStatus loadStatus() const { return m_status; }
- void setLoadStatus(LoadStatus);
+ LoadStatusType loadStatus() const { return m_status; }
+ void setLoadStatus(LoadStatusType);
void setError(DOMException* = nullptr);
DOMException* error() const { return m_error; }
FontTraits traits() const;
@@ -140,7 +140,7 @@ private:
RefPtrWillBeMember<CSSValue> m_variant;
RefPtrWillBeMember<CSSValue> m_featureSettings;
RefPtrWillBeMember<CSSValue> m_display;
- LoadStatus m_status;
+ LoadStatusType m_status;
PersistentWillBeMember<DOMException> m_error;
PersistentWillBeMember<LoadedProperty> m_loadedProperty;
« no previous file with comments | « third_party/WebKit/Source/core/css/ElementRuleCollector.cpp ('k') | third_party/WebKit/Source/core/css/FontFace.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698