Revert "X11 and Ozone: Move initialization to DWTHPlatform"

This reverts commit 543a7657.

Reason for revert:

Findit (https://goo.gl/kROfz5) identified CL at revision 693093 as the
culprit for failures in the build cycles as shown on:
https://analysis.chromium.org/waterfall/culprit?key=ag9zfmZpbmRpdC1mb3ItbWVyRAsSDVdmU3VzcGVjdGVkQ0wiMWNocm9taXVtLzU0M2E3NjU3MDA4ODVkMmRiMzU4NzgzOWRjZmZjNGVjOGFhZTI5ODYM

Sample Failed Build: https://ci.chromium.org/buildbot/chromium.linux/fuchsia-x64-cast/51291

Sample Failed Step: compile

Original change's description:
> X11 and Ozone: Move initialization to DWTHPlatform
> 
> This CL moves the initialization of the X11Window aka PlatformWindow
> to the DWTHPlatform and let the WTHPlatform to own the window instead.
> 
> Also, instead of storing of XID in open_windows_, we store
> AcceleratedWidget now, which is ok as XID and AcceleratedWidget
> have the same type and it has already been used around the code.
> 
> In the follow up CLs, I will start moving all the other codes from
> DWTHX11 and add extend the existing PlatformWindow interface in
> order to be able stop accessing the XWindow directly from the
> DWTHX11.
> 
> Also, AdjustSize and GetRootTransform have been moved to DWTHPlatform
> and declared as protected so that DWTHX11 could access them. What is
> more, the ToPixelRect and ToDIPRect have been removed from DWTHX11 as
> the DWTHPlatform has already had those methods.
> 
> Bug: 990756
> Change-Id: I077773fe3154d12696dcbfb606bb3eb3122c0936
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1769442
> Commit-Queue: Maksim Sisov <msisov@igalia.com>
> Reviewed-by: Scott Violet <sky@chromium.org>
> Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#693093}


Change-Id: I1312146ae26ae17fed7985bba81ee81ad055ae32
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 990756
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1783522
Cr-Commit-Position: refs/heads/master@{#693104}

components/viz/demo/demo_main.cc

@@ -119,7 +119,7 @@ class DemoWindow : public ui::PlatformWindowDelegate {
 #elif defined(OS_WIN)
     return std::make_unique<ui::WinWindow>(this, props.bounds);
 #elif defined(USE_X11)
-    auto x11_window = std::make_unique<ui::X11Window>(this);
+    auto x11_window = std::make_unique<ui::X11Window>(this, nullptr);
     x11_window->Initialize(std::move(props));
     return x11_window;
 #else

gpu/vulkan/demo/vulkan_demo.cc

@@ -44,7 +44,7 @@ void VulkanDemo::Initialize() {
 
   ui::PlatformWindowInitProperties properties;
   properties.bounds = gfx::Rect(100, 100, 800, 600);
-  auto x11_window = std::make_unique<ui::X11Window>(this);
+  auto x11_window = std::make_unique<ui::X11Window>(this, nullptr);
   x11_window->Initialize(std::move(properties));
 
   window_ = std::move(x11_window);

ui/aura/window_tree_host_platform.cc

@@ -74,7 +74,7 @@ void WindowTreeHostPlatform::CreateAndSetPlatformWindow(
 #elif defined(OS_WIN)
   platform_window_.reset(new ui::WinWindow(this, properties.bounds));
 #elif defined(USE_X11)
-  auto x11_window = std::make_unique<ui::X11Window>(this);
+  auto x11_window = std::make_unique<ui::X11Window>(this, nullptr);
   x11_window->Initialize(std::move(properties));
   SetPlatformWindow(std::move(x11_window));
 #else

ui/ozone/platform/x11/x11_window_ozone.cc

@@ -25,7 +25,7 @@ namespace ui {
 
 X11WindowOzone::X11WindowOzone(PlatformWindowDelegate* delegate,
                                X11WindowManagerOzone* window_manager)
-    : X11Window(delegate), window_manager_(window_manager) {
+    : X11Window(delegate, nullptr), window_manager_(window_manager) {
   DCHECK(window_manager_);
 
   // Set a class property key, which allows |this| to be used for interactive

ui/platform_window/platform_window_init_properties.h

@@ -73,18 +73,18 @@ struct PlatformWindowInitProperties {
   bool remove_standard_frame = false;
   std::string workspace;
 
-#if defined(OS_LINUX)
+#if defined(USE_X11)
+  // Only used by X11:
   bool prefer_dark_theme = false;
   gfx::ImageSkia* icon = nullptr;
   base::Optional<int> background_color;
-
+#endif
   // Specifies the res_name and res_class fields,
   // respectively, of the WM_CLASS window property. Controls window grouping
   // and desktop file matching in Linux window managers.
   std::string wm_role_name;
   std::string wm_class_name;
   std::string wm_class_class;
-#endif
 };
 
 }  // namespace ui

ui/platform_window/x11/x11_window.cc

@@ -71,8 +71,10 @@ ui::XWindow::Configuration ConvertInitPropertiesToXWindowConfig(
 
 }  // namespace
 
-X11Window::X11Window(PlatformWindowDelegateLinux* platform_window_delegate)
-    : platform_window_delegate_(platform_window_delegate) {}
+X11Window::X11Window(PlatformWindowDelegateLinux* platform_window_delegate,
+                     XEventDelegate* x_event_delegate)
+    : platform_window_delegate_(platform_window_delegate),
+      x_event_delegate_(x_event_delegate) {}
 
 X11Window::~X11Window() {
   PrepareForShutdown();
@@ -85,11 +87,6 @@ void X11Window::Initialize(PlatformWindowInitProperties properties) {
   Init(config);
 }
 
-void X11Window::SetXEventDelegate(XEventDelegate* delegate) {
-  DCHECK(!x_event_delegate_);
-  x_event_delegate_ = delegate;
-}
-
 void X11Window::Show() {
   // TODO(msisov): pass inactivity to PlatformWindow::Show.
   XWindow::Map(false /* inactive */);

ui/platform_window/x11/x11_window.h

@@ -14,6 +14,8 @@
 
 namespace ui {
 
+class PlatformWindowDelegateLinux;
+
 // Delegate interface used to communicate the X11PlatformWindow API client about
 // XEvents of interest.
 class X11_WINDOW_EXPORT XEventDelegate {
@@ -36,13 +38,12 @@ class X11_WINDOW_EXPORT X11Window : public PlatformWindow,
                                     public XWindow,
                                     public PlatformEventDispatcher {
  public:
-  explicit X11Window(PlatformWindowDelegateLinux* platform_window_delegate);
+  X11Window(PlatformWindowDelegateLinux* platform_window_delegate,
+            XEventDelegate* x_event_delegate);
   ~X11Window() override;
 
   void Initialize(PlatformWindowInitProperties properties);
 
-  void SetXEventDelegate(XEventDelegate* delegate);
-
   // PlatformWindow:
   void Show() override;
   void Hide() override;
@@ -109,7 +110,7 @@ class X11_WINDOW_EXPORT X11Window : public PlatformWindow,
 
   PlatformWindowDelegateLinux* const platform_window_delegate_;
 
-  XEventDelegate* x_event_delegate_ = nullptr;
+  XEventDelegate* const x_event_delegate_;
 
   // Tells if the window got a ::Close call.
   bool is_shutting_down_ = false;

ui/views/BUILD.gn

@@ -756,10 +756,8 @@ jumbo_component("views") {
         ]
       }
       if (is_linux) {
-        public += [ "widget/desktop_aura/desktop_window_tree_host_linux.h" ]
         sources += [
           "style/platform_style_linux.cc",
-          "widget/desktop_aura/desktop_window_tree_host_linux.cc",
           "widget/desktop_aura/window_event_filter.cc",
           "widget/desktop_aura/window_event_filter.h",
         ]

ui/views/widget/desktop_aura/desktop_window_tree_host.h

@@ -19,13 +19,13 @@ class Window;
 namespace client {
 class DragDropClient;
 class ScreenPositionClient;
-}  // namespace client
+}
 }  // namespace aura
 
 namespace gfx {
 class ImageSkia;
 class Rect;
-}  // namespace gfx
+}
 
 namespace views {
 namespace corewm {

ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc

-// Copyright 2019 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/views/widget/desktop_aura/desktop_window_tree_host_linux.h"
-
-#include "ui/display/display.h"
-#include "ui/display/screen.h"
-#include "ui/platform_window/platform_window_init_properties.h"
-#include "ui/views/linux_ui/linux_ui.h"
-#include "ui/views/views_delegate.h"
-#include "ui/views/widget/widget.h"
-
-namespace views {
-
-DesktopWindowTreeHostLinux::DesktopWindowTreeHostLinux(
-    internal::NativeWidgetDelegate* native_widget_delegate,
-    DesktopNativeWidgetAura* desktop_native_widget_aura)
-    : DesktopWindowTreeHostPlatform(native_widget_delegate,
-                                    desktop_native_widget_aura) {}
-
-DesktopWindowTreeHostLinux::~DesktopWindowTreeHostLinux() = default;
-
-gfx::Size DesktopWindowTreeHostLinux::AdjustSizeForDisplay(
-    const gfx::Size& requested_size_in_pixels) {
-  std::vector<display::Display> displays =
-      display::Screen::GetScreen()->GetAllDisplays();
-  // Compare against all monitor sizes. The window manager can move the window
-  // to whichever monitor it wants.
-  for (const auto& display : displays) {
-    if (requested_size_in_pixels == display.GetSizeInPixel()) {
-      return gfx::Size(requested_size_in_pixels.width() - 1,
-                       requested_size_in_pixels.height() - 1);
-    }
-  }
-
-  // Do not request a 0x0 window size. It causes an XError.
-  gfx::Size size_in_pixels = requested_size_in_pixels;
-  size_in_pixels.SetToMax(gfx::Size(1, 1));
-  return size_in_pixels;
-}
-
-void DesktopWindowTreeHostLinux::AddAdditionalInitProperties(
-    ui::PlatformWindowInitProperties* properties) {
-  // Calculate initial bounds
-  gfx::Rect bounds_in_pixels = ToPixelRect(properties->bounds);
-  gfx::Size adjusted_size = AdjustSizeForDisplay(bounds_in_pixels.size());
-  bounds_in_pixels.set_size(adjusted_size);
-  properties->bounds = bounds_in_pixels;
-
-  // Set the background color on startup to make the initial flickering
-  // happening between the XWindow is mapped and the first expose event
-  // is completely handled less annoying. If possible, we use the content
-  // window's background color, otherwise we fallback to white.
-  base::Optional<int> background_color;
-  const views::LinuxUI* linux_ui = views::LinuxUI::instance();
-  if (linux_ui && content_window()) {
-    ui::NativeTheme::ColorId target_color;
-    switch (properties->type) {
-      case ui::PlatformWindowType::kBubble:
-        target_color = ui::NativeTheme::kColorId_BubbleBackground;
-        break;
-      case ui::PlatformWindowType::kTooltip:
-        target_color = ui::NativeTheme::kColorId_TooltipBackground;
-        break;
-      default:
-        target_color = ui::NativeTheme::kColorId_WindowBackground;
-        break;
-    }
-    ui::NativeTheme* theme = linux_ui->GetNativeTheme(content_window());
-    background_color = theme->GetSystemColor(target_color);
-  }
-  properties->prefer_dark_theme = linux_ui && linux_ui->PreferDarkTheme();
-  properties->background_color = background_color;
-  properties->icon = ViewsDelegate::GetInstance()->GetDefaultWindowIcon();
-}
-
-}  // namespace views

ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h

-// Copyright 2019 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.
-
-#ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_LINUX_H_
-#define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_LINUX_H_
-
-#include "base/macros.h"
-#include "ui/views/views_export.h"
-#include "ui/views/widget/desktop_aura/desktop_window_tree_host_platform.h"
-
-namespace views {
-
-// Contains Linux specific implementation.
-class VIEWS_EXPORT DesktopWindowTreeHostLinux
-    : public DesktopWindowTreeHostPlatform {
- public:
-  DesktopWindowTreeHostLinux(
-      internal::NativeWidgetDelegate* native_widget_delegate,
-      DesktopNativeWidgetAura* desktop_native_widget_aura);
-  ~DesktopWindowTreeHostLinux() override;
-
- protected:
-  // Adjusts |requested_size| to avoid the WM "feature" where setting the
-  // window size to the monitor size causes the WM to set the EWMH for
-  // fullscreen.
-  //
-  // TODO(https://crbug.com/990756)): this method is mainly for X11
-  // impl (Wayland does not need this workaround). Move this to X11Window
-  // instead. We can't do it now as there are some methods that depend on this.
-  gfx::Size AdjustSizeForDisplay(const gfx::Size& requested_size_in_pixels);
-
- private:
-  // DesktopWindowTreeHostPlatform overrides:
-  void AddAdditionalInitProperties(
-      ui::PlatformWindowInitProperties* properties) override;
-
-  DISALLOW_COPY_AND_ASSIGN(DesktopWindowTreeHostLinux);
-};
-
-}  // namespace views
-
-#endif  // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_LINUX_H_

ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc

@@ -7,7 +7,6 @@
 #include "base/bind.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
-#include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/drag_drop_client.h"
 #include "ui/aura/client/transient_window_client.h"
 #include "ui/base/hit_test.h"
@@ -27,71 +26,6 @@
 
 namespace views {
 
-namespace {
-
-ui::PlatformWindowInitProperties ConvertWidgetInitParamsToInitProperties(
-    const Widget::InitParams& params) {
-  ui::PlatformWindowInitProperties properties;
-
-  switch (params.type) {
-    case Widget::InitParams::TYPE_WINDOW:
-      properties.type = ui::PlatformWindowType::kWindow;
-      break;
-
-    case Widget::InitParams::TYPE_MENU:
-      properties.type = ui::PlatformWindowType::kMenu;
-      break;
-
-    case Widget::InitParams::TYPE_TOOLTIP:
-      properties.type = ui::PlatformWindowType::kTooltip;
-      break;
-
-    case Widget::InitParams::TYPE_DRAG:
-      properties.type = ui::PlatformWindowType::kDrag;
-      break;
-
-    case Widget::InitParams::TYPE_BUBBLE:
-      properties.type = ui::PlatformWindowType::kBubble;
-      break;
-
-    default:
-      properties.type = ui::PlatformWindowType::kPopup;
-      break;
-  }
-
-  properties.bounds = params.bounds;
-  properties.activatable =
-      params.activatable == Widget::InitParams::ACTIVATABLE_YES;
-  properties.force_show_in_taskbar = params.force_show_in_taskbar;
-  properties.keep_on_top =
-      params.EffectiveZOrderLevel() != ui::ZOrderLevel::kNormal;
-  properties.visible_on_all_workspaces = params.visible_on_all_workspaces;
-  properties.remove_standard_frame = params.remove_standard_frame;
-  properties.workspace = params.workspace;
-  properties.wm_class_name = params.wm_class_name;
-  properties.wm_class_class = params.wm_class_class;
-  properties.wm_role_name = params.wm_role_name;
-
-  if (params.parent && params.parent->GetHost())
-    properties.parent_widget = params.parent->GetHost()->GetAcceleratedWidget();
-
-  switch (params.opacity) {
-    case Widget::InitParams::WindowOpacity::INFER_OPACITY:
-      properties.opacity = ui::PlatformWindowOpacity::kInferOpacity;
-      break;
-    case Widget::InitParams::WindowOpacity::OPAQUE_WINDOW:
-      properties.opacity = ui::PlatformWindowOpacity::kOpaqueWindow;
-      break;
-    case Widget::InitParams::WindowOpacity::TRANSLUCENT_WINDOW:
-      properties.opacity = ui::PlatformWindowOpacity::kTranslucentWindow;
-      break;
-  }
-
-  return properties;
-}
-
-}  // namespace
-
 ////////////////////////////////////////////////////////////////////////////////
 // DesktopWindowTreeHostPlatform:
 
@@ -112,22 +46,15 @@ DesktopWindowTreeHostPlatform::~DesktopWindowTreeHostPlatform() {
 }
 
 void DesktopWindowTreeHostPlatform::Init(const Widget::InitParams& params) {
-  if (params.type == Widget::InitParams::TYPE_WINDOW)
-    content_window()->SetProperty(aura::client::kAnimationsDisabledKey, true);
-
   ui::PlatformWindowInitProperties properties =
       ConvertWidgetInitParamsToInitProperties(params);
-  AddAdditionalInitProperties(&properties);
 
   CreateAndSetPlatformWindow(std::move(properties));
-  // Disable compositing on tooltips as a workaround for
-  // https://crbug.com/442111.
-  CreateCompositor(viz::FrameSinkId(),
-                   params.force_software_compositing ||
-                       params.type == Widget::InitParams::TYPE_TOOLTIP);
-
-  WindowTreeHost::OnAcceleratedWidgetAvailable();
+  CreateCompositor(viz::FrameSinkId(), params.force_software_compositing);
+  aura::WindowTreeHost::OnAcceleratedWidgetAvailable();
   InitHost();
+  if (!params.bounds.IsEmpty())
+    SetBoundsInDIP(params.bounds);
   window()->Show();
 }
 
@@ -159,6 +86,18 @@ void DesktopWindowTreeHostPlatform::OnWidgetInitDone() {}
 
 void DesktopWindowTreeHostPlatform::OnActiveWindowChanged(bool active) {}
 
+base::Optional<gfx::Size>
+DesktopWindowTreeHostPlatform::GetMinimumSizeForWindow() {
+  return ToPixelRect(gfx::Rect(native_widget_delegate()->GetMinimumSize()))
+      .size();
+}
+
+base::Optional<gfx::Size>
+DesktopWindowTreeHostPlatform::GetMaximumSizeForWindow() {
+  return ToPixelRect(gfx::Rect(native_widget_delegate()->GetMaximumSize()))
+      .size();
+}
+
 std::unique_ptr<corewm::Tooltip>
 DesktopWindowTreeHostPlatform::CreateTooltip() {
   return std::make_unique<corewm::TooltipAura>();
@@ -540,19 +479,6 @@ bool DesktopWindowTreeHostPlatform::ShouldCreateVisibilityController() const {
   return true;
 }
 
-gfx::Transform DesktopWindowTreeHostPlatform::GetRootTransform() const {
-  display::Display display = display::Screen::GetScreen()->GetPrimaryDisplay();
-  if (IsVisible()) {
-    display = display::Screen::GetScreen()->GetDisplayNearestWindow(
-        GetWidget()->GetNativeWindow());
-  }
-
-  float scale = display.device_scale_factor();
-  gfx::Transform transform;
-  transform.Scale(scale, scale);
-  return transform;
-}
-
 void DesktopWindowTreeHostPlatform::DispatchEvent(ui::Event* event) {
 #if defined(USE_OZONE)
   // Make sure the |event| is marked as a non-client if it's a non-client
@@ -611,34 +537,70 @@ void DesktopWindowTreeHostPlatform::OnActivationChanged(bool active) {
   desktop_native_widget_aura_->HandleActivationChanged(active);
 }
 
-base::Optional<gfx::Size>
-DesktopWindowTreeHostPlatform::GetMinimumSizeForWindow() {
-  return ToPixelRect(gfx::Rect(native_widget_delegate()->GetMinimumSize()))
-      .size();
-}
+ui::PlatformWindowInitProperties
+DesktopWindowTreeHostPlatform::ConvertWidgetInitParamsToInitProperties(
+    const Widget::InitParams& params) {
+  ui::PlatformWindowInitProperties properties;
 
-base::Optional<gfx::Size>
-DesktopWindowTreeHostPlatform::GetMaximumSizeForWindow() {
-  return ToPixelRect(gfx::Rect(native_widget_delegate()->GetMaximumSize()))
-      .size();
-}
+  switch (params.type) {
+    case Widget::InitParams::TYPE_WINDOW:
+      properties.type = ui::PlatformWindowType::kWindow;
+      break;
 
-aura::Window* DesktopWindowTreeHostPlatform::content_window() {
-  return desktop_native_widget_aura_->content_window();
-}
+    case Widget::InitParams::TYPE_MENU:
+      properties.type = ui::PlatformWindowType::kMenu;
+      break;
 
-gfx::Rect DesktopWindowTreeHostPlatform::ToDIPRect(
-    const gfx::Rect& rect_in_pixels) const {
-  gfx::RectF rect_in_dip = gfx::RectF(rect_in_pixels);
-  GetRootTransform().TransformRectReverse(&rect_in_dip);
-  return gfx::ToEnclosingRect(rect_in_dip);
+    case Widget::InitParams::TYPE_TOOLTIP:
+      properties.type = ui::PlatformWindowType::kTooltip;
+      break;
+
+    case Widget::InitParams::TYPE_DRAG:
+      properties.type = ui::PlatformWindowType::kDrag;
+      break;
+
+    case Widget::InitParams::TYPE_BUBBLE:
+      properties.type = ui::PlatformWindowType::kBubble;
+      break;
+
+    default:
+      properties.type = ui::PlatformWindowType::kPopup;
+      break;
+  }
+
+  properties.bounds = params.bounds;
+  properties.activatable =
+      params.activatable == Widget::InitParams::ACTIVATABLE_YES;
+  properties.force_show_in_taskbar = params.force_show_in_taskbar;
+  properties.keep_on_top =
+      params.EffectiveZOrderLevel() != ui::ZOrderLevel::kNormal;
+  properties.visible_on_all_workspaces = params.visible_on_all_workspaces;
+  properties.remove_standard_frame = params.remove_standard_frame;
+  properties.workspace = params.workspace;
+  properties.wm_class_name = params.wm_class_name;
+  properties.wm_class_class = params.wm_class_class;
+  properties.wm_role_name = params.wm_role_name;
+
+  if (params.parent && params.parent->GetHost())
+    properties.parent_widget = params.parent->GetHost()->GetAcceleratedWidget();
+
+  switch (params.opacity) {
+    case Widget::InitParams::WindowOpacity::INFER_OPACITY:
+      properties.opacity = ui::PlatformWindowOpacity::kInferOpacity;
+      break;
+    case Widget::InitParams::WindowOpacity::OPAQUE_WINDOW:
+      properties.opacity = ui::PlatformWindowOpacity::kOpaqueWindow;
+      break;
+    case Widget::InitParams::WindowOpacity::TRANSLUCENT_WINDOW:
+      properties.opacity = ui::PlatformWindowOpacity::kTranslucentWindow;
+      break;
+  }
+
+  return properties;
 }
 
-gfx::Rect DesktopWindowTreeHostPlatform::ToPixelRect(
-    const gfx::Rect& rect_in_dip) const {
-  gfx::RectF rect_in_pixels = gfx::RectF(rect_in_dip);
-  GetRootTransform().TransformRect(&rect_in_pixels);
-  return gfx::ToEnclosingRect(rect_in_pixels);
+aura::Window* DesktopWindowTreeHostPlatform::content_window() {
+  return desktop_native_widget_aura_->content_window();
 }
 
 void DesktopWindowTreeHostPlatform::Relayout() {
@@ -665,12 +627,19 @@ Widget* DesktopWindowTreeHostPlatform::GetWidget() {
   return native_widget_delegate_->AsWidget();
 }
 
-const Widget* DesktopWindowTreeHostPlatform::GetWidget() const {
-  return native_widget_delegate_->AsWidget();
+gfx::Rect DesktopWindowTreeHostPlatform::ToDIPRect(
+    const gfx::Rect& rect_in_pixels) const {
+  gfx::RectF rect_in_dip = gfx::RectF(rect_in_pixels);
+  GetRootTransform().TransformRectReverse(&rect_in_dip);
+  return gfx::ToEnclosingRect(rect_in_dip);
 }
 
-void DesktopWindowTreeHostPlatform::AddAdditionalInitProperties(
-    ui::PlatformWindowInitProperties* properties) {}
+gfx::Rect DesktopWindowTreeHostPlatform::ToPixelRect(
+    const gfx::Rect& rect_in_dip) const {
+  gfx::RectF rect_in_pixels = gfx::RectF(rect_in_dip);
+  GetRootTransform().TransformRect(&rect_in_pixels);
+  return gfx::ToEnclosingRect(rect_in_pixels);
+}
 
 ////////////////////////////////////////////////////////////////////////////////
 // DesktopWindowTreeHost:

ui/views/widget/desktop_aura/desktop_window_tree_host_platform.h

@@ -90,9 +90,6 @@ class VIEWS_EXPORT DesktopWindowTreeHostPlatform
   bool ShouldUseDesktopNativeCursorManager() const override;
   bool ShouldCreateVisibilityController() const override;
 
-  // WindowTreeHost:
-  gfx::Transform GetRootTransform() const override;
-
   // PlatformWindowDelegateBase:
   void DispatchEvent(ui::Event* event) override;
   void OnClosed() override;
@@ -103,8 +100,11 @@ class VIEWS_EXPORT DesktopWindowTreeHostPlatform
   base::Optional<gfx::Size> GetMaximumSizeForWindow() override;
 
  protected:
-  // TODO(https://crbug.com/990756): move these methods back to private
-  // once DWTHX11 stops using them.
+  // TODO(https://crbug.com/990756): move this back to unnamed namespace, when
+  // DWTHX11 stops initialization of the PlatformWindow. Also, remove these
+  // accessor methods.
+  ui::PlatformWindowInitProperties ConvertWidgetInitParamsToInitProperties(
+      const Widget::InitParams& params);
   internal::NativeWidgetDelegate* native_widget_delegate() {
     return native_widget_delegate_;
   }
@@ -114,11 +114,6 @@ class VIEWS_EXPORT DesktopWindowTreeHostPlatform
   // Accessor for DesktopNativeWidgetAura::content_window().
   aura::Window* content_window();
 
-  // These are not general purpose methods and must be used with care. Please
-  // make sure you understand the rounding direction before using.
-  gfx::Rect ToDIPRect(const gfx::Rect& rect_in_pixels) const;
-  gfx::Rect ToPixelRect(const gfx::Rect& rect_in_dip) const;
-
  private:
   FRIEND_TEST_ALL_PREFIXES(DesktopWindowTreeHostPlatformTest, HitTest);
 
@@ -127,11 +122,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostPlatform
   void RemoveNonClientEventFilter();
 
   Widget* GetWidget();
-  const Widget* GetWidget() const;
 
-  // There are platform specific properties that Linux may want to add.
-  virtual void AddAdditionalInitProperties(
-      ui::PlatformWindowInitProperties* properties);
+  gfx::Rect ToDIPRect(const gfx::Rect& rect_in_pixels) const;
+  gfx::Rect ToPixelRect(const gfx::Rect& rect_in_dip) const;
 
   internal::NativeWidgetDelegate* const native_widget_delegate_;
   DesktopNativeWidgetAura* const desktop_native_widget_aura_;

ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h

@@ -19,6 +19,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "ui/aura/scoped_window_targeter.h"
+#include "ui/aura/window_tree_host.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/x/x11_types.h"
@@ -26,7 +27,7 @@
 #include "ui/platform_window/platform_window_handler/wm_move_resize_handler.h"
 #include "ui/platform_window/x11/x11_window.h"
 #include "ui/views/views_export.h"
-#include "ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h"
+#include "ui/views/widget/desktop_aura/desktop_window_tree_host_platform.h"
 
 namespace gfx {
 class ImageSkia;
@@ -48,9 +49,10 @@ class NonClientFrameView;
 class X11DesktopWindowMoveClient;
 class WindowEventFilter;
 
-class VIEWS_EXPORT DesktopWindowTreeHostX11 : public DesktopWindowTreeHostLinux,
-                                              public ui::WmMoveResizeHandler,
-                                              public ui::XEventDelegate {
+class VIEWS_EXPORT DesktopWindowTreeHostX11
+    : public DesktopWindowTreeHostPlatform,
+      public ui::WmMoveResizeHandler,
+      public ui::XEventDelegate {
  public:
   DesktopWindowTreeHostX11(
       internal::NativeWidgetDelegate* native_widget_delegate,
@@ -168,7 +170,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11 : public DesktopWindowTreeHostLinux,
   bool ShouldCreateVisibilityController() const override;
 
   // Overridden from aura::WindowTreeHost:
+  gfx::Transform GetRootTransform() const override;
   ui::EventSource* GetEventSource() override;
+  gfx::AcceleratedWidget GetAcceleratedWidget() override;
   void ShowImpl() override;
   void HideImpl() override;
   gfx::Rect GetBoundsInPixels() const override;
@@ -205,6 +209,11 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11 : public DesktopWindowTreeHostLinux,
   // along with all aura client objects that direct behavior.
   aura::WindowEventDispatcher* InitDispatcher(const Widget::InitParams& params);
 
+  // Adjusts |requested_size| to avoid the WM "feature" where setting the
+  // window size to the monitor size causes the WM to set the EWMH for
+  // fullscreen.
+  gfx::Size AdjustSize(const gfx::Size& requested_size);
+
   // Sets whether the window's borders are provided by the window manager.
   void SetUseNativeFrame(bool use_native_frame);
 
@@ -237,6 +246,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11 : public DesktopWindowTreeHostLinux,
 
   void DelayedChangeFrameType(Widget::FrameType new_type);
 
+  gfx::Rect ToDIPRect(const gfx::Rect& rect_in_pixels) const;
+  gfx::Rect ToPixelRect(const gfx::Rect& rect_in_dip) const;
+
   // Enables event listening after closing |dialog|.
   void EnableEventListening();
 
@@ -268,13 +280,6 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11 : public DesktopWindowTreeHostLinux,
   void OnXWindowDragDropEvent(XEvent* xev) override;
   void OnXWindowRawKeyEvent(XEvent* xev) override;
 
-  // Casts PlatformWindow into XWindow and returns the result. This is a temp
-  // solution to access XWindow, which is subclassed by the X11Window, which is
-  // PlatformWindow. This will be removed once we no longer to access XWindow
-  // directly. See https://crbug.com/990756.
-  ui::XWindow* GetXWindow();
-  const ui::XWindow* GetXWindow() const;
-
   // The bounds of our window before we were maximized.
   gfx::Rect restored_bounds_in_pixels_;
 
@@ -304,7 +309,7 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11 : public DesktopWindowTreeHostLinux,
 
   // A list of all (top-level) windows that have been created but not yet
   // destroyed.
-  static std::list<gfx::AcceleratedWidget>* open_windows_;
+  static std::list<XID>* open_windows_;
 
   // Cached value for SetVisible.  Not the same as the IsVisible public API.
   bool is_compositor_set_visible_ = false;
@@ -318,6 +323,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11 : public DesktopWindowTreeHostLinux,
 
   std::unique_ptr<CompositorObserver> compositor_observer_;
 
+  std::unique_ptr<ui::X11Window> x11_window_;
+
   // The display and the native X window hosting the root window.
   base::WeakPtrFactory<DesktopWindowTreeHostX11> close_widget_factory_{this};
   base::WeakPtrFactory<DesktopWindowTreeHostX11> weak_factory_{this};