| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "mojo/services/view_manager/view_manager_connection.h" | 5 #include "mojo/services/view_manager/view_manager_connection.h" |
| 6 | 6 |
| 7 #include "base/stl_util.h" | 7 #include "base/stl_util.h" |
| 8 #include "mojo/public/cpp/bindings/allocation_scope.h" | 8 #include "mojo/public/cpp/bindings/allocation_scope.h" |
| 9 #include "mojo/services/view_manager/node.h" | 9 #include "mojo/services/view_manager/node.h" |
| 10 #include "mojo/services/view_manager/root_node_manager.h" | 10 #include "mojo/services/view_manager/root_node_manager.h" |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 | 52 |
| 53 std::vector<Node*> children(node->GetChildren()); | 53 std::vector<Node*> children(node->GetChildren()); |
| 54 for (size_t i = 0 ; i < children.size(); ++i) { | 54 for (size_t i = 0 ; i < children.size(); ++i) { |
| 55 (*index)++; | 55 (*index)++; |
| 56 NodeToINode(children[i], array_builder, index); | 56 NodeToINode(children[i], array_builder, index); |
| 57 } | 57 } |
| 58 } | 58 } |
| 59 | 59 |
| 60 } // namespace | 60 } // namespace |
| 61 | 61 |
| 62 ViewManagerConnection::ViewManagerConnection() : client_(NULL), id_(0) { | 62 ViewManagerConnection::ViewManagerConnection() : id_(0) { |
| 63 } | 63 } |
| 64 | 64 |
| 65 ViewManagerConnection::~ViewManagerConnection() { | 65 ViewManagerConnection::~ViewManagerConnection() { |
| 66 // Delete any views we own. | 66 // Delete any views we own. |
| 67 while (!view_map_.empty()) { | 67 while (!view_map_.empty()) { |
| 68 bool result = DeleteViewImpl(this, view_map_.begin()->second->id(), 0); | 68 bool result = DeleteViewImpl(this, view_map_.begin()->second->id(), 0); |
| 69 DCHECK(result); | 69 DCHECK(result); |
| 70 } | 70 } |
| 71 | 71 |
| 72 // We're about to destroy all our nodes. Detach any views from them. | 72 // We're about to destroy all our nodes. Detach any views from them. |
| 73 for (NodeMap::iterator i = node_map_.begin(); i != node_map_.end(); ++i) { | 73 for (NodeMap::iterator i = node_map_.begin(); i != node_map_.end(); ++i) { |
| 74 if (i->second->view()) { | 74 if (i->second->view()) { |
| 75 bool result = SetViewImpl(i->second->id(), ViewId(), 0); | 75 bool result = SetViewImpl(i->second->id(), ViewId(), 0); |
| 76 DCHECK(result); | 76 DCHECK(result); |
| 77 } | 77 } |
| 78 } | 78 } |
| 79 | 79 |
| 80 STLDeleteContainerPairSecondPointers(node_map_.begin(), node_map_.end()); | 80 STLDeleteContainerPairSecondPointers(node_map_.begin(), node_map_.end()); |
| 81 context()->RemoveConnection(this); | 81 context()->RemoveConnection(this); |
| 82 } | 82 } |
| 83 | 83 |
| 84 void ViewManagerConnection::Initialize() { | 84 void ViewManagerConnection::Initialize() { |
| 85 DCHECK_EQ(0, id_); // Should only get Initialize() once. | 85 DCHECK_EQ(0, id_); // Should only get Initialize() once. |
| 86 id_ = context()->GetAndAdvanceNextConnectionId(); | 86 id_ = context()->GetAndAdvanceNextConnectionId(); |
| 87 context()->AddConnection(this); | 87 context()->AddConnection(this); |
| 88 client_->OnConnectionEstablished(id_, context()->next_server_change_id()); | 88 client()->OnConnectionEstablished(id_, context()->next_server_change_id()); |
| 89 } | 89 } |
| 90 | 90 |
| 91 Node* ViewManagerConnection::GetNode(const NodeId& id) { | 91 Node* ViewManagerConnection::GetNode(const NodeId& id) { |
| 92 if (id_ == id.connection_id) { | 92 if (id_ == id.connection_id) { |
| 93 NodeMap::iterator i = node_map_.find(id.node_id); | 93 NodeMap::iterator i = node_map_.find(id.node_id); |
| 94 return i == node_map_.end() ? NULL : i->second; | 94 return i == node_map_.end() ? NULL : i->second; |
| 95 } | 95 } |
| 96 return context()->GetNode(id); | 96 return context()->GetNode(id); |
| 97 } | 97 } |
| 98 | 98 |
| 99 View* ViewManagerConnection::GetView(const ViewId& id) { | 99 View* ViewManagerConnection::GetView(const ViewId& id) { |
| 100 if (id_ == id.connection_id) { | 100 if (id_ == id.connection_id) { |
| 101 ViewMap::const_iterator i = view_map_.find(id.view_id); | 101 ViewMap::const_iterator i = view_map_.find(id.view_id); |
| 102 return i == view_map_.end() ? NULL : i->second; | 102 return i == view_map_.end() ? NULL : i->second; |
| 103 } | 103 } |
| 104 return context()->GetView(id); | 104 return context()->GetView(id); |
| 105 } | 105 } |
| 106 | 106 |
| 107 void ViewManagerConnection::NotifyNodeHierarchyChanged( | 107 void ViewManagerConnection::NotifyNodeHierarchyChanged( |
| 108 const NodeId& node, | 108 const NodeId& node, |
| 109 const NodeId& new_parent, | 109 const NodeId& new_parent, |
| 110 const NodeId& old_parent, | 110 const NodeId& old_parent, |
| 111 TransportChangeId server_change_id, | 111 TransportChangeId server_change_id, |
| 112 TransportChangeId client_change_id) { | 112 TransportChangeId client_change_id) { |
| 113 client_->OnNodeHierarchyChanged(NodeIdToTransportId(node), | 113 client()->OnNodeHierarchyChanged(NodeIdToTransportId(node), |
| 114 NodeIdToTransportId(new_parent), | 114 NodeIdToTransportId(new_parent), |
| 115 NodeIdToTransportId(old_parent), | 115 NodeIdToTransportId(old_parent), |
| 116 server_change_id, | 116 server_change_id, |
| 117 client_change_id); | 117 client_change_id); |
| 118 } | 118 } |
| 119 | 119 |
| 120 void ViewManagerConnection::NotifyNodeViewReplaced( | 120 void ViewManagerConnection::NotifyNodeViewReplaced( |
| 121 const NodeId& node, | 121 const NodeId& node, |
| 122 const ViewId& new_view_id, | 122 const ViewId& new_view_id, |
| 123 const ViewId& old_view_id, | 123 const ViewId& old_view_id, |
| 124 TransportChangeId client_change_id) { | 124 TransportChangeId client_change_id) { |
| 125 client_->OnNodeViewReplaced(NodeIdToTransportId(node), | 125 client()->OnNodeViewReplaced(NodeIdToTransportId(node), |
| 126 ViewIdToTransportId(new_view_id), | 126 ViewIdToTransportId(new_view_id), |
| 127 ViewIdToTransportId(old_view_id), | 127 ViewIdToTransportId(old_view_id), |
| 128 client_change_id); | 128 client_change_id); |
| 129 } | 129 } |
| 130 | 130 |
| 131 void ViewManagerConnection::NotifyNodeDeleted( | 131 void ViewManagerConnection::NotifyNodeDeleted( |
| 132 const NodeId& node, | 132 const NodeId& node, |
| 133 TransportChangeId server_change_id, | 133 TransportChangeId server_change_id, |
| 134 TransportChangeId client_change_id) { | 134 TransportChangeId client_change_id) { |
| 135 client_->OnNodeDeleted(NodeIdToTransportId(node), server_change_id, | 135 client()->OnNodeDeleted(NodeIdToTransportId(node), server_change_id, |
| 136 client_change_id); | 136 client_change_id); |
| 137 } | 137 } |
| 138 | 138 |
| 139 bool ViewManagerConnection::DeleteNodeImpl(ViewManagerConnection* source, | 139 bool ViewManagerConnection::DeleteNodeImpl(ViewManagerConnection* source, |
| 140 const NodeId& node_id, | 140 const NodeId& node_id, |
| 141 TransportChangeId change_id) { | 141 TransportChangeId change_id) { |
| 142 DCHECK_EQ(node_id.connection_id, id_); | 142 DCHECK_EQ(node_id.connection_id, id_); |
| 143 Node* node = GetNode(node_id); | 143 Node* node = GetNode(node_id); |
| 144 if (!node) | 144 if (!node) |
| 145 return false; | 145 return false; |
| 146 RootNodeManager::ScopedChange change( | 146 RootNodeManager::ScopedChange change( |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 185 View* view = GetView(view_id); | 185 View* view = GetView(view_id); |
| 186 if (!view && view_id != ViewId()) | 186 if (!view && view_id != ViewId()) |
| 187 return false; | 187 return false; |
| 188 RootNodeManager::ScopedChange change( | 188 RootNodeManager::ScopedChange change( |
| 189 this, context(), change_id, | 189 this, context(), change_id, |
| 190 RootNodeManager::CHANGE_TYPE_DONT_ADVANCE_SERVER_CHANGE_ID); | 190 RootNodeManager::CHANGE_TYPE_DONT_ADVANCE_SERVER_CHANGE_ID); |
| 191 node->SetView(view); | 191 node->SetView(view); |
| 192 return true; | 192 return true; |
| 193 } | 193 } |
| 194 | 194 |
| 195 void ViewManagerConnection::SetClient(IViewManagerClient* client) { | |
| 196 client_ = client; | |
| 197 } | |
| 198 | |
| 199 void ViewManagerConnection::CreateNode( | 195 void ViewManagerConnection::CreateNode( |
| 200 TransportConnectionSpecificNodeId node_id, | 196 TransportConnectionSpecificNodeId node_id, |
| 201 const Callback<void(bool)>& callback) { | 197 const Callback<void(bool)>& callback) { |
| 202 // Negative values are reserved. | 198 // Negative values are reserved. |
| 203 if (node_map_.find(node_id) != node_map_.end()) { | 199 if (node_map_.find(node_id) != node_map_.end()) { |
| 204 callback.Run(false); | 200 callback.Run(false); |
| 205 return; | 201 return; |
| 206 } | 202 } |
| 207 node_map_[node_id] = new Node(this, NodeId(id_, node_id)); | 203 node_map_[node_id] = new Node(this, NodeId(id_, node_id)); |
| 208 callback.Run(true); | 204 callback.Run(true); |
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 332 | 328 |
| 333 void ViewManagerConnection::OnNodeViewReplaced(const NodeId& node, | 329 void ViewManagerConnection::OnNodeViewReplaced(const NodeId& node, |
| 334 const ViewId& new_view_id, | 330 const ViewId& new_view_id, |
| 335 const ViewId& old_view_id) { | 331 const ViewId& old_view_id) { |
| 336 context()->NotifyNodeViewReplaced(node, new_view_id, old_view_id); | 332 context()->NotifyNodeViewReplaced(node, new_view_id, old_view_id); |
| 337 } | 333 } |
| 338 | 334 |
| 339 } // namespace view_manager | 335 } // namespace view_manager |
| 340 } // namespace services | 336 } // namespace services |
| 341 } // namespace mojo | 337 } // namespace mojo |
| OLD | NEW |