Move Mus into chrome's process when running with --mus.

services/ui/ws/threaded_image_cursors.cc

+// 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.
+
+#include "services/ui/ws/threaded_image_cursors.h"
+#include "base/bind.h"

[sky, 2017/06/27 19:58:57]

newline between 5 and 6.

[mfomitchev, 2017/07/11 21:47:00]

Done.

+#include "base/single_thread_task_runner.h"
+#include "base/threading/thread_task_runner_handle.h"
+#include "ui/platform_window/platform_window.h"
+
+namespace ui {
+namespace ws {
+namespace {
+
+// Executed on |resource_task_runner_|.
+void SetDisplayOnResourceThread(
+    base::WeakPtr<ui::ImageCursors> image_cursors_weak_ptr,
+    const display::Display& display,
+    float scale_factor) {
+  if (image_cursors_weak_ptr)
+    image_cursors_weak_ptr->SetDisplay(display, scale_factor);
+}
+
+void SetCursorSizeOnResourceThread(
+    base::WeakPtr<ui::ImageCursors> image_cursors_weak_ptr,
+    CursorSize cursor_size) {
+  if (image_cursors_weak_ptr)
+    image_cursors_weak_ptr->SetCursorSize(cursor_size);
+}
+
+// Executed on |resource_task_runner_|. Sets cursor type on
+// |image_cursors_weak_ptr|, and then schedules a task on |ws_task_runner| to
+// set the corresponding PlatformCursor on the provided |platform_window|.
+// |platform_window| pointer needs to be valid while
+// |threaded_image_cursors_weak_ptr| is not invalidated.
+void SetCursorOnResourceThread(
+    base::WeakPtr<ui::ImageCursors> image_cursors_weak_ptr,
+    ui::CursorType cursor_type,
+    ui::PlatformWindow* platform_window,
+    scoped_refptr<base::SingleThreadTaskRunner> ws_task_runner,
+    base::WeakPtr<ThreadedImageCursors> threaded_image_cursors_weak_ptr) {
+  if (image_cursors_weak_ptr) {
+    ui::Cursor native_cursor(cursor_type);
+    image_cursors_weak_ptr->SetPlatformCursor(&native_cursor);
+    ws_task_runner->PostTask(

[sky, 2017/06/27 19:58:57]

It's worth a comment as to why you process setting the cursor on the platform
window back on the ws thread.

[mfomitchev, 2017/07/11 21:47:00]

Done.

+        FROM_HERE, base::Bind(&ThreadedImageCursors::SetCursorOnPlatformWindow,
+                              threaded_image_cursors_weak_ptr,
+                              native_cursor.platform(), platform_window));
+  }
+}
+
+}  // namespace
+
+ThreadedImageCursors::ThreadedImageCursors(
+    scoped_refptr<base::SingleThreadTaskRunner>& resource_task_runner,
+    base::WeakPtr<ui::ImageCursors> image_cursors_weak_ptr)
+    : resource_task_runner_(resource_task_runner),
+      image_cursors_weak_ptr_(image_cursors_weak_ptr),
+      weak_ptr_factory_(this) {
+  DCHECK(resource_task_runner_);
+  ws_task_runner_ = base::ThreadTaskRunnerHandle::Get();
+}
+
+ThreadedImageCursors::~ThreadedImageCursors() {}
+
+void ThreadedImageCursors::SetDisplay(const display::Display& display,
+                                      float scale_factor) {
+  resource_task_runner_->PostTask(
+      FROM_HERE, base::Bind(&SetDisplayOnResourceThread,
+                            image_cursors_weak_ptr_, display, scale_factor));
+}
+
+void ThreadedImageCursors::SetCursorSize(CursorSize cursor_size) {
+  resource_task_runner_->PostTask(
+      FROM_HERE, base::Bind(&SetCursorSizeOnResourceThread,
+                            image_cursors_weak_ptr_, cursor_size));
+}
+
+void ThreadedImageCursors::SetCursor(ui::CursorType cursor_type,
+                                     ui::PlatformWindow* platform_window) {
+  resource_task_runner_->PostTask(
+      FROM_HERE, base::Bind(&SetCursorOnResourceThread, image_cursors_weak_ptr_,
+                            cursor_type, platform_window, ws_task_runner_,
+                            weak_ptr_factory_.GetWeakPtr()));
+}
+
+void ThreadedImageCursors::SetCursorOnPlatformWindow(
+    ui::PlatformCursor platform_cursor,
+    ui::PlatformWindow* platform_window) {
+  platform_window->SetCursor(platform_cursor);
+}
+
+}  // namespace ws
+}  // namespace ui