Migrate WebKit "global script" font prefs.

webkit/glue/webpreferences.h

Index: webkit/glue/webpreferences.h
diff --git a/webkit/glue/webpreferences.h b/webkit/glue/webpreferences.h
index 05e06775fca458068bfa76bd9357f5ba6a280baf..d00b5a25b8532d4d8cecd023992e02fbc7f7e06a 100644
--- a/webkit/glue/webpreferences.h
+++ b/webkit/glue/webpreferences.h
@@ -11,6 +11,7 @@
 #ifndef WEBKIT_GLUE_WEBPREFERENCES_H__
 #define WEBKIT_GLUE_WEBPREFERENCES_H__
 
+#include <map>
 #include <string>
 #include <vector>
 
@@ -27,14 +28,13 @@ namespace webkit_glue {
 struct WEBKIT_GLUE_EXPORT WebPreferences {
   // Map of ISO 15924 four-letter script code to font family.  For example,
   // "Arab" to "My Arabic Font".
-  typedef std::vector<std::pair<std::string, string16> > ScriptFontFamilyMap;
+  typedef std::map<std::string, string16> ScriptFontFamilyMap;
+
+  // The ISO 15924 script code for undetermined script aka Common. It's the
+  // default used on WebKit's side to get/set a font setting when no script is
+  // specified.
+  static const char kCommonScript[];

[viettrungluu, 2012/05/18 02:44:53]

To get this to work elsewhere, I think you might need to do |WEBKIT_GLUE_EXPORT
static const char kCommonScript[];|.

[falken, 2012/05/18 05:58:27]

I'd tried that but no luck (including trying WEBKIT_GLUE_EXPORT in each possible
position). Tony, do you have an idea?

 
-  string16 standard_font_family;
-  string16 fixed_font_family;
-  string16 serif_font_family;
-  string16 sans_serif_font_family;
-  string16 cursive_font_family;
-  string16 fantasy_font_family;
   ScriptFontFamilyMap standard_font_family_map;
   ScriptFontFamilyMap fixed_font_family_map;
   ScriptFontFamilyMap serif_font_family_map;