Migrate WebKit "global script" font prefs.

ppapi/shared_impl/private/ppb_font_shared.cc

 // Copyright (c) 2012 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 "ppapi/shared_impl/private/ppb_font_shared.h"
 
+#include <unicode/uscript.h>
+
 #include "base/debug/trace_event.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "ppapi/c/dev/ppb_font_dev.h"
 #include "ppapi/shared_impl/ppapi_preferences.h"
 #include "ppapi/shared_impl/var.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppb_image_data_api.h"
 #include "ppapi/thunk/thunk.h"
 #include "skia/ext/platform_canvas.h"
@@ skipping 16 matching lines @@
 using WebKit::WebFont;
 using WebKit::WebFontDescription;
 using WebKit::WebRect;
 using WebKit::WebTextRun;
 using WebKit::WebCanvas;
 
 namespace ppapi {
 
 namespace {
 
+const char *kCommonScript = uscript_getShortName(USCRIPT_COMMON);

[tony, 2012/05/09 17:11:15]

Nit: char*

[falken, 2012/05/11 11:04:14]

Done.

+
+string16 GetFontFromMap(const WebPreferences::ScriptFontFamilyMap& map,
+                        const std::string& script) {
+  WebPreferences::ScriptFontFamilyMap::const_iterator it = map.find(script);
+  if (it != map.end())
+    return it->second;
+  return string16();
+}
+
 // Converts the given PP_TextRun to a TextRun, returning true on success.
 // False means the input was invalid.
 bool PPTextRunToTextRun(const PP_TextRun_Dev* run,
                         WebKitForwarding::Font::TextRun* output) {
   StringVar* text_string = StringVar::FromPPVar(run->text);
   if (!text_string)
     return false;
 
   output->text = text_string->value();
   output->rtl = run->rtl == PP_TRUE ? true : false;
@@ skipping 32 matching lines @@
   COMPILE_ASSERT(WebFontDescription::GenericFamilyMonospace ==
                  PP_FONTFAMILY_TO_WEB_FONTFAMILY(PP_FONTFAMILY_MONOSPACE),
                  MonospaceFamily);
 
   WebFontDescription result;
   string16 resolved_family;
   if (face.empty()) {
     // Resolve the generic family.
     switch (font.family) {
       case PP_FONTFAMILY_SERIF:
-        resolved_family = prefs.serif_font_family;
+        resolved_family = GetFontFromMap(prefs.serif_font_family_map,
+                                         kCommonScript);
         break;
       case PP_FONTFAMILY_SANSSERIF:
-        resolved_family = prefs.sans_serif_font_family;
+        resolved_family = GetFontFromMap(prefs.sans_serif_font_family_map,
+                                         kCommonScript);
         break;
       case PP_FONTFAMILY_MONOSPACE:
-        resolved_family = prefs.fixed_font_family;
+        resolved_family = GetFontFromMap(prefs.fixed_font_family_map,
+                                         kCommonScript);
         break;
       case PP_FONTFAMILY_DEFAULT:
       default:
-        resolved_family = prefs.standard_font_family;
+        resolved_family = GetFontFromMap(prefs.standard_font_family_map,
+                                         kCommonScript);
         break;
     }
   } else {
     // Use the exact font.
     resolved_family = UTF8ToUTF16(face);
   }
   result.family = resolved_family;
 
   result.genericFamily = PP_FONTFAMILY_TO_WEB_FONTFAMILY(font.family);
 
   if (font.size == 0) {
     // Resolve the default font size, using the resolved family to see if
     // we should use the fixed or regular font size. It's difficult at this
     // level to detect if the requested font is fixed width, so we only apply
     // the alternate font size to the default fixed font family.
     if (StringToLowerASCII(resolved_family) ==
-        StringToLowerASCII(prefs.fixed_font_family))
+        StringToLowerASCII(GetFontFromMap(prefs.fixed_font_family_map,
+                                          kCommonScript)))
       result.size = static_cast<float>(prefs.default_fixed_font_size);
     else
       result.size = static_cast<float>(prefs.default_font_size);
   } else {
     // Use the exact size.
     result.size = static_cast<float>(font.size);
   }
 
   result.italic = font.italic != PP_FALSE;
   result.smallCaps = font.small_caps != PP_FALSE;
@@ skipping 269 matching lines @@
                                                 uint32_t char_offset) {
   int32_t result = -1;
   WebKitForwarding::Font::TextRun run;
   if (PPTextRunToTextRun(text, &run)) {
     font_impl_->PixelOffsetForCharacter(run, char_offset, &result);
   }
   return result;
 }
 
 }  // namespace ppapi
-