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*/);
+}
+
+void WindowTree::DoOnEmbed(mojom::WindowTreePtr tree,
+                           ServerWindow* root_window) {
+  bool in_external_window_mode = !!root_window;
+  if (in_external_window_mode) {
+    DCHECK(!tree);
+    CHECK_LE(1u, roots_.size());
+
+    Display* display = GetDisplay(root_window);
+    int64_t display_id =
+        display ? display->GetId() : display::kInvalidDisplayId;
+
+    ClientWindowId window_id;
+    IsWindowKnown(root_window, &window_id);
+
+    const bool drawn =
+        root_window->parent() && root_window->parent()->IsDrawn();
+    client()->OnEmbed(id_, WindowToWindowData(root_window),
+                      nullptr /*mojom::WindowTreePtr*/, display_id,
+                      window_id.id, drawn);
+    return;
+  }
+
   std::vector<const ServerWindow*> to_send;
+
+  DCHECK(!root_window);
   CHECK_EQ(1u, roots_.size());
   const ServerWindow* root = *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);
@@ skipping 68 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::AddRoot(const ServerWindow* root) {
+  DCHECK(pending_client_id_ != kInvalidClientId);
+
+  const ClientWindowId client_window_id(pending_client_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;
+  pending_client_id_ = kInvalidClientId;
+
+  roots_.insert(root);
+
+  Display* display = GetDisplay(root);
+  DCHECK(display);
+}
+
 void WindowTree::AddRootForWindowManager(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* ws_display = GetDisplay(root);
   DCHECK(ws_display);
@@ skipping 1869 matching lines @@
   WindowTree* tree = window_server_->GetTreeWithRoot(window);
   return tree && tree != this;
 }
 
 bool WindowTree::IsWindowCreatedByWindowManager(
     const ServerWindow* window) const {
   // The WindowManager is attached to the root of the Display, if there isn't a
   // WindowManager attached, the window manager didn't create this window.
   const WindowManagerDisplayRoot* display_root =
       GetWindowManagerDisplayRoot(window);
-  if (!display_root)
+  if (!display_root || !display_root->window_manager_state())
     return false;
 
   return display_root->window_manager_state()->window_tree()->id() ==
          window->id().client_id;
 }
 
 void WindowTree::OnDragCompleted(bool success, uint32_t action_taken) {
   DCHECK(window_server_->in_drag_loop());
 
   if (window_server_->GetCurrentDragLoopInitiator() != this)
@@ skipping 87 matching lines @@
   client()->OnCompleteDrop(client_window_id.id, event_flags, cursor_offset,
                            effect_bitmask, callback);
 }
 
 void WindowTree::PerformOnDragDropDone() {
   client()->OnDragDropDone();
 }
 
 }  // namespace ws
 }  // namespace ui