2 files changed, 12 insertions, 0 deletions
diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc
index bcb8df6..e6ff557 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);
diff --git a/webkit/glue/webpreferences.h b/webkit/glue/webpreferences.h
index 03b759d..1a4bb1b 100644
--- a/webkit/glue/webpreferences.h
+++ b/webkit/glue/webpreferences.h
@@ -116,6 +116,10 @@ struct WEBKIT_GLUE_EXPORT WebPreferences {
   bool fullscreen_enabled;
   bool allow_displaying_insecure_content;
   bool allow_running_insecure_content;
+#if defined(OS_ANDROID)
+  float font_scale_factor;
+  bool force_enable_zoom;
+#endif
   bool password_echo_enabled;
   bool should_print_backgrounds;
   bool enable_scroll_animator;