Mus: Implement GpuMain mojo interface

services/ui/ws/window_server.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/window_server.h"
 
 #include <set>
 #include <string>
 
 #include "base/logging.h"
@@ skipping 41 matching lines @@
       next_client_id_(1),
       display_manager_(new DisplayManager(this, &user_id_tracker_)),
       current_operation_(nullptr),
       in_destructor_(false),
       next_wm_change_id_(0),
       gpu_proxy_(new GpuServiceProxy(this)),
       window_manager_window_tree_factory_set_(this, &user_id_tracker_),
       display_compositor_client_binding_(this) {
   user_id_tracker_.AddObserver(this);
   OnUserIdAdded(user_id_tracker_.active_id());
-  display_compositor_request_ = mojo::GetProxy(&display_compositor_);
+  // The display compositor gets its own thread in mus-gpu. The gpu service,
+  // where GL commands are processed resides on its own thread. Various
+  // components of the display compositor such as Display, ResourceProvider,
+  // and GLRenderer block on sync tokens from other command buffers. Thus,
+  // the gpu service must live on a separate thread.

[sadrul, 2016/11/30 21:05:55]

This comment should in gpu_main.cc, right? It seems out of place here in
WindowServer (which should not need to know/care about that detail).

[Fady Samuel, 2016/11/30 22:53:20]

Done.

+  gpu_proxy_->CreateDisplayCompositor(
+      mojo::GetProxy(&display_compositor_),
+      display_compositor_client_binding_.CreateInterfacePtrAndBind());
 }
 
 WindowServer::~WindowServer() {
   in_destructor_ = true;
 
   for (auto& pair : tree_map_)
     pair.second->PrepareForWindowServerShutdown();
 
   // Destroys the window trees results in querying for the display. Tear down
   // the displays first so that the trees are notified of the display going
@@ skipping 663 matching lines @@
   // If we're deleting a window, then this is a superfluous message.
   if (current_operation_type() == OperationType::DELETE_WINDOW)
     return;
   for (auto& pair : tree_map_) {
     pair.second->ProcessTransientWindowRemoved(window, transient_child,
                                                IsOperationSource(pair.first));
   }
 }
 
 void WindowServer::OnGpuServiceInitialized() {
-  // TODO(fsamuel): Currently we: 1. create the gpu service, 2. we initialize
-  // GL and then 3. we request a display compositor interface after
-  // initialization. A display compositor interface can be created at any time,
-  // even prior to completing initialization. If initialization crashes the GPU
-  // process, then we will still get a connection error on the
-  // |display_compositor_client_binding_| binding. We should investigate doing
-  // this in parallel with initialization in the future.
-  // The display compositor gets its own thread in mus-gpu. The gpu service,
-  // where GL commands are processed resides on its own thread. Various
-  // components of the display compositor such as Display, ResourceProvider,
-  // and GLRenderer block on sync tokens from other command buffers. Thus,
-  // the gpu service must live on a separate thread.
-  gpu_proxy_->CreateDisplayCompositor(
-      std::move(display_compositor_request_),
-      display_compositor_client_binding_.CreateInterfacePtrAndBind());
   // TODO(kylechar): When gpu channel is removed, this can instead happen
   // earlier, after GpuServiceProxy::OnInitialized().
   delegate_->StartDisplayInit();
 }
 
 void WindowServer::OnSurfaceCreated(const cc::SurfaceId& surface_id,
                                     const gfx::Size& frame_size,
                                     float device_scale_factor) {
   WindowId window_id(
       WindowIdFromTransportId(surface_id.frame_sink_id().client_id()));
@@ skipping 43 matching lines @@
 void WindowServer::OnUserIdAdded(const UserId& id) {
   activity_monitor_map_[id] = base::MakeUnique<UserActivityMonitor>(nullptr);
 }
 
 void WindowServer::OnUserIdRemoved(const UserId& id) {
   activity_monitor_map_.erase(id);
 }
 
 }  // namespace ws
 }  // namespace ui