Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / platform / fonts / FontCache.h

diff --git a/src/third_party/WebKit/Source/platform/fonts/FontCache.h b/src/third_party/WebKit/Source/platform/fonts/FontCache.h
index 0aef86a..c6948bb 100644 (file)
--- a/src/third_party/WebKit/Source/platform/fonts/FontCache.h
+++ b/src/third_party/WebKit/Source/platform/fonts/FontCache.h
@@ -32,11 +32,11 @@
 
 #include <limits.h>
 #include "platform/PlatformExport.h"
+#include "platform/fonts/FontFaceCreationParams.h"
 #include "wtf/Forward.h"
 #include "wtf/HashMap.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefPtr.h"
-#include "wtf/Vector.h"
 #include "wtf/text/CString.h"
 #include "wtf/text/WTFString.h"
 #include "wtf/unicode/Unicode.h"
@@ -55,9 +55,10 @@ struct IDWriteFactory;
 
 class SkTypeface;
 
-namespace WebCore {
+namespace blink {
 
 class FontCacheClient;
+class FontFaceCreationParams;
 class FontPlatformData;
 class FontData;
 class FontDescription;
@@ -121,6 +122,7 @@ public:
     struct PlatformFallbackFont {
         String name;
         CString filename;
+        int fontconfigInterfaceId;
         int ttcIndex;
         bool isBold;
         bool isItalic;
@@ -143,15 +145,16 @@ private:
     }
 
     // FIXME: This method should eventually be removed.
-    FontPlatformData* getFontPlatformData(const FontDescription&, const AtomicString& family, bool checkingAlternateName = false);
+    FontPlatformData* getFontPlatformData(const FontDescription&, const FontFaceCreationParams&, bool checkingAlternateName = false);
 
     // These methods are implemented by each platform.
-    FontPlatformData* createFontPlatformData(const FontDescription&, const AtomicString& family, float fontSize);
+    FontPlatformData* createFontPlatformData(const FontDescription&, const FontFaceCreationParams&, float fontSize);
 
     // Implemented on skia platforms.
-    PassRefPtr<SkTypeface> createTypeface(const FontDescription&, const AtomicString& family, CString& name);
+    PassRefPtr<SkTypeface> createTypeface(const FontDescription&, const FontFaceCreationParams&, CString& name);
 
     PassRefPtr<SimpleFontData> fontDataFromFontPlatformData(const FontPlatformData*, ShouldRetain = Retain);
+    PassRefPtr<SimpleFontData> fallbackOnStandardFontStyle(const FontDescription&, UChar32);
 
     // Don't purge if this count is > 0;
     int m_purgePreventCount;
@@ -177,6 +180,6 @@ public:
     ~FontCachePurgePreventer() { FontCache::fontCache()->enablePurging(); }
 };
 
-}
+} // namespace blink
 
 #endif