diff options
| author | falken@chromium.org <falken@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-18 07:20:32 +0000 |
|---|---|---|
| committer | falken@chromium.org <falken@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-18 07:20:32 +0000 |
| commit | 966d1e1627da47dc782a3d7ca8204de233b6edd6 (patch) | |
| tree | 49477476b24226b10881e6b0cc35e26197b77c74 /ppapi/shared_impl/ppapi_preferences.cc | |
| parent | 1c6189ff4780f3a0968eb93370de7f477bf44b50 (diff) | |
| download | chromium_src-966d1e1627da47dc782a3d7ca8204de233b6edd6.zip chromium_src-966d1e1627da47dc782a3d7ca8204de233b6edd6.tar.gz chromium_src-966d1e1627da47dc782a3d7ca8204de233b6edd6.tar.bz2 | |
Migrate WebKit "global script" font prefs.
The effect is to migrate a pref like
webkit.webprefs.global.standard_font_family to webkit.webprefs.fonts.standard.Zyyy
This has two motivations:
1) Undo the migration of font prefs to the "global" (as opposed to per-tab)
namespace, as planned here: <http://codereview.chromium.org/9838050>. There are still
more prefs to move out of "global" after this patch.
2) Move the "global script" (as opposed to per-script) font prefs into the
per-script font maps, under the script code "Zyyy" (the ISO 15924 code for
the "Common" script). This is consistent with WebKit-side settings and should
simplify the code overall as we no longer have to special case the global
script vs the per-script fonts.
TBR=gene for chrome/browser/printing
BUG=123812
TEST=browser_tests --gtest_filter=PrefsTab* and ExtensionApiTest.Font*
Review URL: https://chromiumcodereview.appspot.com/10107014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137835 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/shared_impl/ppapi_preferences.cc')
| -rw-r--r-- | ppapi/shared_impl/ppapi_preferences.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/ppapi/shared_impl/ppapi_preferences.cc b/ppapi/shared_impl/ppapi_preferences.cc index 8622640..14c89f0 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 |