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

Unified Diff: webkit/glue/webpreferences.cc

Issue 10983010: FontScaleFactor and ForceEnableZoom pref_names. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added missing variables to WebPreferences Created 8 years, 3 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
« no previous file with comments | « webkit/glue/webpreferences.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/webpreferences.cc
diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc
index bcb8df6665d29d77f70146fea0e59e9ed9c600c2..e6ff5577674b1486530758ddbb98ffb942cee703 100644
--- a/webkit/glue/webpreferences.cc
+++ b/webkit/glue/webpreferences.cc
@@ -99,6 +99,10 @@ WebPreferences::WebPreferences()
fullscreen_enabled(false),
allow_displaying_insecure_content(true),
allow_running_insecure_content(false),
+#if defined(OS_ANDROID)
+ font_scale_factor(1.0f),
+ force_enable_zoom(false),
+#endif
password_echo_enabled(false),
should_print_backgrounds(false),
enable_scroll_animator(false),
@@ -390,6 +394,10 @@ void WebPreferences::Apply(WebView* web_view) const {
settings->setFullScreenEnabled(fullscreen_enabled);
settings->setAllowDisplayOfInsecureContent(allow_displaying_insecure_content);
settings->setAllowRunningOfInsecureContent(allow_running_insecure_content);
+#if defined(OS_ANDROID)
+ settings->setTextAutosizingFontScaleFactor(font_scale_factor);
+ web_view->setIgnoreViewportTagMaximumScale(force_enable_zoom);
+#endif
settings->setPasswordEchoEnabled(password_echo_enabled);
settings->setShouldPrintBackgrounds(should_print_backgrounds);
settings->setEnableScrollAnimator(enable_scroll_animator);
« no previous file with comments | « webkit/glue/webpreferences.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698