Move call to ProcessViewLayoutFlags().

content/renderer/render_view_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/auto_reset.h"
@@ skipping 3528 matching lines @@
   bool enable_fixed_layout =
       command_line.HasSwitch(switches::kEnableFixedLayout);
 
   webview()->enableFixedLayoutMode(enable_fixed_layout || enable_viewport);
 
   // If viewport tag is enabled, then the WebKit side will take care
   // of setting the fixed layout size and page scale limits.
   if (enable_viewport)
     return;
 
+  // When navigating to a new page, reset the page scale factor to be 1.0.
+  webview()->setInitialPageScaleOverride(1.f);
+
   if (enable_fixed_layout) {
     std::string str =
         command_line.GetSwitchValueASCII(switches::kEnableFixedLayout);
     std::vector<std::string> tokens;
     base::SplitString(str, ',', &tokens);
     if (tokens.size() == 2) {
       int width, height;
       if (base::StringToInt(tokens[0], &width) &&
           base::StringToInt(tokens[1], &height))
         webview()->setFixedLayoutSize(WebSize(width, height));
@@ skipping 2989 matching lines @@
     WebURL url = icon_urls[i].iconURL();
     if (!url.isEmpty())
       urls.push_back(FaviconURL(url,
                                 ToFaviconType(icon_urls[i].iconType())));
   }
   SendUpdateFaviconURL(urls);
 }
 
 
 }  // namespace content