| Index: content/browser/renderer_host/render_view_host_impl.cc
|
| diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
|
| index 8d36fd2c76d982582636a78efca1b1921435d967..65b38234e0472450a62b075b73339f918345d71f 100644
|
| --- a/content/browser/renderer_host/render_view_host_impl.cc
|
| +++ b/content/browser/renderer_host/render_view_host_impl.cc
|
| @@ -508,7 +508,15 @@ WebPreferences RenderViewHostImpl::GetWebkitPrefs(const GURL& url) {
|
|
|
| prefs.number_of_cpu_cores = base::SysInfo::NumberOfProcessors();
|
|
|
| - prefs.viewport_enabled = command_line.HasSwitch(switches::kEnableViewport);
|
| + prefs.viewport_meta_enabled =
|
| + command_line.HasSwitch(switches::kEnableViewportMeta);
|
| +
|
| + prefs.viewport_enabled =
|
| + command_line.HasSwitch(switches::kEnableViewport) ||
|
| + prefs.viewport_meta_enabled;
|
| +
|
| + prefs.main_frame_resizes_are_orientation_changes =
|
| + command_line.HasSwitch(switches::kMainFrameResizesAreOrientationChanges);
|
|
|
| prefs.deferred_image_decoding_enabled =
|
| command_line.HasSwitch(switches::kEnableDeferredImageDecoding) ||
|
|
|