Plumb device scale adjustment separately.
This value was previously computed into the font scale factor.
BUG=252828
Review URL: https://codereview.chromium.org/49043010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232248 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index e6f4072..855eda5 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -594,7 +594,7 @@
SingleTabModeTabHelper::FromWebContents(web_contents)->HandleOpenUrl(params);
}
-float GetFontScaleMultiplier() {
+float GetDeviceScaleAdjustment() {
static const float kMinFSM = 1.05f;
static const int kWidthForMinFSM = 320;
static const float kMaxFSM = 1.3f;
@@ -2225,9 +2225,9 @@
web_prefs->allow_running_insecure_content =
prefs->GetBoolean(prefs::kWebKitAllowRunningInsecureContent);
#if defined(OS_ANDROID)
- web_prefs->text_autosizing_font_scale_factor =
- static_cast<float>(prefs->GetDouble(prefs::kWebKitFontScaleFactor)) *
- GetFontScaleMultiplier();
+ web_prefs->font_scale_factor =
+ static_cast<float>(prefs->GetDouble(prefs::kWebKitFontScaleFactor));
+ web_prefs->device_scale_adjustment = GetDeviceScaleAdjustment();
web_prefs->force_enable_zoom =
prefs->GetBoolean(prefs::kWebKitForceEnableZoom);
#endif
