Plumb device scale adjustment separately.

webkit/common/webpreferences.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/common/webpreferences.h"
 
 #include "base/basictypes.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "third_party/WebKit/public/web/WebSettings.h"
@@ skipping 107 matching lines @@
       spatial_navigation_enabled(false),
       experimental_websocket_enabled(false),
       pinch_virtual_viewport_enabled(false),
       pinch_overlay_scrollbar_thickness(0),
       use_solid_color_scrollbars(false),
       compositor_touch_hit_testing(true),
       cookie_enabled(true)
 #if defined(OS_ANDROID)
       ,
       text_autosizing_enabled(true),
-      text_autosizing_font_scale_factor(1.0f),
+      font_scale_factor(1.0f),
+      device_scale_adjustment(1.0f),
       force_enable_zoom(false),
       double_tap_to_zoom_enabled(true),
       user_gesture_required_for_media_playback(true),
       user_gesture_required_for_media_fullscreen(true),
       support_deprecated_target_density_dpi(false),
       use_legacy_background_size_shorthand_behavior(false),
       wide_viewport_quirk(false),
       use_wide_viewport(true),
       viewport_meta_layout_size_quirk(false),
       viewport_meta_merge_content_quirk(false),
@@ skipping 34 matching lines @@
 COMPILE_ASSERT_MATCHING_ENUMS(
     webkit_glue::EDITING_BEHAVIOR_MAC, WebSettings::EditingBehaviorMac);
 COMPILE_ASSERT_MATCHING_ENUMS(
     webkit_glue::EDITING_BEHAVIOR_WIN, WebSettings::EditingBehaviorWin);
 COMPILE_ASSERT_MATCHING_ENUMS(
     webkit_glue::EDITING_BEHAVIOR_UNIX, WebSettings::EditingBehaviorUnix);
 COMPILE_ASSERT_MATCHING_ENUMS(
     webkit_glue::EDITING_BEHAVIOR_ANDROID, WebSettings::EditingBehaviorAndroid);
 
 }  // namespace webkit_glue