Migrate WebKit "global script" font prefs.

ppapi/shared_impl/private/ppb_browser_font_trusted_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_browser_font_trusted_shared.h"
 
+#include <unicode/uscript.h>

[viettrungluu, 2012/05/15 17:21:17]

This is a dependency on ICU, and should be #include
"third_party/icu/public/common/unicode/uscript.h". Of course, that would
probably fail the deps check.

I don't know if we want to allow ppapi/shared_impl to depend on ICU. I'm pretty
sure we don't.

+
 #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"
 #include "third_party/skia/include/core/SkRect.h"
@@ skipping 13 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);

[viettrungluu, 2012/05/15 17:21:17]

I don't think we want to add this static initializer.

[brettw, 2012/05/15 22:53:11]

Right.

+
+string16 GetFontFromMap(
+    const webkit_glue::WebPreferences::ScriptFontFamilyMap& map,
+    const std::string& script) {
+  webkit_glue::WebPreferences::ScriptFontFamilyMap::const_iterator it =
+      map.find(script);
+  if (it != map.end())
+    return it->second;
+  return string16();
+}
+
 bool PPTextRunToWebTextRun(const PP_BrowserFont_Trusted_TextRun& text,
                            WebTextRun* run) {
   StringVar* text_string = StringVar::FromPPVar(text.text);
   if (!text_string)
     return false;
 
   *run = WebTextRun(UTF8ToUTF16(text_string->value()),
                     PP_ToBool(text.rtl),
                     PP_ToBool(text.override_direction));
   return true;
@@ skipping 31 matching lines @@
                  MonospaceFamily);
 
   StringVar* face_name = StringVar::FromPPVar(font.face);  // Possibly null.
 
   WebFontDescription result;
   string16 resolved_family;
   if (!face_name || face_name->value().empty()) {
     // Resolve the generic family.
     switch (font.family) {
       case PP_BROWSERFONT_TRUSTED_FAMILY_SERIF:
-        resolved_family = prefs.serif_font_family;
+        resolved_family = GetFontFromMap(prefs.serif_font_family_map,
+                                         kCommonScript);
         break;
       case PP_BROWSERFONT_TRUSTED_FAMILY_SANSSERIF:
-        resolved_family = prefs.sans_serif_font_family;
+        resolved_family = GetFontFromMap(prefs.sans_serif_font_family_map,
+                                         kCommonScript);
         break;
       case PP_BROWSERFONT_TRUSTED_FAMILY_MONOSPACE:
-        resolved_family = prefs.fixed_font_family;
+        resolved_family = GetFontFromMap(prefs.fixed_font_family_map,
+                                         kCommonScript);
         break;
       case PP_BROWSERFONT_TRUSTED_FAMILY_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_name->value());
   }
   result.family = resolved_family;
 
   result.genericFamily = PP_FAMILY_TO_WEB_FAMILY(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 178 matching lines @@
   } else {
     web_clip = WebRect(clip->point.x, clip->point.y,
                        clip->size.width, clip->size.height);
   }
 
   font_->drawText(destination, run, web_position, color, web_clip,
                   PP_ToBool(image_data_is_opaque));
 }
 
 }  // namespace ppapi
-