Migrate WebKit "global script" font prefs.

webkit/glue/webpreferences.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 "webkit/glue/webpreferences.h"
 
 #include <unicode/uchar.h>
+#include <unicode/uscript.h>

[viettrungluu, 2012/05/16 13:27:58]

As I said elsewhere, these are really ICU includes -- is it really our practice
to use include them as if they're system headers (the preexisting inclusion of
uchar.h notwithstanding)?

[falken, 2012/05/17 07:08:41]

I've changed the existing include to "unicode/uchar.h".
It seems most files that include ICU do it that way. I found only one file that
uses a path like "third_party/icu/public/common/unicode/uchar.h" for ICU
(system_settings_provider2.h). I'm not sure whether that's a deliberate
preference, though.

 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositor.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNetworkStateNotifier.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSettings.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "webkit/glue/webkit_glue.h"
 
 using WebKit::WebNetworkStateNotifier;
 using WebKit::WebRuntimeFeatures;
 using WebKit::WebSettings;
 using WebKit::WebString;
 using WebKit::WebURL;
 using WebKit::WebView;
 
+namespace {
+const char* kCommonScript = uscript_getShortName(USCRIPT_COMMON);

[viettrungluu, 2012/05/16 13:27:58]

Not wanting static initializers applies to all of Chromium, not just ppapi.

Maybe there should be a common constant somewhere for this? (Maybe a |const
static| member of |WebPreferences| called |kCommonScriptName| or some such?)

[falken, 2012/05/17 07:08:41]

I've moved it back to the "Zyyy" constant. I think we wanted to get it from ICU
for readability, but I think just a comment explaining what it is is sufficient.
I agree it'd be good to have that, but can't get ppapi to access it. It compiles
but then a linker error occurs:

out/Release/../../third_party/gold/gold64:
out/Release/obj.target/ppapi/libppapi_shared.a(out/Release/obj.target/ppapi/../ppapi_shared/ppapi/shared_impl/private/ppb_browser_font_trusted_shared.o):
in function ppapi::(anonymous
namespace)::PPFontDescToWebFontDesc(PP_BrowserFont_Trusted_Description const&,
ppapi::Preferences
const&):ppb_browser_font_trusted_shared.cc(.text._ZN5ppapi12_GLOBAL__N_123PPFontDescToWebFontDescERK34PP_BrowserFont_Trusted_DescriptionRKNS_11PreferencesE+0x42b):
error: undefined reference to 'webkit_glue::WebPreferences::kCommonScript'

Maybe it has something to do with DEPS or the WEBKIT_GLUE_EXPORT macro? It
occurs even for a extern const char[] outside of the struct and for a static
member function.

+}
+
 namespace webkit_glue {
 
 WebPreferences::WebPreferences()
-    : standard_font_family(ASCIIToUTF16("Times New Roman")),
-      fixed_font_family(ASCIIToUTF16("Courier New")),
-      serif_font_family(ASCIIToUTF16("Times New Roman")),
-      sans_serif_font_family(ASCIIToUTF16("Arial")),
-      cursive_font_family(ASCIIToUTF16("Script")),
-      fantasy_font_family(),  // Not sure what to use on Windows.
-      default_font_size(16),
+    : default_font_size(16),
       default_fixed_font_size(13),
       minimum_font_size(0),
       minimum_logical_font_size(6),
       default_device_scale_factor(1),
       default_encoding("ISO-8859-1"),
       javascript_enabled(true),
       web_security_enabled(true),
       javascript_can_open_windows_automatically(true),
       loads_images_automatically(true),
       images_enabled(true),
@@ skipping 52 matching lines @@
       allow_displaying_insecure_content(true),
       allow_running_insecure_content(false),
       password_echo_enabled(false),
       should_print_backgrounds(false),
       enable_scroll_animator(false),
       hixie76_websocket_protocol_enabled(false),
       visual_word_movement_enabled(false),
       per_tile_painting_enabled(false),
       css_regions_enabled(false),
       css_shaders_enabled(false) {
+  standard_font_family_map[kCommonScript] =
+      ASCIIToUTF16("Times New Roman");
+  fixed_font_family_map[kCommonScript] =
+      ASCIIToUTF16("Courier New");
+  serif_font_family_map[kCommonScript] =
+      ASCIIToUTF16("Times New Roman");
+  sans_serif_font_family_map[kCommonScript] =
+      ASCIIToUTF16("Arial");
+  cursive_font_family_map[kCommonScript] =
+      ASCIIToUTF16("Script");
+  fantasy_font_family_map[kCommonScript] =
+      ASCIIToUTF16("Impact");
 }
 
 WebPreferences::~WebPreferences() {
 }
 
 namespace {
 
 void setStandardFontFamilyWrapper(WebSettings* settings,
                                   const string16& font,
                                   UScriptCode script) {
@@ skipping 41 matching lines @@
     int32 script = u_getPropertyValueEnum(UCHAR_SCRIPT, (it->first).c_str());
     if (script >= 0 && script < USCRIPT_CODE_LIMIT)
       (*setter)(settings, it->second, (UScriptCode) script);
   }
 }
 
 }  // namespace
 
 void WebPreferences::Apply(WebView* web_view) const {
   WebSettings* settings = web_view->settings();
-  settings->setStandardFontFamily(standard_font_family);
-  settings->setFixedFontFamily(fixed_font_family);
-  settings->setSerifFontFamily(serif_font_family);
-  settings->setSansSerifFontFamily(sans_serif_font_family);
-  settings->setCursiveFontFamily(cursive_font_family);
-  settings->setFantasyFontFamily(fantasy_font_family);
   ApplyFontsFromMap(standard_font_family_map, setStandardFontFamilyWrapper,
                     settings);
   ApplyFontsFromMap(fixed_font_family_map, setFixedFontFamilyWrapper, settings);
   ApplyFontsFromMap(serif_font_family_map, setSerifFontFamilyWrapper, settings);
   ApplyFontsFromMap(sans_serif_font_family_map, setSansSerifFontFamilyWrapper,
                     settings);
   ApplyFontsFromMap(cursive_font_family_map, setCursiveFontFamilyWrapper,
                     settings);
   ApplyFontsFromMap(fantasy_font_family_map, setFantasyFontFamilyWrapper,
                     settings);
@@ skipping 162 matching lines @@
   // Enable per-tile painting if requested on the command line.
   settings->setPerTilePaintingEnabled(per_tile_painting_enabled);
 
   settings->setExperimentalCSSRegionsEnabled(css_regions_enabled);
   settings->setExperimentalCSSCustomFilterEnabled(css_shaders_enabled);
 
   WebNetworkStateNotifier::setOnLine(is_online);
 }
 
 }  // namespace webkit_glue