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

Unified Diff: content/renderer/web_preferences.cc

Issue 49043010: Plumb device scale adjustment separately. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@rmquirk
Patch Set: Created 7 years, 2 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 | « content/public/common/common_param_traits_macros.h ('k') | webkit/common/webpreferences.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/web_preferences.cc
diff --git a/content/renderer/web_preferences.cc b/content/renderer/web_preferences.cc
index 71c0ca0d742d0f41f6dc70f127650f94900afe74..309eaa428f1ba22f2d3f0a0dad50d4cd19942069 100644
--- a/content/renderer/web_preferences.cc
+++ b/content/renderer/web_preferences.cc
@@ -330,8 +330,8 @@ void ApplyWebPreferences(const WebPreferences& prefs, WebView* web_view) {
#if defined(OS_ANDROID)
settings->setAllowCustomScrollbarInMainFrame(false);
settings->setTextAutosizingEnabled(prefs.text_autosizing_enabled);
- settings->setTextAutosizingFontScaleFactor(
- prefs.text_autosizing_font_scale_factor);
+ settings->setTextAutosizingFontScaleFactor(prefs.font_scale_factor);
+ settings->setDeviceScaleAdjustment(prefs.device_scale_adjustment);
web_view->setIgnoreViewportTagScaleLimits(prefs.force_enable_zoom);
settings->setAutoZoomFocusedNodeToLegibleScale(true);
settings->setDoubleTapToZoomEnabled(prefs.double_tap_to_zoom_enabled);
« no previous file with comments | « content/public/common/common_param_traits_macros.h ('k') | webkit/common/webpreferences.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698