WIP fix for Ozone cursor woes in Mushrome: Numéro deux

services/ui/ws/threaded_image_cursors.h

 // Copyright 2017 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 SERVICES_UI_WS_THREADED_IMAGE_CURSORS_H_
 #define SERVICES_UI_WS_THREADED_IMAGE_CURSORS_H_
 
 #include "base/memory/weak_ptr.h"
 #include "ui/base/cursor/image_cursors.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }
 
 namespace ui {
 class PlatformWindow;
 
 namespace ws {
 
 // Wrapper around ui::ImageCursors, capable of executing its methods
 // asynchronously via the provided task runner.
 class ThreadedImageCursors {
  public:
   // |resource_runner| is the task runner for the thread which can be used to
   // load resources; |image_cursors_weak_ptr| is the object used to perform
   // cursor operations, and should only be dereferenced on |resource_runner|.
   ThreadedImageCursors(
       scoped_refptr<base::SingleThreadTaskRunner>& resource_task_runner,
-      base::WeakPtr<ui::ImageCursors> image_cursors_weak_ptr);
+      base::WeakPtr<ui::ImageCursorsHolder> image_cursors_holder_weak_ptr);
   ~ThreadedImageCursors();
 
   // Executes ui::ImageCursors::SetDisplay asynchronously.
   // Sets the display the cursors are loaded for. |scale_factor| determines the
   // size of the image to load. Returns true if the cursor image is reloaded.
   void SetDisplay(const display::Display& display, float scale_factor);
 
   // Asynchronously sets the size of the mouse cursor icon.
   void SetCursorSize(CursorSize cursor_size);
 
@@ skipping 10 matching lines @@
  private:
   // Task runner used for accessing |image_cursors_weak_ptr_.
   scoped_refptr<base::SingleThreadTaskRunner> resource_task_runner_;
 
   // Task runner of the Window Server thread (where this object is created and
   // destroyed).
   scoped_refptr<base::SingleThreadTaskRunner> ws_task_runner_;
 
   // Weak pointer to the actual ui::ImageCursors object used to perform the
   // cursor operations.
-  base::WeakPtr<ui::ImageCursors> image_cursors_weak_ptr_;
+  base::WeakPtr<ui::ImageCursorsHolder> image_cursors_holder_weak_ptr_;
 
   base::WeakPtrFactory<ThreadedImageCursors> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ThreadedImageCursors);
 };
 
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_THREADED_IMAGE_CURSORS_H_