View synchronization

mojo/services/view_manager/view_manager_connection.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 "mojo/services/view_manager/view_manager_connection.h"
 
 #include "base/stl_util.h"
 #include "mojo/public/cpp/bindings/allocation_scope.h"
 #include "mojo/services/view_manager/node.h"
 #include "mojo/services/view_manager/root_node_manager.h"
@@ skipping 78 matching lines @@
 }
 
 Node* ViewManagerConnection::GetNode(const NodeId& id) {
   if (id_ == id.connection_id) {
     NodeMap::iterator i = node_map_.find(id.node_id);
     return i == node_map_.end() ? NULL : i->second;
   }
   return context()->GetNode(id);
 }
 
-View* ViewManagerConnection::GetView(const ViewId& id) {
+service::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,
@@ skipping 19 matching lines @@
 }
 
 void ViewManagerConnection::NotifyNodeDeleted(
     const NodeId& node,
     TransportChangeId server_change_id,
     TransportChangeId client_change_id) {
   client()->OnNodeDeleted(NodeIdToTransportId(node), server_change_id,
                           client_change_id);
 }
 
+void ViewManagerConnection::NotifyViewDeleted(
+    const ViewId& view,
+    TransportChangeId server_change_id,
+    TransportChangeId client_change_id) {
+  client()->OnViewDeleted(ViewIdToTransportId(view), server_change_id,
+                          client_change_id);
+}
+
 bool ViewManagerConnection::DeleteNodeImpl(ViewManagerConnection* source,
                                            const NodeId& node_id,
                                            TransportChangeId 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,
       RootNodeManager::CHANGE_TYPE_ADVANCE_SERVER_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;
   node = NULL;
   context()->NotifyNodeDeleted(node_id);
   return true;
 }
 
 bool ViewManagerConnection::DeleteViewImpl(ViewManagerConnection* source,
                                            const ViewId& view_id,
                                            TransportChangeId change_id) {
   DCHECK_EQ(view_id.connection_id, id_);
-  View* view = GetView(view_id);
+  service::View* view = GetView(view_id);
   if (!view)
     return false;
   RootNodeManager::ScopedChange change(
       source, context(), change_id,
       RootNodeManager::CHANGE_TYPE_DONT_ADVANCE_SERVER_CHANGE_ID);
   if (view->node())
     view->node()->SetView(NULL);
   view_map_.erase(view_id.view_id);
   delete view;
+  context()->NotifyViewDeleted(view_id);
   return true;
 }
 
 bool ViewManagerConnection::SetViewImpl(const NodeId& node_id,
                                         const ViewId& view_id,
                                         TransportChangeId change_id) {
   Node* node = GetNode(node_id);
   if (!node)
     return false;
-  View* view = GetView(view_id);
+  service::View* view = GetView(view_id);
   if (!view && view_id != ViewId())
     return false;
   RootNodeManager::ScopedChange change(
       this, context(), change_id,
       RootNodeManager::CHANGE_TYPE_DONT_ADVANCE_SERVER_CHANGE_ID);
   node->SetView(view);
   return true;
 }
 
 void ViewManagerConnection::CreateNode(
@@ skipping 73 matching lines @@
   callback.Run(array_builder.Finish());
 }
 
 void ViewManagerConnection::CreateView(
     TransportConnectionSpecificViewId view_id,
     const Callback<void(bool)>& callback) {
   if (view_map_.count(view_id)) {
     callback.Run(false);
     return;
   }
-  view_map_[view_id] = new View(ViewId(id_, view_id));
+  view_map_[view_id] = new service::View(ViewId(id_, view_id));
   callback.Run(true);
 }
 
 void ViewManagerConnection::DeleteView(
     TransportViewId transport_view_id,
     TransportChangeId change_id,
     const 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(
     TransportNodeId transport_node_id,
     TransportViewId transport_view_id,
     TransportChangeId change_id,
     const 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::SetViewContents(
     TransportViewId view_id,
     ScopedSharedBufferHandle buffer,
     uint32_t buffer_size) {
-  View* view = GetView(ViewIdFromTransportId(view_id));
+  service::View* view = GetView(ViewIdFromTransportId(view_id));
   if (!view)
     return;
   void* handle_data;
   if (MapBuffer(buffer.get(), 0, buffer_size, &handle_data,
                 MOJO_MAP_BUFFER_FLAG_NONE) != MOJO_RESULT_OK) {
     return;
   }
   SkBitmap bitmap;
   gfx::PNGCodec::Decode(static_cast<const unsigned char*>(handle_data),
                         buffer_size, &bitmap);
   view->SetBitmap(bitmap);
   UnmapBuffer(handle_data);
 }
 
 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