summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
Diffstat (limited to 'content')
-rw-r--r--content/common/view_messages.h1
-rw-r--r--content/public/common/renderer_preferences.cc1
-rw-r--r--content/public/common/renderer_preferences.h2
-rw-r--r--content/renderer/render_view_linux.cc6
4 files changed, 10 insertions, 0 deletions
diff --git a/content/common/view_messages.h b/content/common/view_messages.h
index 415c314..cd34d14 100644
--- a/content/common/view_messages.h
+++ b/content/common/view_messages.h
@@ -289,6 +289,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::RendererPreferences)
IPC_STRUCT_TRAITS_MEMBER(arrow_bitmap_height_vertical_scroll_bar_in_dips)
IPC_STRUCT_TRAITS_MEMBER(arrow_bitmap_width_horizontal_scroll_bar_in_dips)
#endif
+ IPC_STRUCT_TRAITS_MEMBER(default_font_size)
IPC_STRUCT_TRAITS_END()
IPC_STRUCT_TRAITS_BEGIN(content::WebPluginGeometry)
diff --git a/content/public/common/renderer_preferences.cc b/content/public/common/renderer_preferences.cc
index 48a784d..57c259f 100644
--- a/content/public/common/renderer_preferences.cc
+++ b/content/public/common/renderer_preferences.cc
@@ -51,6 +51,7 @@ RendererPreferences::RendererPreferences()
arrow_bitmap_height_vertical_scroll_bar_in_dips(0),
arrow_bitmap_width_horizontal_scroll_bar_in_dips(0)
#endif
+ , default_font_size(0)
{}
RendererPreferences::~RendererPreferences() { }
diff --git a/content/public/common/renderer_preferences.h b/content/public/common/renderer_preferences.h
index 1a69081..aaee9d5 100644
--- a/content/public/common/renderer_preferences.h
+++ b/content/public/common/renderer_preferences.h
@@ -175,6 +175,8 @@ struct CONTENT_EXPORT RendererPreferences {
int32 arrow_bitmap_width_horizontal_scroll_bar_in_dips;
#endif
+ // The default font size used for rendering on Linux.
+ int default_font_size;
};
} // namespace content
diff --git a/content/renderer/render_view_linux.cc b/content/renderer/render_view_linux.cc
index 7f3ab8d..c3b6116 100644
--- a/content/renderer/render_view_linux.cc
+++ b/content/renderer/render_view_linux.cc
@@ -14,6 +14,8 @@ namespace content {
namespace {
+const int kMaxDefaultFontSize = 999;
+
SkPaint::Hinting RendererPreferencesToSkiaHinting(
const RendererPreferences& prefs) {
if (!prefs.should_antialias_text) {
@@ -62,6 +64,10 @@ void RenderViewImpl::UpdateFontRenderingFromRendererPrefs() {
prefs.subpixel_rendering !=
gfx::FontRenderParams::SUBPIXEL_RENDERING_NONE);
WebFontRendering::setSubpixelPositioning(prefs.use_subpixel_positioning);
+ if (prefs.default_font_size > 0 &&
+ prefs.default_font_size <= kMaxDefaultFontSize) {
+ WebFontRendering::setDefaultFontSize(prefs.default_font_size);
+ }
}
} // namespace content