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

Unified Diff: ppapi/shared_impl/ppapi_preferences.cc

Issue 10107014: Migrate WebKit "global script" font prefs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review comments 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: ppapi/shared_impl/ppapi_preferences.cc
diff --git a/ppapi/shared_impl/ppapi_preferences.cc b/ppapi/shared_impl/ppapi_preferences.cc
index 86226409c5c786c9868e128bf960697ebe155e6f..14c89f0a37091d629f420c41a0e4328fb9546745 100644
--- a/ppapi/shared_impl/ppapi_preferences.cc
+++ b/ppapi/shared_impl/ppapi_preferences.cc
@@ -4,8 +4,6 @@
#include "ppapi/shared_impl/ppapi_preferences.h"
-#include "webkit/glue/webpreferences.h"
-
namespace ppapi {
Preferences::Preferences()
@@ -15,10 +13,10 @@ Preferences::Preferences()
}
Preferences::Preferences(const webkit_glue::WebPreferences& prefs)
- : standard_font_family(prefs.standard_font_family),
- fixed_font_family(prefs.fixed_font_family),
- serif_font_family(prefs.serif_font_family),
- sans_serif_font_family(prefs.sans_serif_font_family),
+ : standard_font_family_map(prefs.standard_font_family_map),
+ fixed_font_family_map(prefs.fixed_font_family_map),
+ serif_font_family_map(prefs.serif_font_family_map),
+ sans_serif_font_family_map(prefs.sans_serif_font_family_map),
default_font_size(prefs.default_font_size),
default_fixed_font_size(prefs.default_fixed_font_size),
// Pepper 3D support keys off of WebGL which is what the GPU blacklist

Powered by Google App Engine
This is Rietveld 408576698