Adds more to viewmanager

mojo/services/view_manager/view_manager_connection.cc

Index: mojo/services/view_manager/view_manager_connection.cc
diff --git a/mojo/services/view_manager/view_manager_connection.cc b/mojo/services/view_manager/view_manager_connection.cc
index 83c061b49796c45258056d67a020b7905dddfba1..2a1b1730cdfcbd6ec31519c05c72b1494d637f3e 100644
--- a/mojo/services/view_manager/view_manager_connection.cc
+++ b/mojo/services/view_manager/view_manager_connection.cc
@@ -7,6 +7,7 @@
 #include "base/stl_util.h"
 #include "mojo/services/view_manager/node.h"
 #include "mojo/services/view_manager/root_node_manager.h"
+#include "mojo/services/view_manager/view.h"
 
 namespace mojo {
 namespace services {
@@ -16,6 +17,20 @@ ViewManagerConnection::ViewManagerConnection() : id_(0) {
 }
 
 ViewManagerConnection::~ViewManagerConnection() {
+  // Delete any views we own.
+  while (!view_map_.empty()) {
+    bool result = DeleteViewImpl(this, view_map_.begin()->second->id(), 0);
+    DCHECK(result);
+  }
+
+  // We're about to destroy all our nodes. Detach any views from them.
+  for (NodeMap::iterator i = node_map_.begin(); i != node_map_.end(); ++i) {
+    if (i->second->view()) {
+      bool result = SetViewImpl(i->second->id(), ViewId(), 0);
+      DCHECK(result);
+    }
+  }
+
   STLDeleteContainerPairSecondPointers(node_map_.begin(), node_map_.end());
   context()->RemoveConnection(this);
 }
@@ -39,6 +54,14 @@ Node* ViewManagerConnection::GetNode(const NodeId& id) {
   return context()->GetNode(id);
 }
 
+View* ViewManagerConnection::GetView(const ViewId& id) {
+  if (id_ == id.connection_id) {
+    ViewMap::const_iterator i = view_map_.find(id.view_id);
+    return i == view_map_.end() ? NULL : i->second;
+  }
+  return context()->GetView(id);
+}
+
 void ViewManagerConnection::NotifyNodeHierarchyChanged(
     const NodeId& node,
     const NodeId& new_parent,
@@ -50,6 +73,64 @@ void ViewManagerConnection::NotifyNodeHierarchyChanged(
                                    change_id);
 }
 
+void ViewManagerConnection::NotifyNodeViewReplaced(const NodeId& node,
+                                                   const ViewId& new_view_id,
+                                                   const ViewId& old_view_id,
+                                                   int32_t change_id) {
+  client()->OnNodeViewReplaced(NodeIdToTransportId(node),
+                               ViewIdToTransportId(new_view_id),
+                               ViewIdToTransportId(old_view_id),
+                               change_id);
+}
+
+bool ViewManagerConnection::DeleteNodeImpl(ViewManagerConnection* source,
+                                           const NodeId& node_id,
+                                           int32_t change_id) {
+  DCHECK_EQ(node_id.connection_id, id_);
+  Node* node = GetNode(node_id);
+  if (!node)
+    return false;
+  RootNodeManager::ScopedChange change(source, context(), change_id);
+  if (node->GetParent())
+    node->GetParent()->Remove(node);
+  std::vector<Node*> children(node->GetChildren());
+  for (size_t i = 0; i < children.size(); ++i)
+    node->Remove(children[i]);
+  DCHECK(node->GetChildren().empty());
+  node_map_.erase(node_id.node_id);
+  delete node;
+  return true;
+}
+
+bool ViewManagerConnection::DeleteViewImpl(ViewManagerConnection* source,
+                                           const ViewId& view_id,
+                                           int32_t change_id) {
+  DCHECK_EQ(view_id.connection_id, id_);
+  View* view = GetView(view_id);
+  if (!view)
+    return false;
+  RootNodeManager::ScopedChange change(source, context(), change_id);
+  if (view->node())
+    view->node()->SetView(NULL);
+  view_map_.erase(view_id.view_id);
+  delete view;
+  return true;
+}
+
+bool ViewManagerConnection::SetViewImpl(const NodeId& node_id,
+                                        const ViewId& view_id,
+                                        int32_t change_id) {
+  Node* node = GetNode(node_id);
+  if (!node)
+    return false;
+  View* view = GetView(view_id);
+  if (!view && view_id != ViewId())
+    return false;
+  RootNodeManager::ScopedChange change(this, context(), change_id);
+  node->SetView(view);
+  return true;
+}
+
 void ViewManagerConnection::CreateNode(
     uint16_t node_id,
     const Callback<void(bool)>& callback) {
@@ -62,6 +143,17 @@ void ViewManagerConnection::CreateNode(
   callback.Run(true);
 }
 
+void ViewManagerConnection::DeleteNode(
+    uint32_t transport_node_id,
+    int32_t change_id,
+    const mojo::Callback<void(bool)>& callback) {
+  const NodeId node_id(NodeIdFromTransportId(transport_node_id));
+  ViewManagerConnection* connection = context()->GetConnection(
+      node_id.connection_id);
+  callback.Run(connection &&
+               connection->DeleteNodeImpl(this, node_id, change_id));
+}
+
 void ViewManagerConnection::AddNode(
     uint32_t parent_id,
     uint32_t child_id,
@@ -90,12 +182,50 @@ void ViewManagerConnection::RemoveNodeFromParent(
   callback.Run(success);
 }
 
+void ViewManagerConnection::CreateView(
+    uint16_t view_id,
+    const mojo::Callback<void(bool)>& callback) {
+  if (view_map_.count(view_id)) {
+    callback.Run(false);
+    return;
+  }
+  view_map_[view_id] = new View(ViewId(id_, view_id));
+  callback.Run(true);
+}
+
+void ViewManagerConnection::DeleteView(
+    uint32_t transport_view_id,
+    int32_t change_id,
+    const mojo::Callback<void(bool)>& callback) {
+  const ViewId view_id(ViewIdFromTransportId(transport_view_id));
+  ViewManagerConnection* connection = context()->GetConnection(
+      view_id.connection_id);
+  callback.Run(connection &&
+               connection->DeleteViewImpl(this, view_id, change_id));
+}
+
+void ViewManagerConnection::SetView(
+    uint32_t transport_node_id,
+    uint32_t transport_view_id,
+    int32_t change_id,
+    const mojo::Callback<void(bool)>& callback) {
+  const NodeId node_id(NodeIdFromTransportId(transport_node_id));
+  callback.Run(SetViewImpl(node_id, ViewIdFromTransportId(transport_view_id),
+                           change_id));
+}
+
 void ViewManagerConnection::OnNodeHierarchyChanged(const NodeId& node,
                                                    const NodeId& new_parent,
                                                    const NodeId& old_parent) {
   context()->NotifyNodeHierarchyChanged(node, new_parent, old_parent);
 }
 
+void ViewManagerConnection::OnNodeViewReplaced(const NodeId& node,
+                                               const ViewId& new_view_id,
+                                               const ViewId& old_view_id) {
+  context()->NotifyNodeViewReplaced(node, new_view_id, old_view_id);
+}
+
 }  // namespace view_manager
 }  // namespace services
 }  // namespace mojo