| Index: webkit/glue/webpreferences.h
|
| diff --git a/webkit/glue/webpreferences.h b/webkit/glue/webpreferences.h
|
| index dcff7b7b3e7dcba9fc0a54b5bbbb01ce67f9108a..e0a9e93ac3b88340aed649701ecf4d8fa4884c51 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>
|
|
|
| @@ -25,14 +26,8 @@ class WebView;
|
| 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;
|
|
|
| - 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;
|
|
|