Index: Source/core/css/CSSFontSelector.h |
diff --git a/Source/core/css/CSSFontSelector.h b/Source/core/css/CSSFontSelector.h |
index e0b1d7a4321447eee3a59062701bc23560c911c4..bee31c288cb2d0db9f2a84e846f45181f5c1bbac 100644 |
--- a/Source/core/css/CSSFontSelector.h |
+++ b/Source/core/css/CSSFontSelector.h |
@@ -48,6 +48,7 @@ class FontDescription; |
class StyleRuleFontFace; |
class FontLoader { |
+ DISALLOW_ALLOCATION(); |
public: |
explicit FontLoader(ResourceFetcher*); |
@@ -56,6 +57,8 @@ public: |
void clearResourceFetcher(); |
+ void trace(Visitor*) { } |
+ |
private: |
void beginLoadTimerFired(Timer<FontLoader>*); |
@@ -66,9 +69,9 @@ private: |
class CSSFontSelector FINAL : public FontSelector { |
public: |
- static PassRefPtr<CSSFontSelector> create(Document* document) |
+ static PassRefPtrWillBeRawPtr<CSSFontSelector> create(Document* document) |
{ |
- return adoptRef(new CSSFontSelector(document)); |
+ return adoptRefWillBeNoop(new CSSFontSelector(document)); |
} |
virtual ~CSSFontSelector(); |
@@ -98,6 +101,8 @@ public: |
void beginLoadingFontSoon(FontResource*); |
void loadPendingFonts(); |
+ virtual void trace(Visitor*); |
+ |
private: |
explicit CSSFontSelector(Document*); |
@@ -106,7 +111,7 @@ private: |
Document* m_document; |
// FIXME: Move to Document or StyleEngine. |
FontFaceCache m_fontFaceCache; |
- WillBePersistentHeapHashSet<RawPtrWillBeWeakMember<CSSFontSelectorClient> > m_clients; |
+ WillBeHeapHashSet<RawPtrWillBeWeakMember<CSSFontSelectorClient> > m_clients; |
FontLoader m_fontLoader; |
GenericFontFamilySettings m_genericFontFamilySettings; |