Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1324)

Unified Diff: webkit/glue/webpreferences.h

Issue 10107014: Migrate WebKit "global script" font prefs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix after sync Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webkit/glue/webpreferences.h
diff --git a/webkit/glue/webpreferences.h b/webkit/glue/webpreferences.h
index 05e06775fca458068bfa76bd9357f5ba6a280baf..26ec929c8c37a040cca3f7174bbfd8147cc5c6bb 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,8 @@ 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;
- 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;

Powered by Google App Engine
This is Rietveld 408576698