| Index: ui/ozone/platform/wayland/wayland_window.cc
|
| diff --git a/ui/ozone/platform/wayland/wayland_window.cc b/ui/ozone/platform/wayland/wayland_window.cc
|
| index 06944f8deb21390ba3ca04ba2cfcd88e0bd2226e..e28aacfa1dc5b0e3f3fdb5979c859839a78b3616 100644
|
| --- a/ui/ozone/platform/wayland/wayland_window.cc
|
| +++ b/ui/ozone/platform/wayland/wayland_window.cc
|
| @@ -19,7 +19,7 @@ WaylandWindow::WaylandWindow(PlatformWindowDelegate* delegate,
|
|
|
| WaylandWindow::~WaylandWindow() {
|
| if (xdg_surface_) {
|
| - display_->RemoveWindow(this);
|
| + display_->RemoveWindow(surface_.id());
|
| }
|
| }
|
|
|
| @@ -42,22 +42,12 @@ bool WaylandWindow::Initialize() {
|
| }
|
| xdg_surface_add_listener(xdg_surface_.get(), &xdg_surface_listener, this);
|
|
|
| - display_->AddWindow(this);
|
| + display_->AddWindow(surface_.id(), this);
|
| delegate_->OnAcceleratedWidgetAvailable(surface_.id(), 1.f);
|
|
|
| return true;
|
| }
|
|
|
| -wl_surface* WaylandWindow::GetSurface() {
|
| - DCHECK(surface_);
|
| - return surface_.get();
|
| -}
|
| -
|
| -gfx::AcceleratedWidget WaylandWindow::GetWidget() {
|
| - DCHECK(surface_);
|
| - return surface_.id();
|
| -}
|
| -
|
| void WaylandWindow::ApplyPendingBounds() {
|
| if (pending_bounds_.IsEmpty())
|
| return;
|
|
|