Pass DefaultDeviceScaleFactor to webkit

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 <string>
 #include <vector>
@@ skipping 522 matching lines @@
 
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kDomAutomationController))
     enabled_bindings_ |= content::BINDINGS_POLICY_DOM_AUTOMATION;
 
   bool enable_fixed_layout =
       command_line.HasSwitch(switches::kEnableFixedLayout);
   webview()->enableFixedLayoutMode(enable_fixed_layout);
   if (enable_fixed_layout)
       webview()->settings()->setFixedElementsLayoutRelativeToFrame(true);
-  base::StringToInt(command_line.GetSwitchValueASCII(
-                        switches::kDefaultDeviceScaleFactor),
-                    &default_device_scale_factor_);
 
   content::GetContentClient()->renderer()->RenderViewCreated(this);
 }
 
 RenderViewImpl::~RenderViewImpl() {
   history_page_ids_.clear();
 
   if (decrement_shared_popup_at_destruction_)
     shared_popup_counter_->data--;
 
@@ skipping 3854 matching lines @@
 void RenderViewImpl::OnMoveOrResizeStarted() {
   if (webview())
     webview()->hidePopups();
 }
 
 void RenderViewImpl::OnResize(const gfx::Size& new_size,
                               const gfx::Rect& resizer_rect,
                               bool is_fullscreen) {
   if (webview()) {
     // This setting has no effect if fixed layout is not enabled.
-    if (default_device_scale_factor_)
+    if (webkit_preferences_.default_device_scale_factor)
       webview()->settings()->setLayoutFallbackWidth(
-          new_size.width() / default_device_scale_factor_);
+          new_size.width() / webkit_preferences_.default_device_scale_factor);
     webview()->hidePopups();
     if (send_preferred_size_changes_) {
       webview()->mainFrame()->setCanHaveScrollbars(
           ShouldDisplayScrollbars(new_size.width(), new_size.height()));
     }
     UpdateScrollState(webview()->mainFrame());
   }
 
   RenderWidget::OnResize(new_size, resizer_rect, is_fullscreen);
 }
@@ skipping 665 matching lines @@
 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const {
   return !!RenderThreadImpl::current()->compositor_thread();
 }
 
 void RenderViewImpl::OnJavaBridgeInit() {
   DCHECK(!java_bridge_dispatcher_.get());
 #if defined(ENABLE_JAVA_BRIDGE)
   java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this));
 #endif
 }