c++ / mojo changes for 'external window mode'

services/ui/ws/window_tree.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_tree.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 82 matching lines @@
 }
 
 void WindowTree::Init(std::unique_ptr<WindowTreeBinding> binding,
                       mojom::WindowTreePtr tree) {
   DCHECK(!binding_);
   binding_ = std::move(binding);
 
   if (roots_.empty())
     return;
 
+  DoOnEmbed(std::move(tree), nullptr /*ServerWindow*/);

[fwang, 2017/02/28 08:23:53]

ditto about /* */ comment

+}
+
+void WindowTree::DoOnEmbed(mojom::WindowTreePtr tree, ServerWindow* r) {

[fwang, 2017/02/28 08:23:53]

what about root_window to make it more explicit than r?

[tonikitoo, 2017/03/01 05:05:43]

Done.

   std::vector<const ServerWindow*> to_send;
-  CHECK_EQ(1u, roots_.size());
-  const ServerWindow* root = *roots_.begin();
+  CHECK_NE(0u, roots_.size());

[fwang, 2017/02/28 08:23:53]

These are unsigned integers, but maybe CHECK_LE(1u,..) more clearly shows "we
need at least 1 root".

You are also removing the check that we want exactly one root in internal window
mode. Is is wanted? Or should we add such a check back to WindowTree::Init?

[tonikitoo, 2017/03/01 05:05:43]

Done.

+
+  const ServerWindow* root = r ? r : *roots_.begin();
   GetUnknownWindowsFrom(root, &to_send);
 
   Display* display = GetDisplay(root);
   int64_t display_id = display ? display->GetId() : display::kInvalidDisplayId;
   const ServerWindow* focused_window =
       display ? display->GetFocusedWindow() : nullptr;
   if (focused_window)
     focused_window = access_policy_->GetWindowForFocusChange(focused_window);
   ClientWindowId focused_window_id;
   if (focused_window)
@@ skipping 66 matching lines @@
   return window_server_->display_manager();
 }
 
 void WindowTree::PrepareForWindowServerShutdown() {
   window_manager_internal_client_binding_.reset();
   binding_->ResetClientForShutdown();
   if (window_manager_internal_)
     window_manager_internal_ = binding_->GetWindowManager();
 }
 
-void WindowTree::AddRootForWindowManager(const ServerWindow* root) {
+void WindowTree::AddRoot(const ServerWindow* root) {
   DCHECK(window_manager_internal_);
   const ClientWindowId client_window_id(WindowIdToTransportId(root->id()));
   DCHECK_EQ(0u, client_id_to_window_id_map_.count(client_window_id));
   client_id_to_window_id_map_[client_window_id] = root->id();
   window_id_to_client_id_map_[root->id()] = client_window_id;
   roots_.insert(root);
 
   Display* display = GetDisplay(root);
   DCHECK(display);
+}
 
-  window_manager_internal_->WmNewDisplayAdded(display->ToDisplay(),
+void WindowTree::AddRootForWindowManager(const ServerWindow* root) {
+  AddRoot(root);
+  window_manager_internal_->WmNewDisplayAdded(GetDisplay(root)->ToDisplay(),
                                               WindowToWindowData(root),
                                               root->parent()->IsDrawn());

[fwang, 2017/02/28 08:23:53]

This is the part that ensures MusDemoInternal is aware of the the display. For
now MusDemoExternal still adds its own "fake display" but we'd have to figure
out how to handle that case (probably in follow-up CLs).

 }
 
 void WindowTree::OnWindowDestroyingTreeImpl(WindowTree* tree) {
   if (event_source_wms_ && event_source_wms_->window_tree() == tree)
     event_source_wms_ = nullptr;
 
   // Notify our client if |tree| was embedded in any of our windows.
   for (const auto* tree_root : tree->roots_) {
     const bool owns_tree_root = tree_root->id().client_id == id_;
     if (owns_tree_root) {
@@ skipping 1940 matching lines @@
   client()->OnCompleteDrop(client_window_id.id, event_flags, cursor_offset,
                            effect_bitmask, callback);
 }
 
 void WindowTree::PerformOnDragDropDone() {
   client()->OnDragDropDone();
 }
 
 }  // namespace ws
 }  // namespace ui