Initialize device scale factor correctly on Android

content/renderer/render_widget.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_widget.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
@@ skipping 99 matching lines @@
       invalidation_task_posted_(false),
       screen_info_(screen_info),
       device_scale_factor_(1),
       throttle_input_events_(true),
       next_smooth_scroll_gesture_id_(0) {
   if (!swapped_out)
     RenderProcess::current()->AddRefProcess();
   DCHECK(RenderThread::Get());
   has_disable_gpu_vsync_switch_ = CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kDisableGpuVsync);
-#if defined(OS_CHROMEOS) || defined(OS_MACOSX)
+  // TODO(skyostil): Move device scale factor initialization to gfx::Display.
+#if defined(OS_CHROMEOS) || defined(OS_MACOSX) || defined(OS_ANDROID)

[johnme, 2012/10/31 11:48:37]

Woah, this code path includes a static_cast<int>; we don't want that on Android
(and it should make your test fail on Nexus 7...)

[Sami, 2012/10/31 11:51:40]

Ack, serves me right for not re-testing on all devices. Thanks for spotting, let
me fix that.

   device_scale_factor_ = screen_info.verticalDPI / kStandardDPI;
   // Unless an explicit scale factor was provided for testing, ensure the scale
   // is integral.
   if (!CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kForceDeviceScaleFactor))
     device_scale_factor_ = static_cast<int>(device_scale_factor_);
   device_scale_factor_ = std::max(1.0f, device_scale_factor_);
 #endif
 }
 
@@ skipping 1772 matching lines @@
 
 bool RenderWidget::WillHandleMouseEvent(const WebKit::WebMouseEvent& event) {
   return false;
 }
 
 bool RenderWidget::WebWidgetHandlesCompositorScheduling() const {
   return false;
 }
 
 }  // namespace content