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

Unified Diff: content/renderer/render_view_impl.cc

Issue 1392213002: Call setUseMobileViewportStyle before setViewportEnabled (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 | « no previous file | third_party/WebKit/Source/web/DevToolsEmulator.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 5c2a1871640bb86d3d3fe4adb82ff8fcd7396691..d1de43cf0f9faacdd24f012d9b96a2372c5bbe00 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -1057,6 +1057,9 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs,
// TODO(bokan): Remove once Blink side is gone.
settings->setInvertViewportScrollOrder(true);
+#if defined(OS_ANDROID)
+ settings->setUseMobileViewportStyle(true);
+#endif
settings->setViewportEnabled(prefs.viewport_enabled);
bokan 2015/10/08 15:03:47 How about moving this block (viewportEnabled to Ma
settings->setLoadWithOverviewMode(prefs.initialize_at_minimum_page_scale);
settings->setViewportMetaEnabled(prefs.viewport_meta_enabled);
@@ -1118,7 +1121,6 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs,
settings->setPreferHiddenVolumeControls(true);
settings->setMainFrameClipsContent(!prefs.record_whole_document);
settings->setShrinksViewportContentToFit(true);
- settings->setUseMobileViewportStyle(true);
settings->setAutoplayExperimentMode(
blink::WebString::fromUTF8(prefs.autoplay_experiment_mode));
#endif
« no previous file with comments | « no previous file | third_party/WebKit/Source/web/DevToolsEmulator.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698