Upstream version 11.39.250.0

[platform/framework/web/crosswalk.git] / src / third_party / skia / src / ports / SkRemotableFontMgr_win_dw.cpp

diff --git a/src/third_party/skia/src/ports/SkRemotableFontMgr_win_dw.cpp b/src/third_party/skia/src/ports/SkRemotableFontMgr_win_dw.cpp
index 936ab9b..498f21f 100644 (file)
--- a/src/third_party/skia/src/ports/SkRemotableFontMgr_win_dw.cpp
+++ b/src/third_party/skia/src/ports/SkRemotableFontMgr_win_dw.cpp
@@ -290,6 +290,8 @@ public:
           fIdentity.fDataId = SkFontIdentity::kInvalidDataId;
         }
 
+        virtual ~FontFallbackRenderer() { }
+
         // IDWriteTextRenderer methods
         virtual HRESULT STDMETHODCALLTYPE DrawGlyphRun(
             void* clientDrawingContext,
@@ -406,11 +408,21 @@ public:
         SkFontIdentity fIdentity;
     };
 
+#ifdef SK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER
+    virtual SkFontIdentity matchNameStyleCharacter(const char familyName[],
+                                                   const SkFontStyle& pattern,
+                                                   const char* bcp47[], int bcp47Count,
+                                                   SkUnichar character) const SK_OVERRIDE
+    {
+#else
     virtual SkFontIdentity matchNameStyleCharacter(const char familyName[],
                                                    const SkFontStyle& pattern,
-                                                   const char bpc47[],
-                                                   SkUnichar character) const  SK_OVERRIDE
+                                                   const char bcp47_val[],
+                                                   SkUnichar character) const SK_OVERRIDE
     {
+        const char** bcp47 = &bcp47_val;
+        int bcp47Count = bcp47_val ? 1 : 0;
+#endif
         SkFontIdentity identity = { SkFontIdentity::kInvalidDataId };
 
         IDWriteFactory* dwFactory = sk_get_dwrite_factory();
@@ -429,13 +441,14 @@ public:
             HR_GENERAL(sk_cstring_to_wchar(familyName, &dwFamilyName), NULL, identity);
         }
 
-        const SkSMallocWCHAR* dwBpc47;
-        SkSMallocWCHAR dwBpc47Local;
-        if (NULL == bpc47) {
-            dwBpc47 = &fLocaleName;
+        const SkSMallocWCHAR* dwBcp47;
+        SkSMallocWCHAR dwBcp47Local;
+        if (bcp47Count < 1) {
+            dwBcp47 = &fLocaleName;
         } else {
-            HR_GENERAL(sk_cstring_to_wchar(bpc47, &dwBpc47Local), NULL, identity);
-            dwBpc47 = &dwBpc47Local;
+            //TODO: support fallback stack.
+            HR_GENERAL(sk_cstring_to_wchar(bcp47[bcp47Count-1], &dwBcp47Local), NULL, identity);
+            dwBcp47 = &dwBcp47Local;
         }
 
         SkTScopedComPtr<IDWriteTextFormat> fallbackFormat;
@@ -445,7 +458,7 @@ public:
                                                dwStyle.fSlant,
                                                dwStyle.fWidth,
                                                72.0f,
-                                               *dwBpc47,
+                                               *dwBcp47,
                                                &fallbackFormat),
                    "Could not create text format.",
                    identity);