Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(200)

Side by Side Diff: mojo/services/view_manager/view_manager_connection.cc

Issue 300863003: Wire input events through the ViewManagerClient interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/bind.h"
7 #include "base/stl_util.h" 8 #include "base/stl_util.h"
8 #include "mojo/public/cpp/bindings/allocation_scope.h" 9 #include "mojo/public/cpp/bindings/allocation_scope.h"
9 #include "mojo/services/public/cpp/geometry/geometry_type_converters.h" 10 #include "mojo/services/public/cpp/geometry/geometry_type_converters.h"
11 #include "mojo/services/public/cpp/input_events/input_events_type_converters.h"
10 #include "mojo/services/view_manager/node.h" 12 #include "mojo/services/view_manager/node.h"
11 #include "mojo/services/view_manager/root_node_manager.h" 13 #include "mojo/services/view_manager/root_node_manager.h"
12 #include "mojo/services/view_manager/view.h" 14 #include "mojo/services/view_manager/view.h"
13 #include "third_party/skia/include/core/SkBitmap.h" 15 #include "third_party/skia/include/core/SkBitmap.h"
14 #include "ui/aura/window.h" 16 #include "ui/aura/window.h"
15 #include "ui/gfx/codec/png_codec.h" 17 #include "ui/gfx/codec/png_codec.h"
16 18
17 namespace mojo { 19 namespace mojo {
18 namespace view_manager { 20 namespace view_manager {
19 namespace service { 21 namespace service {
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 if (originated_change || !known_nodes_.count(NodeIdToTransportId(node->id()))) 155 if (originated_change || !known_nodes_.count(NodeIdToTransportId(node->id())))
154 return; 156 return;
155 const TransportViewId new_view_id = new_view ? 157 const TransportViewId new_view_id = new_view ?
156 ViewIdToTransportId(new_view->id()) : 0; 158 ViewIdToTransportId(new_view->id()) : 0;
157 const TransportViewId old_view_id = old_view ? 159 const TransportViewId old_view_id = old_view ?
158 ViewIdToTransportId(old_view->id()) : 0; 160 ViewIdToTransportId(old_view->id()) : 0;
159 client()->OnNodeViewReplaced(NodeIdToTransportId(node->id()), 161 client()->OnNodeViewReplaced(NodeIdToTransportId(node->id()),
160 new_view_id, old_view_id); 162 new_view_id, old_view_id);
161 } 163 }
162 164
165 void ViewManagerConnection::ProcessViewInputEvent(const View* view,
166 const ui::Event* event) {
167 const TransportViewId view_id = ViewIdToTransportId(view->id());
168 if (view->id().connection_id != id_)
169 return;
170 AllocationScope scope;
171 client()->OnViewInputEvent(view_id, *event, base::Bind(&base::DoNothing));
172 }
173
163 void ViewManagerConnection::ProcessNodeDeleted( 174 void ViewManagerConnection::ProcessNodeDeleted(
164 const NodeId& node, 175 const NodeId& node,
165 TransportChangeId server_change_id, 176 TransportChangeId server_change_id,
166 bool originated_change) { 177 bool originated_change) {
167 const bool in_known = known_nodes_.erase(NodeIdToTransportId(node)) > 0; 178 const bool in_known = known_nodes_.erase(NodeIdToTransportId(node)) > 0;
168 const bool in_roots = roots_.erase(NodeIdToTransportId(node)) > 0; 179 const bool in_roots = roots_.erase(NodeIdToTransportId(node)) > 0;
169 180
170 if (in_roots && roots_.empty()) 181 if (in_roots && roots_.empty())
171 roots_.insert(NodeIdToTransportId(InvalidNodeId())); 182 roots_.insert(NodeIdToTransportId(InvalidNodeId()));
172 183
(...skipping 446 matching lines...) Expand 10 before | Expand all | Expand 10 after
619 const Node* old_parent) { 630 const Node* old_parent) {
620 root_node_manager_->ProcessNodeHierarchyChanged(node, new_parent, old_parent); 631 root_node_manager_->ProcessNodeHierarchyChanged(node, new_parent, old_parent);
621 } 632 }
622 633
623 void ViewManagerConnection::OnNodeViewReplaced(const Node* node, 634 void ViewManagerConnection::OnNodeViewReplaced(const Node* node,
624 const View* new_view, 635 const View* new_view,
625 const View* old_view) { 636 const View* old_view) {
626 root_node_manager_->ProcessNodeViewReplaced(node, new_view, old_view); 637 root_node_manager_->ProcessNodeViewReplaced(node, new_view, old_view);
627 } 638 }
628 639
640 void ViewManagerConnection::OnViewInputEvent(const View* view,
641 const ui::Event* event) {
642 root_node_manager_->ProcessViewInputEvent(view, event);
643 }
644
629 void ViewManagerConnection::OnConnectionEstablished() { 645 void ViewManagerConnection::OnConnectionEstablished() {
630 DCHECK_EQ(0, id_); // Should only get OnConnectionEstablished() once. 646 DCHECK_EQ(0, id_); // Should only get OnConnectionEstablished() once.
631 id_ = root_node_manager_->GetAndAdvanceNextConnectionId(); 647 id_ = root_node_manager_->GetAndAdvanceNextConnectionId();
632 root_node_manager_->AddConnection(this); 648 root_node_manager_->AddConnection(this);
633 std::vector<const Node*> to_send; 649 std::vector<const Node*> to_send;
634 GetUnknownNodesFrom(root_node_manager_->root(), &to_send); 650 GetUnknownNodesFrom(root_node_manager_->root(), &to_send);
635 AllocationScope allocation_scope; 651 AllocationScope allocation_scope;
636 client()->OnViewManagerConnectionEstablished( 652 client()->OnViewManagerConnectionEstablished(
637 id_, 653 id_,
638 root_node_manager_->next_server_change_id(), 654 root_node_manager_->next_server_change_id(),
639 NodesToINodes(to_send)); 655 NodesToINodes(to_send));
640 } 656 }
641 657
642 } // namespace service 658 } // namespace service
643 } // namespace view_manager 659 } // namespace view_manager
644 } // namespace mojo 660 } // namespace mojo
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698