Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / css / FontFaceCache.h

diff --git a/src/third_party/WebKit/Source/core/css/FontFaceCache.h b/src/third_party/WebKit/Source/core/css/FontFaceCache.h
index 457bc3b..0e7013a 100644 (file)
--- a/src/third_party/WebKit/Source/core/css/FontFaceCache.h
+++ b/src/third_party/WebKit/Source/core/css/FontFaceCache.h
@@ -33,7 +33,7 @@
 #include "wtf/ListHashSet.h"
 #include "wtf/text/StringHash.h"
 
-namespace WebCore {
+namespace blink {
 
 class FontFace;
 class CSSFontSelector;
@@ -50,7 +50,8 @@ public:
     // a result of egregious spaghettification in FontFace/FontFaceSet.
     void add(CSSFontSelector*, const StyleRuleFontFace*, PassRefPtrWillBeRawPtr<FontFace>);
     void remove(const StyleRuleFontFace*);
-    void clear();
+    void clearCSSConnected();
+    void clearAll();
     void addFontFace(CSSFontSelector*, PassRefPtrWillBeRawPtr<FontFace>, bool cssConnected);
     void removeFontFace(FontFace*, bool cssConnected);
 
@@ -58,7 +59,7 @@ public:
     // but this function uses FontDescription/family pair.
     CSSSegmentedFontFace* get(const FontDescription&, const AtomicString& family);
 
-    const ListHashSet<RefPtrWillBeMember<FontFace> >& cssConnectedFontFaces() const { return m_cssConnectedFontFaces; }
+    const WillBeHeapListHashSet<RefPtrWillBeMember<FontFace> >& cssConnectedFontFaces() const { return m_cssConnectedFontFaces; }
 
     unsigned version() const { return m_version; }
     void incrementVersion() { ++m_version; }
@@ -72,8 +73,7 @@ private:
     FamilyToTraitsMap m_fontFaces;
     FamilyToTraitsMap m_fonts;
     StyleRuleToFontFace m_styleRuleToFontFace;
-    // FIXME: Oilpan: Replace by HeapLinkedHashSet or HeapListHashSet.
-    ListHashSet<RefPtrWillBeMember<FontFace> > m_cssConnectedFontFaces;
+    WillBeHeapListHashSet<RefPtrWillBeMember<FontFace> > m_cssConnectedFontFaces;
 
     // FIXME: See if this could be ditched
     // Used to compare Font instances, and the usage seems suspect.