Use new getFontFamilyForCharacters() API.

content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc

 // Copyright (c) 2011 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 "content/ppapi_plugin/ppapi_webkitplatformsupport_impl.h"
 
 #include <map>
 
 #include "base/synchronization/lock.h"
 #include "base/logging.h"
 #include "base/string16.h"
 #include "build/build_config.h"
 #include "content/common/child_process_messages.h"
 #include "content/common/child_thread.h"
 #include "ipc/ipc_sync_message_filter.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSerializedScriptValue.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
 
 #if defined(OS_WIN)
 #include "third_party/WebKit/Source/WebKit/chromium/public/win/WebSandboxSupport.h"
 #elif defined(OS_MACOSX)
 #include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebSandboxSupport.h"
 #elif defined(OS_POSIX)
 #include "content/common/child_process_sandbox_support_impl_linux.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/linux/WebFontFamily.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/linux/WebSandboxSupport.h"
 #endif
 
 using WebKit::WebSandboxSupport;
 using WebKit::WebString;
 using WebKit::WebUChar;
 
 typedef struct CGFont* CGFontRef;
 
 class PpapiWebKitPlatformSupportImpl::SandboxSupport : public WebSandboxSupport {
  public:
   virtual ~SandboxSupport() {}
 
 #if defined(OS_WIN)
   virtual bool ensureFontLoaded(HFONT);
 #elif defined(OS_MACOSX)
   virtual bool loadFont(
       NSFont* srcFont, CGFontRef* out, uint32_t* fontID);
 #elif defined(OS_POSIX)
-  virtual WebString getFontFamilyForCharacters(
+  virtual void getFontFamilyForCharacters(
       const WebUChar* characters,
       size_t numCharacters,
-      const char* preferred_locale);
+      const char* preferred_locale,
+      WebKit::WebFontFamily* family);
   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<string16, std::string> unicode_font_families_;
+  std::map<string16, WebKit::WebFontFamily> unicode_font_families_;
 #endif
 };
 
 #if defined(OS_WIN)
 
 bool PpapiWebKitPlatformSupportImpl::SandboxSupport::ensureFontLoaded(
     HFONT font) {
   LOGFONT logfont;
   GetObject(font, sizeof(LOGFONT), &logfont);
 
   return ChildThread::current()->sync_message_filter()->Send(
       new ChildProcessHostMsg_PreCacheFont(logfont));
 }
 
 #elif defined(OS_MACOSX)
 
 bool PpapiWebKitPlatformSupportImpl::SandboxSupport::loadFont(
     NSFont* src_font,
     CGFontRef* out,
     uint32_t* font_id) {
   // TODO(brettw) this should do the something similar to what
   // RendererWebKitClientImpl does and request that the browser load the font.
   NOTIMPLEMENTED();
   return false;
 }
 
 #elif defined(OS_POSIX)
 
-WebString
+void
 PpapiWebKitPlatformSupportImpl::SandboxSupport::getFontFamilyForCharacters(
     const WebUChar* characters,
     size_t num_characters,
-    const char* preferred_locale) {
+    const char* preferred_locale,
+    WebKit::WebFontFamily* family) {
   base::AutoLock lock(unicode_font_families_mutex_);
   const string16 key(characters, num_characters);
-  const std::map<string16, std::string>::const_iterator iter =
+  const std::map<string16, WebKit::WebFontFamily>::const_iterator iter =
       unicode_font_families_.find(key);
-  if (iter != unicode_font_families_.end())
-    return WebString::fromUTF8(iter->second);
+  if (iter != unicode_font_families_.end()) {
+    family->name = iter->second.name;
+    family->isBold = iter->second.isBold;
+    family->isItalic = iter->second.isItalic;
+    return;
+  }
 
-  const std::string family_name = content::GetFontFamilyForCharacters(
+  content::GetFontFamilyForCharacters(
       characters,
       num_characters,
-      preferred_locale);
-  unicode_font_families_.insert(make_pair(key, family_name));
-  return WebString::fromUTF8(family_name);
+      preferred_locale,
+      family);
+  unicode_font_families_.insert(make_pair(key, *family));
 }
 
 void PpapiWebKitPlatformSupportImpl::SandboxSupport::getRenderStyleForStrike(
     const char* family, int sizeAndStyle, WebKit::WebFontRenderStyle* out) {
   content::GetRenderStyleForStrike(family, sizeAndStyle, out);
 }
 
 #endif
 
 PpapiWebKitPlatformSupportImpl::PpapiWebKitPlatformSupportImpl()
@@ skipping 127 matching lines @@
 }
 
 WebKit::WebSerializedScriptValue
 PpapiWebKitPlatformSupportImpl::injectIDBKeyIntoSerializedValue(
     const WebKit::WebIDBKey& key,
     const WebKit::WebSerializedScriptValue& value,
     const WebKit::WebString& keyPath) {
   NOTREACHED();
   return WebKit::WebSerializedScriptValue();
 }