Pass around preferred language to font fallback selection.

chrome/renderer/renderer_webkitclient_impl.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/renderer_webkitclient_impl.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/platform_file.h"
 #include "base/shared_memory.h"
@@ skipping 97 matching lines @@
 
 class RendererWebKitClientImpl::SandboxSupport
     : public WebKit::WebSandboxSupport {
  public:
 #if defined(OS_WIN)
   virtual bool ensureFontLoaded(HFONT);
 #elif defined(OS_MACOSX)
   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);
 
  private:
   // WebKit likes to ask us for the correct font family to use for a set of
   // unicode code points. It needs this information frequently so we cache it
   // here. The key in this map is an array of 16-bit UTF16 values from WebKit.
   // The value is a string containing the correct font family.
   base::Lock unicode_font_families_mutex_;
   std::map<std::string, std::string> unicode_font_families_;
@@ skipping 295 matching lines @@
 
 bool RendererWebKitClientImpl::SandboxSupport::ensureFontLoaded(HFONT font) {
   LOGFONT logfont;
   GetObject(font, sizeof(LOGFONT), &logfont);
   return RenderThread::current()->Send(new ViewHostMsg_PreCacheFont(logfont));
 }
 
 #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]));
   const std::map<std::string, std::string>::const_iterator iter =
       unicode_font_families_.find(key);
   if (iter != unicode_font_families_.end())
     return WebString::fromUTF8(iter->second);
 
   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);
 }
 
 #elif defined(OS_MACOSX)
 
 bool RendererWebKitClientImpl::SandboxSupport::loadFont(NSFont* srcFont,
     ATSFontContainerRef* out) {
   DCHECK(srcFont);
@@ skipping 97 matching lines @@
   return WebString::fromUTF8(signed_public_key);
 }
 
 //------------------------------------------------------------------------------
 
 WebBlobRegistry* RendererWebKitClientImpl::blobRegistry() {
   if (!blob_registry_.get())
     blob_registry_.reset(new WebBlobRegistryImpl(RenderThread::current()));
   return blob_registry_.get();
 }