| Index: services/ui/ws/platform_display.cc
|
| diff --git a/services/ui/ws/platform_display.cc b/services/ui/ws/platform_display.cc
|
| index 587e4508e446f6ba96bf234413ab5a9834e06c3b..1a576c0f9b98b8e6f560652c7ae24258c7a62441 100644
|
| --- a/services/ui/ws/platform_display.cc
|
| +++ b/services/ui/ws/platform_display.cc
|
| @@ -8,7 +8,7 @@
|
| #include "services/ui/ws/platform_display_default.h"
|
| #include "services/ui/ws/platform_display_factory.h"
|
| #include "services/ui/ws/server_window.h"
|
| -#include "ui/base/cursor/image_cursors.h"
|
| +#include "services/ui/ws/threaded_image_cursors.h"
|
|
|
| namespace ui {
|
| namespace ws {
|
| @@ -19,7 +19,9 @@ PlatformDisplayFactory* PlatformDisplay::factory_ = nullptr;
|
| // static
|
| std::unique_ptr<PlatformDisplay> PlatformDisplay::Create(
|
| ServerWindow* root,
|
| - const display::ViewportMetrics& metrics) {
|
| + const display::ViewportMetrics& metrics,
|
| + scoped_refptr<base::SingleThreadTaskRunner>& resource_runner,
|
| + base::WeakPtr<ui::ImageCursors> image_cursors_weak_ptr) {
|
| if (factory_)
|
| return factory_->CreatePlatformDisplay(root, metrics);
|
|
|
| @@ -28,7 +30,9 @@ std::unique_ptr<PlatformDisplay> PlatformDisplay::Create(
|
| nullptr /* image_cursors */);
|
| #else
|
| return base::MakeUnique<PlatformDisplayDefault>(
|
| - root, metrics, base::MakeUnique<ImageCursors>());
|
| + root, metrics,
|
| + base::MakeUnique<ThreadedImageCursors>(resource_runner,
|
| + image_cursors_weak_ptr));
|
| #endif
|
| }
|
|
|
|
|