Pass around preferred language to font fallback selection.

chrome/renderer/renderer_webkitclient_impl.cc

Index: chrome/renderer/renderer_webkitclient_impl.cc
diff --git a/chrome/renderer/renderer_webkitclient_impl.cc b/chrome/renderer/renderer_webkitclient_impl.cc
index 4cb215f5873a6372edc3b808f3a88378b38a7b1e..c16a553480571496c86a8215b784b786590b9619 100644
--- a/chrome/renderer/renderer_webkitclient_impl.cc
+++ b/chrome/renderer/renderer_webkitclient_impl.cc
@@ -115,7 +115,14 @@ class RendererWebKitClientImpl::SandboxSupport
   virtual bool loadFont(NSFont* srcFont, ATSFontContainerRef* out);
 #elif defined(OS_LINUX)
   virtual WebKit::WebString getFontFamilyForCharacters(
-      const WebKit::WebUChar* characters, size_t numCharacters);
+      const WebKit::WebUChar* characters,
+      size_t numCharacters,
+      const char* preferred_locale);
+  // TODO(kochi): Remove this old interface once WebKit side of the change
+  // https://bugs.webkit.org/show_bug.cgi?id=55453 is landed.
+  virtual WebKit::WebString getFontFamilyForCharacters(
+      const WebKit::WebUChar* characters,
+      size_t numCharacters);
   virtual void getRenderStyleForStrike(
       const char* family, int sizeAndStyle, WebKit::WebFontRenderStyle* out);
 
@@ -431,7 +438,9 @@ bool RendererWebKitClientImpl::SandboxSupport::ensureFontLoaded(HFONT font) {
 #elif defined(OS_LINUX)
 
 WebString RendererWebKitClientImpl::SandboxSupport::getFontFamilyForCharacters(
-    const WebKit::WebUChar* characters, size_t num_characters) {
+    const WebKit::WebUChar* characters,
+    size_t num_characters,
+    const char* preferred_locale) {
   base::AutoLock lock(unicode_font_families_mutex_);
   const std::string key(reinterpret_cast<const char*>(characters),
                         num_characters * sizeof(characters[0]));
@@ -442,11 +451,20 @@ WebString RendererWebKitClientImpl::SandboxSupport::getFontFamilyForCharacters(
 
   const std::string family_name =
       renderer_sandbox_support::getFontFamilyForCharacters(characters,
-                                                           num_characters);
+                                                           num_characters,
+                                                           preferred_locale);
   unicode_font_families_.insert(make_pair(key, family_name));
   return WebString::fromUTF8(family_name);
 }
 
+// TODO(kochi): Remove this once the WebKit side of this change in
+// https://bugs.webkit.org/show_bug.cgi?id=55453 is landed.
+WebString RendererWebKitClientImpl::SandboxSupport::getFontFamilyForCharacters(
+    const WebKit::WebUChar* characters,
+    size_t num_characters) {
+  return getFontFamilyForCharacters(characters, num_characters, "");
+}
+
 void RendererWebKitClientImpl::SandboxSupport::getRenderStyleForStrike(
     const char* family, int sizeAndStyle, WebKit::WebFontRenderStyle* out) {
   renderer_sandbox_support::getRenderStyleForStrike(family, sizeAndStyle, out);