| Index: ppapi/shared_impl/ppapi_preferences.cc
|
| diff --git a/ppapi/shared_impl/ppapi_preferences.cc b/ppapi/shared_impl/ppapi_preferences.cc
|
| index c8a5b0005f4afad332c02b514a0c5b48f3ad3738..506b5b2c143e0ffcdb8149a4e74b391dce680ef5 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 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
|
|
|