Decouple VR Shell DPR and CSS size from Physical Displays.

ui/android/delegated_frame_host_android.cc

 // Copyright 2016 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/android/delegated_frame_host_android.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "cc/layers/solid_color_layer.h"
 #include "cc/layers/surface_layer.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/copy_output_result.h"
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_id.h"
 #include "cc/surfaces/surface_id_allocator.h"
 #include "cc/surfaces/surface_manager.h"
 #include "ui/android/context_provider_factory.h"
 #include "ui/android/view_android.h"
 #include "ui/android/window_android_compositor.h"
-#include "ui/gfx/android/device_display_info.h"
+#include "ui/display/display.h"
+#include "ui/display/screen.h"
 #include "ui/gfx/geometry/dip_util.h"
 
 namespace ui {
 
 namespace {
 
 void SatisfyCallback(cc::SurfaceManager* manager,
                      const cc::SurfaceSequence& sequence) {
   std::vector<uint32_t> sequences;
   sequences.push_back(sequence.sequence);
@@ skipping 175 matching lines @@
   surface_factory_->Reset();
 }
 
 void DelegatedFrameHostAndroid::UpdateBackgroundColor(SkColor color) {
   background_layer_->SetBackgroundColor(color);
 }
 
 void DelegatedFrameHostAndroid::UpdateContainerSizeinDIP(
     const gfx::Size& size_in_dip) {
   container_size_in_dip_ = size_in_dip;
-  background_layer_->SetBounds(gfx::ConvertSizeToPixel(
-      gfx::DeviceDisplayInfo().GetDIPScale(), container_size_in_dip_));
+  float device_scale_factor = display::Screen::GetScreen()
+      ->GetDisplayNearestWindow(view_).device_scale_factor();
+  background_layer_->SetBounds(
+      gfx::ConvertSizeToPixel(device_scale_factor, container_size_in_dip_));
   UpdateBackgroundLayer();
 }
 
 void DelegatedFrameHostAndroid::RegisterFrameSinkHierarchy(
     const cc::FrameSinkId& parent_id) {
   if (registered_parent_frame_sink_id_.is_valid())
     UnregisterFrameSinkHierarchy();
   registered_parent_frame_sink_id_ = parent_id;
   surface_manager_->RegisterSurfaceFactoryClient(frame_sink_id_, this);
   surface_manager_->RegisterFrameSinkHierarchy(parent_id, frame_sink_id_);
@@ skipping 20 matching lines @@
 }
 
 void DelegatedFrameHostAndroid::UpdateBackgroundLayer() {
   // The background layer draws in 2 cases:
   // 1) When we don't have any content from the renderer.
   // 2) When the bounds of the content received from the renderer does not match
   // the desired content bounds.
   bool background_is_drawable = false;
 
   if (current_frame_) {
-    float device_scale_factor = gfx::DeviceDisplayInfo().GetDIPScale();
+    float device_scale_factor = display::Screen::GetScreen()
+        ->GetDisplayNearestWindow(view_).device_scale_factor();
     gfx::Size content_size_in_dip = gfx::ConvertSizeToDIP(
         device_scale_factor, current_frame_->surface_size);
     background_is_drawable =
         content_size_in_dip.width() < container_size_in_dip_.width() ||
         content_size_in_dip.height() < container_size_in_dip_.height();
   } else {
     background_is_drawable = true;
   }
 
   background_layer_->SetIsDrawable(background_is_drawable);
 }
 
 }  // namespace ui