Decouple VR Shell DPR and CSS size from Physical Displays.

ui/display/android/screen_android.cc

Index: ui/display/android/screen_android.cc
diff --git a/ui/display/android/screen_android.cc b/ui/display/android/screen_android.cc
index 015d68cd4848a310125d559df280bbfa8d32b9be..adf2f232918f7a9af0d1ce8bef89006cd4307bcd 100644
--- a/ui/display/android/screen_android.cc
+++ b/ui/display/android/screen_android.cc
@@ -2,86 +2,100 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/display/screen.h"
+#include "ui/display/android/screen_android.h"
 
-#include "base/logging.h"
-#include "base/macros.h"
-#include "ui/display/display.h"
 #include "ui/gfx/android/device_display_info.h"
 #include "ui/gfx/geometry/size_conversions.h"
 
 namespace display {
 
-class ScreenAndroid : public Screen {
- public:
-  ScreenAndroid() {}
+ScreenAndroid::ScreenAndroid() {}
+ScreenAndroid::~ScreenAndroid() {}
 
-  gfx::Point GetCursorScreenPoint() override { return gfx::Point(); }
+gfx::Point ScreenAndroid::GetCursorScreenPoint() { return gfx::Point(); }
 
-  bool IsWindowUnderCursor(gfx::NativeWindow window) override {
-    NOTIMPLEMENTED();
-    return false;
-  }
+bool ScreenAndroid::IsWindowUnderCursor(gfx::NativeWindow window) {
+  NOTIMPLEMENTED();
+  return false;
+}
 
-  gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) override {
-    NOTIMPLEMENTED();
-    return NULL;
-  }
+gfx::NativeWindow ScreenAndroid::GetWindowAtScreenPoint(
+    const gfx::Point& point) {
+  NOTIMPLEMENTED();
+  return NULL;
+}
 
-  Display GetPrimaryDisplay() const override {
-    gfx::DeviceDisplayInfo device_info;
-    const float device_scale_factor = device_info.GetDIPScale();
-    // Note: GetPhysicalDisplayWidth/Height() does not subtract window
-    // decorations etc. Use it instead of GetDisplayWidth/Height() when
-    // available.
-    const gfx::Rect bounds_in_pixels =
-        gfx::Rect(device_info.GetPhysicalDisplayWidth()
-                      ? device_info.GetPhysicalDisplayWidth()
-                      : device_info.GetDisplayWidth(),
-                  device_info.GetPhysicalDisplayHeight()
-                      ? device_info.GetPhysicalDisplayHeight()
-                      : device_info.GetDisplayHeight());
-    const gfx::Rect bounds_in_dip = gfx::Rect(gfx::ScaleToCeiledSize(
-        bounds_in_pixels.size(), 1.0f / device_scale_factor));
-    Display display(0, bounds_in_dip);
-    if (!Display::HasForceDeviceScaleFactor())
-      display.set_device_scale_factor(device_scale_factor);
-    display.SetRotationAsDegree(device_info.GetRotationDegrees());
-    display.set_color_depth(device_info.GetBitsPerPixel());
-    display.set_depth_per_component(device_info.GetBitsPerComponent());
-    display.set_is_monochrome(device_info.GetBitsPerComponent() == 0);
-    return display;
+Display ScreenAndroid::GetPrimaryDisplay() const {
+  if (vr_display_map_.size() > 0) {

[mthiesse, 2016/10/20 22:01:37]

Whoops meant to revert some changes in this file that were for some debugging.
Will re-upload soon.

+    return dislpay_;
   }
+  gfx::DeviceDisplayInfo device_info;
+  const float device_scale_factor = device_info.GetDIPScale();
+  // Note: GetPhysicalDisplayWidth/Height() does not subtract window
+  // decorations etc. Use it instead of GetDisplayWidth/Height() when
+  // available.
+  const gfx::Rect bounds_in_pixels =
+      gfx::Rect(device_info.GetPhysicalDisplayWidth()
+                    ? device_info.GetPhysicalDisplayWidth()
+                    : device_info.GetDisplayWidth(),
+                device_info.GetPhysicalDisplayHeight()
+                    ? device_info.GetPhysicalDisplayHeight()
+                    : device_info.GetDisplayHeight());
+  const gfx::Rect bounds_in_dip = gfx::Rect(gfx::ScaleToCeiledSize(
+      bounds_in_pixels.size(), 1.0f / device_scale_factor));
+  Display display(0, bounds_in_dip);
+  if (!Display::HasForceDeviceScaleFactor())
+    display.set_device_scale_factor(device_scale_factor);
+  display.SetRotationAsDegree(device_info.GetRotationDegrees());
+  display.set_color_depth(device_info.GetBitsPerPixel());
+  display.set_depth_per_component(device_info.GetBitsPerComponent());
+  display.set_is_monochrome(device_info.GetBitsPerComponent() == 0);
+  return display;
+}
 
-  Display GetDisplayNearestWindow(gfx::NativeView view) const override {
-    return GetPrimaryDisplay();
-  }
+void ScreenAndroid::SetDisplayForWindow(gfx::NativeView view,
+                                        const Display& display) {
+  dislpay_ = display;
+  base::AutoLock autolock(vr_display_lock_);
+  vr_display_map_[view] = display;
+}
 
-  Display GetDisplayNearestPoint(const gfx::Point& point) const override {
+void ScreenAndroid::ClearDisplayForWindow(gfx::NativeView view) {
+  base::AutoLock autolock(vr_display_lock_);
+  vr_display_map_.erase(view);
+}
+
+Display ScreenAndroid::GetDisplayNearestWindow(gfx::NativeView view) const {
+  base::AutoLock autolock(vr_display_lock_);
+  auto iter = vr_display_map_.find(view);
+  if (iter == vr_display_map_.end()) {
     return GetPrimaryDisplay();
+  } else {
+    return iter->second;
   }
+}
 
-  int GetNumDisplays() const override { return 1; }
+Display ScreenAndroid::GetDisplayNearestPoint(const gfx::Point& point) const {
+  return GetPrimaryDisplay();
+}
 
-  std::vector<Display> GetAllDisplays() const override {
-    return std::vector<Display>(1, GetPrimaryDisplay());
-  }
+int ScreenAndroid::GetNumDisplays() const { return 1; }
 
-  Display GetDisplayMatching(const gfx::Rect& match_rect) const override {
-    return GetPrimaryDisplay();
-  }
+std::vector<Display> ScreenAndroid::GetAllDisplays() const {
+  return std::vector<Display>(1, GetPrimaryDisplay());
+}
 
-  void AddObserver(DisplayObserver* observer) override {
-    // no display change on Android.
-  }
+Display ScreenAndroid::GetDisplayMatching(const gfx::Rect& match_rect) const {
+  return GetPrimaryDisplay();
+}
 
-  void RemoveObserver(DisplayObserver* observer) override {
-    // no display change on Android.
-  }
+void ScreenAndroid::AddObserver(DisplayObserver* observer) {
+  // no display change on Android.
+}
 
- private:
-  DISALLOW_COPY_AND_ASSIGN(ScreenAndroid);
-};
+void ScreenAndroid::RemoveObserver(DisplayObserver* observer) {
+  // no display change on Android.
+}
 
 Screen* CreateNativeScreen() {
   return new ScreenAndroid;