wayland: Fix GetUserDataAs in remote_shell_get_remote_surface

components/exo/wayland/server.cc

 // Copyright 2015 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 "components/exo/wayland/server.h"
 
 #include <grp.h>
 #include <linux/input.h>
 #include <stddef.h>
 #include <stdint.h>
@@ skipping 1475 matching lines @@
     remote_surface_maximize,
     remote_surface_minimize,
     remote_surface_restore,
     remote_surface_pin,
     remote_surface_unpin,
     remote_surface_unfullscreen};
 
 ////////////////////////////////////////////////////////////////////////////////
 // remote_shell_interface:
 
-// Observer class that monitors workspace state needed to implement the
-// remote shell interface.
-class WaylandWorkspaceObserver : public ash::ShellObserver,
-                                 public aura::client::ActivationChangeObserver,
-                                 public display::DisplayObserver {
+// Implements remote shell interface and monitors workspace state needed
+// for the remote shell interface.
+class WaylandRemoteShell : public ash::ShellObserver,
+                           public aura::client::ActivationChangeObserver,
+                           public display::DisplayObserver {
  public:
-  WaylandWorkspaceObserver(const display::Display& display,
-                           wl_resource* remote_shell_resource)
-      : display_id_(display.id()),
+  WaylandRemoteShell(Display* display,
+                     int64_t display_id,
+                     wl_resource* remote_shell_resource)
+      : display_(display),
+        display_id_(display_id),
         remote_shell_resource_(remote_shell_resource) {
     ash::WmShell::Get()->AddShellObserver(this);
     ash::Shell* shell = ash::Shell::GetInstance();
     shell->activation_client()->AddObserver(this);
     display::Screen::GetScreen()->AddObserver(this);
     SendConfigure();
     SendActivated(shell->activation_client()->GetActiveWindow(), nullptr);
   }
-  ~WaylandWorkspaceObserver() override {
+  ~WaylandRemoteShell() override {
     ash::WmShell::Get()->RemoveShellObserver(this);
     ash::Shell::GetInstance()->activation_client()->RemoveObserver(this);
     display::Screen::GetScreen()->RemoveObserver(this);
   }
 
+  std::unique_ptr<ShellSurface> CreateShellSurface(Surface* surface,
+                                                   int container) {
+    return display_->CreateRemoteShellSurface(surface, container);
+  }
+
   // Overridden from display::DisplayObserver:
   void OnDisplayAdded(const display::Display& new_display) override {}
   void OnDisplayRemoved(const display::Display& new_display) override {}
   void OnDisplayMetricsChanged(const display::Display& display,
                                uint32_t metrics) override {
     if (display.id() == display_id_)
       SendConfigure();
   }
 
   // Overridden from ash::ShellObserver:
@@ skipping 46 matching lines @@
         wl_resource_get_client(lost_active_surface_resource) != client) {
       lost_active_surface_resource = nullptr;
     }
 
     zwp_remote_shell_v1_send_activated(remote_shell_resource_,
                                        gained_active_surface_resource,
                                        lost_active_surface_resource);
     wl_client_flush(client);
   }
 
+  // The exo display instance. Not owned.
+  Display* const display_;
+
   // The identifier associated with the observed display.
   int64_t display_id_;
 
   // The remote shell resource associated with observer.
   wl_resource* const remote_shell_resource_;
 
-  DISALLOW_COPY_AND_ASSIGN(WaylandWorkspaceObserver);
+  DISALLOW_COPY_AND_ASSIGN(WaylandRemoteShell);
 };
 
 void remote_shell_destroy(wl_client* client, wl_resource* resource) {
   // Nothing to do here.
 }
 
 int RemoteSurfaceContainer(uint32_t container) {
   switch (container) {
     case ZWP_REMOTE_SHELL_V1_CONTAINER_DEFAULT:
       return ash::kShellWindowId_DefaultContainer;
@@ skipping 48 matching lines @@
   }
   wl_client_flush(wl_resource_get_client(resource));
 }
 
 void remote_shell_get_remote_surface(wl_client* client,
                                      wl_resource* resource,
                                      uint32_t id,
                                      wl_resource* surface,
                                      uint32_t container) {
   std::unique_ptr<ShellSurface> shell_surface =
-      GetUserDataAs<Display>(resource)->CreateRemoteShellSurface(
+      GetUserDataAs<WaylandRemoteShell>(resource)->CreateShellSurface(
           GetUserDataAs<Surface>(surface), RemoteSurfaceContainer(container));
   if (!shell_surface) {
     wl_resource_post_error(resource, ZWP_REMOTE_SHELL_V1_ERROR_ROLE,
                            "surface has already been assigned a role");
     return;
   }
 
   wl_resource* remote_surface_resource =
       wl_resource_create(client, &zwp_remote_surface_v1_interface,
                          wl_resource_get_version(resource), id);
@@ skipping 20 matching lines @@
                        uint32_t id) {
   wl_resource* resource =
       wl_resource_create(client, &zwp_remote_shell_v1_interface,
                          std::min(version, remote_shell_version), id);
 
   // TODO(reveman): Multi-display support.
   const display::Display& display = ash::Shell::GetInstance()
                                         ->display_manager()
                                         ->GetPrimaryDisplayCandidate();
 
-  SetImplementation(
-      resource, &remote_shell_implementation,
-      base::WrapUnique(new WaylandWorkspaceObserver(display, resource)));
+  SetImplementation(resource, &remote_shell_implementation,
+                    base::WrapUnique(new WaylandRemoteShell(
+                        static_cast<Display*>(data), display.id(), resource)));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // wl_data_device_interface:
 
 void data_device_start_drag(wl_client* client,
                             wl_resource* resource,
                             wl_resource* source_resource,
                             wl_resource* origin_resource,
                             wl_resource* icon_resource,
@@ skipping 925 matching lines @@
   DCHECK(event_loop);
   wl_event_loop_dispatch(event_loop, timeout.InMilliseconds());
 }
 
 void Server::Flush() {
   wl_display_flush_clients(wl_display_.get());
 }
 
 }  // namespace wayland
 }  // namespace exo