Upstream version 5.34.104.0

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

diff --git a/src/third_party/WebKit/Source/core/css/CSSSegmentedFontFace.h b/src/third_party/WebKit/Source/core/css/CSSSegmentedFontFace.h
index 8c32d59..52b443e 100644 (file)
--- a/src/third_party/WebKit/Source/core/css/CSSSegmentedFontFace.h
+++ b/src/third_party/WebKit/Source/core/css/CSSSegmentedFontFace.h
@@ -53,8 +53,8 @@ public:
 
     void fontLoaded(CSSFontFace*);
 
-    void addFontFace(PassRefPtr<CSSFontFace>, bool cssConnected);
-    void removeFontFace(PassRefPtr<CSSFontFace>);
+    void addFontFace(PassRefPtr<FontFace>, bool cssConnected);
+    void removeFontFace(PassRefPtr<FontFace>);
     bool isEmpty() const { return m_fontFaces.isEmpty(); }
 
     PassRefPtr<FontData> getFontData(const FontDescription&);
@@ -68,7 +68,6 @@ public:
 
     bool checkFont(const String&) const;
     void loadFont(const FontDescription&, const String&, PassRefPtr<LoadFontCallback>);
-    Vector<RefPtr<FontFace> > fontFaces(const String& text) const;
     void willUseFontData(const FontDescription&);
 
 private:
@@ -79,7 +78,7 @@ private:
     bool isLoading() const;
     bool isLoaded() const;
 
-    typedef ListHashSet<RefPtr<CSSFontFace> > FontFaceList;
+    typedef ListHashSet<RefPtr<FontFace> > FontFaceList;
 
     CSSFontSelector* m_fontSelector;
     FontTraitsMask m_traitsMask;