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

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 23 matching lines @@
 #include "services/ui/ws/frame_sink_manager_client_binding.h"
 #include "services/ui/ws/gpu_host.h"
 #include "services/ui/ws/user_activity_monitor.h"
 #include "services/ui/ws/user_display_manager.h"
 #include "services/ui/ws/window_server.h"
 #include "services/ui/ws/window_server_test_impl.h"
 #include "services/ui/ws/window_tree.h"
 #include "services/ui/ws/window_tree_binding.h"
 #include "services/ui/ws/window_tree_factory.h"
 #include "services/ui/ws/window_tree_host_factory.h"
+#include "ui/base/cursor/image_cursors.h"
 #include "ui/base/platform_window_defaults.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/events/event_switches.h"
 #include "ui/events/platform/platform_event_source.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gl/gl_surface.h"
 
 #if defined(USE_X11)
 #include <X11/Xlib.h>
@@ skipping 30 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() : test_config_(false), ime_registrar_(&ime_driver_) {}
+Service::Service(scoped_refptr<base::SingleThreadTaskRunner> resource_runner,
+                 base::WeakPtr<ui::ImageCursors> image_cursors_weak_ptr)
+    : in_process_(resource_runner != nullptr),
+      resource_runner_(resource_runner),
+      image_cursors_weak_ptr_(image_cursors_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)
 #if defined(OS_CHROMEOS)
   // InputDeviceController uses ozone.
   input_device_controller_.reset();
 #endif
 
   OzonePlatform::Shutdown();
 #endif
 }
 
 bool Service::InitializeResources(service_manager::Connector* connector) {
-  if (ui::ResourceBundle::HasSharedInstance())
+  if (in_process() || ui::ResourceBundle::HasSharedInstance())
     return true;
 
   std::set<std::string> resource_paths;
   resource_paths.insert(kResourceFileStrings);
   resource_paths.insert(kResourceFile100);
   resource_paths.insert(kResourceFile200);
 
   catalog::ResourceLoader loader;
   filesystem::mojom::DirectoryPtr directory;
   connector->BindInterface(catalog::mojom::kServiceName, &directory);
   if (!loader.OpenFiles(std::move(directory), resource_paths)) {
     LOG(ERROR) << "Service failed to open resource files.";
     return false;
   }
 
   ui::RegisterPathProvider();
 
   // Initialize resource bundle with 1x and 2x cursor bitmaps.
   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.

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

This comment just documents the code and so isn't useful. Nuke it.

[mfomitchev, 2017/07/11 21:46:59]

Done.

+  image_cursors_ = base::MakeUnique<ui::ImageCursors>();
+  image_cursors_weak_ptr_ = image_cursors_->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();
   user_id_to_user_state_[user_id] = base::WrapUnique(new UserState);
   return user_id_to_user_state_[user_id].get();
 }
 
 void Service::AddUserIfNecessary(
     const service_manager::Identity& remote_identity) {
   window_server_->user_id_tracker()->AddUserId(remote_identity.user_id());
 }
 
 void Service::OnStart() {
-  base::PlatformThread::SetName("mus");
+  if (!in_process())
+    base::PlatformThread::SetName("mus");
+
   TRACE_EVENT0("mus", "Service::Initialize started");
 
+  if (!resource_runner_)
+    resource_runner_ = base::ThreadTaskRunnerHandle::Get();
+
   test_config_ = base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kUseTestConfig);
+
 #if defined(USE_X11)
   XInitThreads();
   ui::SetDefaultX11ErrorHandlers();
 #endif
 
   if (test_config_)
     ui::test::EnableTestConfigForPlatformWindows();
 
   // If resources are unavailable do not complete start-up.
   if (!InitializeResources(context()->connector())) {
     context()->QuitNow();
     return;
   }
 
 #if defined(USE_OZONE)
   // The ozone platform can provide its own event source. So initialize the
   // platform before creating the default event source.
   // Because GL libraries need to be initialized before entering the sandbox,
   // in MUS, |InitializeForUI| will load the GL libraries.
   ui::OzonePlatform::InitParams params;
   params.connector = context()->connector();
   params.single_process = false;
   ui::OzonePlatform::InitializeForUI(params);
 
   // Assume a client will change the layout to an appropriate configuration.
   ui::KeyboardLayoutEngineManager::GetKeyboardLayoutEngine()
       ->SetCurrentLayoutByName("us");
-  client_native_pixmap_factory_ = ui::CreateClientNativePixmapFactoryOzone();
-  gfx::ClientNativePixmapFactory::SetInstance(
-      client_native_pixmap_factory_.get());
+
+  if (!in_process()) {
+    client_native_pixmap_factory_ = ui::CreateClientNativePixmapFactoryOzone();
+    gfx::ClientNativePixmapFactory::SetInstance(
+        client_native_pixmap_factory_.get());
+  }
 
   DCHECK(gfx::ClientNativePixmapFactory::GetInstance());
 
 #if defined(OS_CHROMEOS)
   input_device_controller_ = base::MakeUnique<InputDeviceController>();
   input_device_controller_->AddInterface(&registry_);
 #endif
 #endif
 
 // TODO(rjkroege): Enter sandbox here before we start threads in GpuState
@@ skipping 112 matching lines @@
 
   DVLOG(3) << "OnWillCreateTreeForWindowManager "
            << automatically_create_display_roots;
   ws::DisplayCreationConfig config = automatically_create_display_roots
                                          ? ws::DisplayCreationConfig::AUTOMATIC
                                          : ws::DisplayCreationConfig::MANUAL;
   window_server_->SetDisplayCreationConfig(config);
   if (window_server_->display_creation_config() ==
       ws::DisplayCreationConfig::MANUAL) {
 #if defined(USE_OZONE) && defined(OS_CHROMEOS)
-    screen_manager_ = base::MakeUnique<display::ScreenManagerForwarding>();
+    screen_manager_ =
+        base::MakeUnique<display::ScreenManagerForwarding>(in_process());
 #else
     CHECK(false);
 #endif
   } else {
     screen_manager_ = display::ScreenManager::Create();
   }
   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_;
+}
+
 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));
   }
   user_state->accessibility->Bind(std::move(request));
@@ skipping 108 matching lines @@
     mojom::WindowServerTestRequest request) {
   if (!test_config_)
     return;
   mojo::MakeStrongBinding(
       base::MakeUnique<ws::WindowServerTestImpl>(window_server_.get()),
       std::move(request));
 }
 
 
 }  // namespace ui