| Index: content/renderer/render_view_impl.cc
|
| diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
|
| index 19f37ffd03dccb71ed8377ff544437b5dde68980..2d3a7559d4878b7e35a37b41ff8be8786e16ab7a 100644
|
| --- a/content/renderer/render_view_impl.cc
|
| +++ b/content/renderer/render_view_impl.cc
|
| @@ -1070,11 +1070,6 @@
|
| static_cast<WebSettings::V8ScriptStreamingMode>(
|
| prefs.v8_script_streaming_mode));
|
|
|
| - // Needs to happen before setIgnoreVIewportTagScaleLimits below.
|
| - web_view->setDefaultPageScaleLimits(
|
| - prefs.default_minimum_page_scale_factor,
|
| - prefs.default_maximum_page_scale_factor);
|
| -
|
| #if defined(OS_ANDROID)
|
| settings->setAllowCustomScrollbarInMainFrame(false);
|
| settings->setTextAutosizingEnabled(prefs.text_autosizing_enabled);
|
| @@ -1136,6 +1131,10 @@
|
| #if defined(OS_WIN)
|
| settings->setShowContextMenuOnMouseUp(true);
|
| #endif
|
| +
|
| + web_view->setDefaultPageScaleLimits(
|
| + prefs.default_minimum_page_scale_factor,
|
| + prefs.default_maximum_page_scale_factor);
|
| }
|
|
|
| /*static*/
|
|
|