| 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..36a1989731a3ac90306384ab9673f9478fca0c55 100644
|
| --- a/third_party/WebKit/Source/core/css/FontFace.h
|
| +++ b/third_party/WebKit/Source/core/css/FontFace.h
|
| @@ -95,6 +95,7 @@ public:
|
| DOMException* error() const { return m_error; }
|
| FontTraits traits() const;
|
| CSSFontFace* cssFontFace() { return m_cssFontFace.get(); }
|
| + ScriptPromise binaryData(ScriptState*) const;
|
|
|
| DECLARE_VIRTUAL_TRACE();
|
|
|
| @@ -112,15 +113,17 @@ public:
|
| // ActiveDOMObject
|
| bool hasPendingActivity() const override;
|
|
|
| +protected:
|
| + void initCSSFontFace(Document*, PassRefPtrWillBeRawPtr<CSSValue> src);
|
| + FontFace(ExecutionContext*, const AtomicString& family, const FontFaceDescriptors&);
|
| +
|
| private:
|
| static PassRefPtrWillBeRawPtr<FontFace> create(ExecutionContext*, const AtomicString& family, PassRefPtr<DOMArrayBuffer> source, const FontFaceDescriptors&);
|
| static PassRefPtrWillBeRawPtr<FontFace> create(ExecutionContext*, const AtomicString& family, PassRefPtr<DOMArrayBufferView>, const FontFaceDescriptors&);
|
| static PassRefPtrWillBeRawPtr<FontFace> create(ExecutionContext*, const AtomicString& family, const String& source, const FontFaceDescriptors&);
|
|
|
| explicit FontFace(ExecutionContext*);
|
| - FontFace(ExecutionContext*, const AtomicString& family, const FontFaceDescriptors&);
|
|
|
| - void initCSSFontFace(Document*, PassRefPtrWillBeRawPtr<CSSValue> src);
|
| void initCSSFontFace(const unsigned char* data, size_t);
|
| void setPropertyFromString(const Document*, const String&, CSSPropertyID, ExceptionState* = 0);
|
| bool setPropertyFromStyle(const StylePropertySet&, CSSPropertyID);
|
|
|