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

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: Added tests 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
Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index c768e6ae073f519df9c20937a201516d44242b10..18a65298b5a861e990261134953b13e8518835cd 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -1050,12 +1050,6 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs,
// TODO(bokan): Remove once Blink side is gone.
settings->setInvertViewportScrollOrder(true);
- settings->setViewportEnabled(prefs.viewport_enabled);
- settings->setLoadWithOverviewMode(prefs.initialize_at_minimum_page_scale);
- settings->setViewportMetaEnabled(prefs.viewport_meta_enabled);
- settings->setMainFrameResizesAreOrientationChanges(
- prefs.main_frame_resizes_are_orientation_changes);
-
settings->setSmartInsertDeleteEnabled(prefs.smart_insert_delete_enabled);
settings->setSpatialNavigationEnabled(prefs.spatial_navigation_enabled);
@@ -1116,6 +1110,12 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs,
blink::WebString::fromUTF8(prefs.autoplay_experiment_mode));
#endif
+ settings->setViewportEnabled(prefs.viewport_enabled);
+ settings->setLoadWithOverviewMode(prefs.initialize_at_minimum_page_scale);
+ settings->setViewportMetaEnabled(prefs.viewport_meta_enabled);
+ settings->setMainFrameResizesAreOrientationChanges(
+ prefs.main_frame_resizes_are_orientation_changes);
+
WebNetworkStateNotifier::setOnLine(prefs.is_online);
WebNetworkStateNotifier::setWebConnection(
NetConnectionTypeToWebConnectionType(prefs.net_info_connection_type),

Powered by Google App Engine
This is Rietveld 408576698