| Index: content/renderer/render_view_impl.cc
|
| diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
|
| index a3696bd49a2157415683dcdc25ea070af35d9d08..5a1abb9c08a770d15248c828ca189632e3c8ad08 100644
|
| --- a/content/renderer/render_view_impl.cc
|
| +++ b/content/renderer/render_view_impl.cc
|
| @@ -2666,7 +2666,9 @@ NavigationState* RenderViewImpl::CreateNavigationStateFromPending() {
|
|
|
| void RenderViewImpl::ProcessViewLayoutFlags(const CommandLine& command_line) {
|
| bool enable_viewport =
|
| - command_line.HasSwitch(switches::kEnableViewport);
|
| + command_line.HasSwitch(switches::kEnableViewport) ||
|
| + // Setting a default device scale factor forces enable_viewport on.
|
| + webkit_preferences_.default_device_scale_factor > 1;
|
| bool enable_fixed_layout =
|
| command_line.HasSwitch(switches::kEnableFixedLayout);
|
|
|
|
|