Upstream deviceScaleFactor initialization in render_view_impl

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 640 matching lines @@
 #endif
 
   webwidget_ = WebView::create(this);
   webwidget_mouse_lock_target_.reset(new WebWidgetLockTarget(webwidget_));
 
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
 
 #if defined(OS_ANDROID)
   scoped_ptr<content::DeviceInfo> device_info(new content::DeviceInfo());
 
+  float device_scale_factor = device_info->GetDPIScale();
+  if (device_scale_factor != webview()->deviceScaleFactor()) {

[aelias_OOO_until_Jul13, 2012/10/10 22:14:12]

No need for this if statement, the receiver does the same check.

LGTM otherwise.

+      webview()->setDeviceScaleFactor(device_scale_factor);
+  }
+
   const std::string region_code =
       command_line.HasSwitch(switches::kNetworkCountryIso)
           ? command_line.GetSwitchValueASCII(switches::kNetworkCountryIso)
           : device_info->GetNetworkCountryIso();
   content_detectors_.push_back(linked_ptr<ContentDetector>(
       new AddressDetector()));
   content_detectors_.push_back(linked_ptr<ContentDetector>(
       new PhoneNumberDetector(region_code)));
   content_detectors_.push_back(linked_ptr<ContentDetector>(
       new EmailDetector()));
@@ skipping 5679 matching lines @@
 
   updating_frame_tree_ = true;
   active_frame_id_map_.clear();
 
   target_process_id_ = process_id;
   target_routing_id_ = route_id;
   CreateFrameTree(webview()->mainFrame(), frames);
 
   updating_frame_tree_ = false;
 }