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

services/ui/service.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/service.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 74 matching lines @@
   std::unique_ptr<mojom::WindowTreeFactoryRequest> wtf_request;
   std::unique_ptr<mojom::DisplayManagerRequest> dm_request;
 };
 
 struct Service::UserState {
   std::unique_ptr<clipboard::ClipboardImpl> clipboard;
   std::unique_ptr<ws::AccessibilityManager> accessibility;
   std::unique_ptr<ws::WindowTreeHostFactory> window_tree_host_factory;
 };
 
-Service::Service(scoped_refptr<base::SingleThreadTaskRunner> resource_runner,
-                 base::WeakPtr<ui::ImageCursors> image_cursors_weak_ptr)
+Service::Service(
+    scoped_refptr<base::SingleThreadTaskRunner> resource_runner,
+    base::WeakPtr<ui::ImageCursorsHolder> image_cursors_holder_weak_ptr)
     : in_process_(resource_runner != nullptr),
       resource_runner_(resource_runner),
-      image_cursors_weak_ptr_(image_cursors_weak_ptr),
+      image_cursors_holder_weak_ptr_(image_cursors_holder_weak_ptr),
       test_config_(false),
       ime_registrar_(&ime_driver_) {}
 
 Service::~Service() {
   // Destroy |window_server_| first, since it depends on |event_source_|.
   // WindowServer (or more correctly its Displays) may have state that needs to
   // be destroyed before GpuState as well.
   window_server_.reset();
 
 #if defined(USE_OZONE)
@@ skipping 29 matching lines @@
   ui::ResourceBundle::InitSharedInstanceWithPakFileRegion(
       loader.TakeFile(kResourceFileStrings),
       base::MemoryMappedFile::Region::kWholeFile);
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   rb.AddDataPackFromFile(loader.TakeFile(kResourceFile100),
                          ui::SCALE_FACTOR_100P);
   rb.AddDataPackFromFile(loader.TakeFile(kResourceFile200),
                          ui::SCALE_FACTOR_200P);
 
   // Initialize the cursors.
-  image_cursors_ = base::MakeUnique<ui::ImageCursors>();
-  image_cursors_weak_ptr_ = image_cursors_->GetWeakPtr();
+  image_cursors_holder_ = base::MakeUnique<ui::ImageCursorsHolder>();
+  image_cursors_holder_->SetImageCursors(base::MakeUnique<ui::ImageCursors>());
+  image_cursors_holder_weak_ptr_ = image_cursors_holder_->GetWeakPtr();
 
   return true;
 }
 
 Service::UserState* Service::GetUserState(
     const service_manager::Identity& remote_identity) {
   const ws::UserId& user_id = remote_identity.user_id();
   auto it = user_id_to_user_state_.find(user_id);
   if (it != user_id_to_user_state_.end())
     return it->second.get();
@@ skipping 194 matching lines @@
   screen_manager_->AddInterfaces(&registry_);
   if (is_gpu_ready_)
     screen_manager_->Init(window_server_->display_manager());
 }
 
 scoped_refptr<base::SingleThreadTaskRunner>& Service::GetResourceRunner() {
   DCHECK(resource_runner_);
   return resource_runner_;
 }
 
-base::WeakPtr<ui::ImageCursors> Service::GetImageCursorsWeakPtr() {
-  return image_cursors_weak_ptr_;
+base::WeakPtr<ui::ImageCursorsHolder> Service::GetImageCursorsHolderWeakPtr() {
+  return image_cursors_holder_weak_ptr_;
 }
 
 void Service::BindAccessibilityManagerRequest(
     const service_manager::BindSourceInfo& source_info,
     mojom::AccessibilityManagerRequest request) {
   UserState* user_state = GetUserState(source_info.identity);
   if (!user_state->accessibility) {
     const ws::UserId& user_id = source_info.identity.user_id();
     user_state->accessibility.reset(
         new ws::AccessibilityManager(window_server_.get(), user_id));
@@ skipping 110 matching lines @@
     mojom::WindowServerTestRequest request) {
   if (!test_config_)
     return;
   mojo::MakeStrongBinding(
       base::MakeUnique<ws::WindowServerTestImpl>(window_server_.get()),
       std::move(request));
 }
 
 
 }  // namespace ui