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

Unified Diff: content/renderer/render_view_impl.cc

Issue 1411103011: Call setUseMobileViewportStyle before setViewportEnabled (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2526
Patch Set: Created 5 years, 1 month 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/content_tests.gypi ('k') | content/test/data/resource_loading/200.png » ('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 d6d5d6e1cf156cc581e8886e24df8e41e9870301..a8c71610a39302bbeb5b1425daf10c80f850742d 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -1053,12 +1053,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);
@@ -1119,6 +1113,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),
« no previous file with comments | « content/content_tests.gypi ('k') | content/test/data/resource_loading/200.png » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698