Rollback GetRootTransform change and dependent changes

Changes to GetRootTransform and OnHostResizedInPixels caused regression in linux-wayland and windows and this, so I'm reverting these changes for now. I will come up with a different approach. Bug: 1333437, 1329481 Change-Id: Ia98870a342bad3dad41905a99eb533955b1fb552 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3710772 Commit-Queue: Mitsuru Oshima <oshima@chromium.org> Reviewed-by: Scott Violet <sky@chromium.org> Cr-Commit-Position: refs/heads/main@{#1016240}
Denger-Network · Jun 21, 2022 · 808f40a · 808f40a
1 parent 9b35f59
commit 808f40a
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 19 deletions.
diff --git a/ui/ozone/platform/wayland/host/wayland_window.cc b/ui/ozone/platform/wayland/host/wayland_window.cc
@@ -659,12 +659,6 @@ void WaylandWindow::OnEnteredOutput() {
   if (AsWaylandPopup())
     return;
 
-  // Notify normal window's delegate only as updating the pixel bounds
-  // may close the popup, and popup will not usually enter new display.
-  // TODO(crbug.com/1306688): Revisit this when wayland implementation
-  // is switced to dip based.
-  delegate()->OnMovedToAnotherDisplay();
-
   UpdateWindowScale(true);
 }
 

diff --git a/ui/ozone/platform/x11/x11_screen_ozone.cc b/ui/ozone/platform/x11/x11_screen_ozone.cc
@@ -56,8 +56,12 @@ display::Display X11ScreenOzone::GetDisplayForAcceleratedWidget(
     return GetPrimaryDisplay();
 
   X11Window* window = window_manager_->GetWindow(widget);
-  if (window)
-    return GetDisplayMatching(window->GetBoundsInDIP());
+  if (window) {
+    // TODO(crbug.com/1306688): Change to use GetBoundsInDIP();
+    gfx::Rect bounds_dip = gfx::ToEnclosingRect(gfx::ConvertRectToDips(
+        window->GetBoundsInPixels(), GetXDisplayScaleFactor()));
+    return GetDisplayMatching(bounds_dip);
+  }
   return GetPrimaryDisplay();
 }
 

diff --git a/ui/platform_window/platform_window_delegate.cc b/ui/platform_window/platform_window_delegate.cc
@@ -55,8 +55,6 @@ gfx::Rect PlatformWindowDelegate::ConvertRectToPixels(
   return rect_in_dip;
 }
 
-void PlatformWindowDelegate::OnMovedToAnotherDisplay() {}
-
 gfx::Rect PlatformWindowDelegate::ConvertRectToDIP(
     const gfx::Rect& rect_in_pixels) const {
   return rect_in_pixels;

diff --git a/ui/platform_window/platform_window_delegate.h b/ui/platform_window/platform_window_delegate.h
@@ -140,9 +140,6 @@ class COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindowDelegate {
   // Enables or disables frame rate throttling.
   virtual void SetFrameRateThrottleEnabled(bool enabled);
 
-  // Called when the platform window is moved to another display.
-  virtual void OnMovedToAnotherDisplay();
-
   // Convert gfx::Rect in pixels to DIP in screen, and vice versa.
   virtual gfx::Rect ConvertRectToPixels(const gfx::Rect& rect_in_dp) const;
   virtual gfx::Rect ConvertRectToDIP(const gfx::Rect& rect_in_pixells) const;

diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
@@ -774,8 +774,20 @@ void DesktopWindowTreeHostPlatform::SetBoundsInDIP(const gfx::Rect& bounds) {
 }
 
 gfx::Transform DesktopWindowTreeHostPlatform::GetRootTransform() const {
+  // TODO(crbug.com/1306688): This can use wrong scale during initialization.
+  // Revisit this as a part of 'use dip' work.
+
+  display::Display display = display::Screen::GetScreen()->GetPrimaryDisplay();
+  // This might be called before the |platform_window| is created. Thus,
+  // explicitly check if that exists before trying to access its visibility and
+  // the display where it is shown.
+  if (platform_window())
+    display = GetDisplayNearestRootWindow();
+  else if (window_parent_)
+    display = window_parent_->GetDisplayNearestRootWindow();
   gfx::Transform transform;
-  transform.Scale(device_scale_factor(), device_scale_factor());
+  float scale = display.device_scale_factor();
+  transform.Scale(scale, scale);
   return transform;
 }
 
@@ -895,10 +907,6 @@ DesktopWindowTreeHostPlatform::GetOwnedWindowAnchorAndRectInPx() {
   return window_anchor;
 }
 
-void DesktopWindowTreeHostPlatform::OnMovedToAnotherDisplay() {
-  WindowTreeHost::OnHostResizedInPixels(GetBoundsInPixels().size());
-}
-
 gfx::Rect DesktopWindowTreeHostPlatform::ConvertRectToPixels(
     const gfx::Rect& rect_in_dip) const {
   return ToPixelRect(rect_in_dip);

diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.h b/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.h
@@ -153,7 +153,6 @@ class VIEWS_EXPORT DesktopWindowTreeHostPlatform
   absl::optional<ui::MenuType> GetMenuType() override;
   absl::optional<ui::OwnedWindowAnchor> GetOwnedWindowAnchorAndRectInPx()
       override;
-  void OnMovedToAnotherDisplay() override;
   gfx::Rect ConvertRectToPixels(const gfx::Rect& rect_in_dip) const override;
   gfx::Rect ConvertRectToDIP(const gfx::Rect& rect_in_pixels) const override;
   gfx::PointF ConvertScreenPointToLocalDIP(