Switch RenderWidgetHostViewAndroid to use Screen

ui/display/display.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 "ui/display/display.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 135 matching lines @@
     // scale is integral.
     device_scale_factor = static_cast<int>(device_scale_factor);
 #endif
     device_scale_factor_ = device_scale_factor;
   }
   device_scale_factor_ = std::max(1.0f, device_scale_factor_);
   bounds_ = gfx::Rect(gfx::ScaleToFlooredPoint(bounds_in_pixel.origin(),
                                                1.0f / device_scale_factor_),
                       gfx::ScaleToFlooredSize(bounds_in_pixel.size(),
                                               1.0f / device_scale_factor_));
+#if defined(OS_ANDROID)
+  size_in_pixels_ = bounds_in_pixel.size();
+#endif  // defined(OS_ANDROID)
   UpdateWorkAreaFromInsets(insets);
 }
 
 void Display::SetSize(const gfx::Size& size_in_pixel) {
   gfx::Point origin = bounds_.origin();
 #if defined(USE_AURA)
   origin = gfx::ScaleToFlooredPoint(origin, device_scale_factor_);
 #endif
   SetScaleAndBounds(device_scale_factor_, gfx::Rect(origin, size_in_pixel));
 }
 
 void Display::UpdateWorkAreaFromInsets(const gfx::Insets& insets) {
   work_area_ = bounds_;
   work_area_.Inset(insets);
 }
 
 gfx::Size Display::GetSizeInPixel() const {
+  // TODO(oshima): This should always use size_in_pixels_.
+  if (!size_in_pixels_.IsEmpty())
+    return size_in_pixels_;
   return gfx::ScaleToFlooredSize(size(), device_scale_factor_);
 }
 
 std::string Display::ToString() const {
   return base::StringPrintf(
       "Display[%lld] bounds=%s, workarea=%s, scale=%g, %s",
       static_cast<long long int>(id_), bounds_.ToString().c_str(),
       work_area_.ToString().c_str(), device_scale_factor_,
       IsInternal() ? "internal" : "external");
 }
@@ skipping 18 matching lines @@
   DCHECK_NE(kInvalidDisplayId, display_id);
   return HasInternalDisplay() && internal_display_id_ == display_id;
 }
 
 // static
 bool Display::HasInternalDisplay() {
   return internal_display_id_ != kInvalidDisplayId;
 }
 
 }  // namespace display