| Index: Source/core/css/CSSSegmentedFontFace.h
|
| diff --git a/Source/core/css/CSSSegmentedFontFace.h b/Source/core/css/CSSSegmentedFontFace.h
|
| index 6507d1763228f16a75b04eb1a8e93f6df624c66b..cee617822a444f4b2e486895e219a3893a807f3c 100644
|
| --- a/Source/core/css/CSSSegmentedFontFace.h
|
| +++ b/Source/core/css/CSSSegmentedFontFace.h
|
| @@ -26,6 +26,7 @@
|
| #ifndef CSSSegmentedFontFace_h
|
| #define CSSSegmentedFontFace_h
|
|
|
| +#include "heap/Handle.h"
|
| #include <wtf/HashMap.h>
|
| #include <wtf/PassRefPtr.h>
|
| #include <wtf/RefCounted.h>
|
| @@ -40,12 +41,14 @@ class FontData;
|
| class FontDescription;
|
| class SegmentedFontData;
|
|
|
| -class CSSSegmentedFontFace : public RefCounted<CSSSegmentedFontFace> {
|
| +class CSSSegmentedFontFace : public HeapAllocatedFinalized<CSSSegmentedFontFace> {
|
| + DECLARE_GC_TYPE_MARKER
|
| public:
|
| - static PassRefPtr<CSSSegmentedFontFace> create(CSSFontSelector* selector) { return adoptRef(new CSSSegmentedFontFace(selector)); }
|
| + static Result<CSSSegmentedFontFace> create(CSSFontSelector* selector) { return adopt(new CSSSegmentedFontFace(selector)); }
|
| ~CSSSegmentedFontFace();
|
|
|
| CSSFontSelector* fontSelector() const { return m_fontSelector; }
|
| + void clearFontSelector() { m_fontSelector = 0; }
|
|
|
| void fontLoaded(CSSFontFace*);
|
|
|
| @@ -56,13 +59,15 @@ public:
|
| class LoadFontCallback : public RefCounted<LoadFontCallback> {
|
| public:
|
| virtual ~LoadFontCallback() { }
|
| - virtual void notifyLoaded(CSSSegmentedFontFace*) = 0;
|
| - virtual void notifyError(CSSSegmentedFontFace*) = 0;
|
| + virtual void notifyLoaded(Handle<CSSSegmentedFontFace>) = 0;
|
| + virtual void notifyError(Handle<CSSSegmentedFontFace>) = 0;
|
| };
|
|
|
| bool checkFont() const;
|
| void loadFont(const FontDescription&, PassRefPtr<LoadFontCallback> loadCallback);
|
|
|
| + void accept(Visitor*) const { }
|
| +
|
| private:
|
| CSSSegmentedFontFace(CSSFontSelector*);
|
|
|
|
|