| 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;
|
|
|