Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / platform / fonts / linux / FontCacheLinux.cpp

diff --git a/src/third_party/WebKit/Source/platform/fonts/linux/FontCacheLinux.cpp b/src/third_party/WebKit/Source/platform/fonts/linux/FontCacheLinux.cpp
index 358a3e1..252f980 100644 (file)
--- a/src/third_party/WebKit/Source/platform/fonts/linux/FontCacheLinux.cpp
+++ b/src/third_party/WebKit/Source/platform/fonts/linux/FontCacheLinux.cpp
@@ -32,21 +32,21 @@
 #include "public/platform/Platform.h"
 #include "wtf/text/CString.h"
 
-namespace WebCore {
+namespace blink {
 
 void FontCache::getFontForCharacter(UChar32 c, const char* preferredLocale, FontCache::PlatformFallbackFont* fallbackFont)
 {
-    blink::WebFallbackFont webFallbackFont;
-    if (blink::Platform::current()->sandboxSupport()) {
-        blink::Platform::current()->sandboxSupport()->getFallbackFontForCharacter(c, preferredLocale, &webFallbackFont);
-    } else {
-        blink::WebFontInfo::fallbackFontForChar(c, preferredLocale, &webFallbackFont);
-    }
+    WebFallbackFont webFallbackFont;
+    if (Platform::current()->sandboxSupport())
+        Platform::current()->sandboxSupport()->getFallbackFontForCharacter(c, preferredLocale, &webFallbackFont);
+    else
+        WebFontInfo::fallbackFontForChar(c, preferredLocale, &webFallbackFont);
     fallbackFont->name = String::fromUTF8(CString(webFallbackFont.name));
     fallbackFont->filename = webFallbackFont.filename;
+    fallbackFont->fontconfigInterfaceId = webFallbackFont.fontconfigInterfaceId;
     fallbackFont->ttcIndex = webFallbackFont.ttcIndex;
     fallbackFont->isBold = webFallbackFont.isBold;
     fallbackFont->isItalic = webFallbackFont.isItalic;
 }
 
-}
+} // namespace blink