Replaced CursorLoader in PlatformDisplay with a ImageCursor

services/ui/ws/platform_display.cc

 // Copyright 2014 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 "services/ui/ws/platform_display.h"
 
 #include "base/numerics/safe_conversions.h"
 #include "build/build_config.h"
 #include "cc/ipc/quads.mojom.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/output/delegated_frame_data.h"
 #include "services/shell/public/cpp/connection.h"
 #include "services/shell/public/cpp/connector.h"
 #include "services/ui/surfaces/display_compositor.h"
 #include "services/ui/surfaces/surfaces_state.h"
+#include "services/ui/ws/display.h"
 #include "services/ui/ws/platform_display_factory.h"
 #include "services/ui/ws/platform_display_init_params.h"
 #include "services/ui/ws/server_window.h"
 #include "services/ui/ws/window_coordinate_conversions.h"
 #include "third_party/skia/include/core/SkXfermode.h"
-#include "ui/base/cursor/cursor_loader.h"
+#include "ui/base/cursor/image_cursors.h"
 #include "ui/display/display.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/platform_window/platform_ime_controller.h"
 #include "ui/platform_window/platform_window.h"
 
 #if defined(OS_WIN)
 #include "ui/platform_window/win/win_window.h"
 #elif defined(USE_X11)
 #include "ui/platform_window/x11/x11_window.h"
@@ skipping 17 matching lines @@
     return factory_->CreatePlatformDisplay();
 
   return new DefaultPlatformDisplay(init_params);
 }
 
 DefaultPlatformDisplay::DefaultPlatformDisplay(
     const PlatformDisplayInitParams& init_params)
     : id_(init_params.display_id),
       platform_screen_(init_params.platform_screen),
 #if !defined(OS_ANDROID)
-      cursor_loader_(ui::CursorLoader::Create()),
+      image_cursors_(new ImageCursors),
 #endif
       frame_generator_(new FrameGenerator(this, init_params.surfaces_state)) {
   metrics_.bounds = init_params.display_bounds;
 }
 
 void DefaultPlatformDisplay::Init(PlatformDisplayDelegate* delegate) {
   delegate_ = delegate;
 
 #if defined(OS_WIN)
   platform_window_.reset(new ui::WinWindow(this, metrics_.bounds));
 #elif defined(USE_X11)
   platform_window_.reset(new ui::X11Window(this));
 #elif defined(OS_ANDROID)
   platform_window_.reset(new ui::PlatformWindowAndroid(this));
 #elif defined(USE_OZONE)
   platform_window_ = ui::OzonePlatform::GetInstance()->CreatePlatformWindow(
       this, metrics_.bounds);
 #else
   NOTREACHED() << "Unsupported platform";
 #endif
+
+#if !defined(OS_ANDROID)
+  image_cursors_->SetDisplay(
+      static_cast<ui::ws::Display*>(delegate_)->ToDisplay(),
+      GetDeviceScaleFactor());

[sadrul, 2016/08/22 14:39:40]

Instead of static casting, introduce display::Display
PlatformDisplayDelegate::GetDisplay()

[Alex Z., 2016/08/22 15:11:51]

Done.

+#endif
   platform_window_->SetBounds(metrics_.bounds);
   platform_window_->Show();
 }
 
 int64_t DefaultPlatformDisplay::GetId() const {
   return id_;
 }
 
 DefaultPlatformDisplay::~DefaultPlatformDisplay() {
   // Don't notify the delegate from the destructor.
@@ skipping 35 matching lines @@
 }
 
 void DefaultPlatformDisplay::SetCursorById(int32_t cursor_id) {
 #if !defined(OS_ANDROID)
   // TODO(erg): This still isn't sufficient, and will only use native cursors
   // that chrome would use, not custom image cursors. For that, we should
   // delegate to the window manager to load images from resource packs.
   //
   // We probably also need to deal with different DPIs.
   ui::Cursor cursor(cursor_id);
-  cursor_loader_->SetPlatformCursor(&cursor);
+  image_cursors_->SetPlatformCursor(&cursor);
+  // cursor_loader_->SetPlatformCursor(&cursor);

[sadrul, 2016/08/22 14:39:40]

Remove.

[Alex Z., 2016/08/22 15:11:51]

Done.

   platform_window_->SetCursor(cursor.platform());
 #endif
 }
 
 float DefaultPlatformDisplay::GetDeviceScaleFactor() {
   return metrics_.device_scale_factor;
 }
 
 display::Display::Rotation DefaultPlatformDisplay::GetRotation() {
   // TODO(sky): implement me.
@@ skipping 148 matching lines @@
   return delegate_ ? delegate_->IsInHighContrastMode() : false;
 }
 
 const ViewportMetrics& DefaultPlatformDisplay::GetViewportMetrics() {
   return metrics_;
 }
 
 }  // namespace ws
 
 }  // namespace ui