summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorfalken@chromium.org <falken@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-24 11:36:25 +0000
committerfalken@chromium.org <falken@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-24 11:36:25 +0000
commite722eeebb0c2ffec5b42d83a874078df61bea329 (patch)
treed95a4fd62268ad5be50be4d2cd4cb6a124251bb0 /content
parente8cc8b3a52b7d8f9ed720b59ed77827c82d73033 (diff)
downloadchromium_src-e722eeebb0c2ffec5b42d83a874078df61bea329.zip
chromium_src-e722eeebb0c2ffec5b42d83a874078df61bea329.tar.gz
chromium_src-e722eeebb0c2ffec5b42d83a874078df61bea329.tar.bz2
Pass per-script fonts to WebKit settings.
WebKit now has per-script font settings (https://bugs.webkit.org/show_bug.cgi?id=20797). This change adds per-script font preferences to Chromium and passes them to the WebKit settings. For this first patch, default per-script fonts are defined only on Chrome OS, and only for Arabic and CJK scripts. It specifies the default fonts in locale_settings_cros.grd. The preferences are passed to WebPreferences in render_view_host_delegate_helper.cc (in the same manner as current font preferences). BUG=92302 TEST=manually Review URL: http://codereview.chromium.org/7606028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98024 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/common/view_messages.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/content/common/view_messages.h b/content/common/view_messages.h
index ec0b328..7c81a07 100644
--- a/content/common/view_messages.h
+++ b/content/common/view_messages.h
@@ -280,6 +280,12 @@ IPC_STRUCT_TRAITS_BEGIN(WebPreferences)
IPC_STRUCT_TRAITS_MEMBER(sans_serif_font_family)
IPC_STRUCT_TRAITS_MEMBER(cursive_font_family)
IPC_STRUCT_TRAITS_MEMBER(fantasy_font_family)
+ IPC_STRUCT_TRAITS_MEMBER(standard_font_family_map)
+ IPC_STRUCT_TRAITS_MEMBER(fixed_font_family_map)
+ IPC_STRUCT_TRAITS_MEMBER(serif_font_family_map)
+ IPC_STRUCT_TRAITS_MEMBER(sans_serif_font_family_map)
+ IPC_STRUCT_TRAITS_MEMBER(cursive_font_family_map)
+ IPC_STRUCT_TRAITS_MEMBER(fantasy_font_family_map)
IPC_STRUCT_TRAITS_MEMBER(default_font_size)
IPC_STRUCT_TRAITS_MEMBER(default_fixed_font_size)
IPC_STRUCT_TRAITS_MEMBER(minimum_font_size)