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 #ifndef MOJO_SERVICES_VIEW_MANAGER_TEST_CHANGE_TRACKER_H_ | 5 #ifndef MOJO_SERVICES_VIEW_MANAGER_TEST_CHANGE_TRACKER_H_ |
6 #define MOJO_SERVICES_VIEW_MANAGER_TEST_CHANGE_TRACKER_H_ | 6 #define MOJO_SERVICES_VIEW_MANAGER_TEST_CHANGE_TRACKER_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
11 #include "mojo/public/cpp/bindings/array.h" | 11 #include "mojo/public/cpp/bindings/array.h" |
12 #include "mojo/services/public/cpp/view_manager/view_manager_types.h" | 12 #include "mojo/services/public/cpp/view_manager/view_manager_types.h" |
13 #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h" | 13 #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h" |
14 #include "ui/gfx/rect.h" | 14 #include "ui/gfx/rect.h" |
15 | 15 |
16 namespace mojo { | 16 namespace mojo { |
17 namespace view_manager { | 17 namespace view_manager { |
18 namespace service { | 18 namespace service { |
19 | 19 |
20 enum ChangeType { | 20 enum ChangeType { |
21 CHANGE_TYPE_CONNECTION_ESTABLISHED, | 21 CHANGE_TYPE_CONNECTION_ESTABLISHED, |
22 CHANGE_TYPE_ROOTS_ADDED, | 22 CHANGE_TYPE_ROOTS_ADDED, |
23 CHANGE_TYPE_SERVER_CHANGE_ID_ADVANCED, | 23 CHANGE_TYPE_SERVER_CHANGE_ID_ADVANCED, |
24 CHANGE_TYPE_NODE_BOUNDS_CHANGED, | 24 CHANGE_TYPE_NODE_BOUNDS_CHANGED, |
25 CHANGE_TYPE_NODE_HIERARCHY_CHANGED, | 25 CHANGE_TYPE_NODE_HIERARCHY_CHANGED, |
| 26 CHANGE_TYPE_NODE_REORDERED, |
26 CHANGE_TYPE_NODE_DELETED, | 27 CHANGE_TYPE_NODE_DELETED, |
27 CHANGE_TYPE_VIEW_DELETED, | 28 CHANGE_TYPE_VIEW_DELETED, |
28 CHANGE_TYPE_VIEW_REPLACED, | 29 CHANGE_TYPE_VIEW_REPLACED, |
29 CHANGE_TYPE_INPUT_EVENT, | 30 CHANGE_TYPE_INPUT_EVENT, |
30 }; | 31 }; |
31 | 32 |
32 struct TestNode { | 33 struct TestNode { |
33 // Returns a string description of this. | 34 // Returns a string description of this. |
34 std::string ToString() const; | 35 std::string ToString() const; |
35 | 36 |
(...skipping 14 matching lines...) Expand all Loading... |
50 std::vector<TestNode> nodes; | 51 std::vector<TestNode> nodes; |
51 Id node_id; | 52 Id node_id; |
52 Id node_id2; | 53 Id node_id2; |
53 Id node_id3; | 54 Id node_id3; |
54 Id view_id; | 55 Id view_id; |
55 Id view_id2; | 56 Id view_id2; |
56 gfx::Rect bounds; | 57 gfx::Rect bounds; |
57 gfx::Rect bounds2; | 58 gfx::Rect bounds2; |
58 int32 event_action; | 59 int32 event_action; |
59 String creator_url; | 60 String creator_url; |
| 61 OrderDirection direction; |
60 }; | 62 }; |
61 | 63 |
62 // Converts Changes to string descriptions. | 64 // Converts Changes to string descriptions. |
63 std::vector<std::string> ChangesToDescription1( | 65 std::vector<std::string> ChangesToDescription1( |
64 const std::vector<Change>& changes); | 66 const std::vector<Change>& changes); |
65 | 67 |
66 // Returns a string description of |changes[0].nodes|. Returns an empty string | 68 // Returns a string description of |changes[0].nodes|. Returns an empty string |
67 // if change.size() != 1. | 69 // if change.size() != 1. |
68 std::string ChangeNodeDescription(const std::vector<Change>& changes); | 70 std::string ChangeNodeDescription(const std::vector<Change>& changes); |
69 | 71 |
(...skipping 29 matching lines...) Expand all Loading... |
99 Id next_server_change_id, | 101 Id next_server_change_id, |
100 Array<INodePtr> nodes); | 102 Array<INodePtr> nodes); |
101 void OnRootsAdded(Array<INodePtr> nodes); | 103 void OnRootsAdded(Array<INodePtr> nodes); |
102 void OnServerChangeIdAdvanced(Id change_id); | 104 void OnServerChangeIdAdvanced(Id change_id); |
103 void OnNodeBoundsChanged(Id node_id, RectPtr old_bounds, RectPtr new_bounds); | 105 void OnNodeBoundsChanged(Id node_id, RectPtr old_bounds, RectPtr new_bounds); |
104 void OnNodeHierarchyChanged(Id node_id, | 106 void OnNodeHierarchyChanged(Id node_id, |
105 Id new_parent_id, | 107 Id new_parent_id, |
106 Id old_parent_id, | 108 Id old_parent_id, |
107 Id server_change_id, | 109 Id server_change_id, |
108 Array<INodePtr> nodes); | 110 Array<INodePtr> nodes); |
| 111 void OnNodeReordered(Id node_id, |
| 112 Id relative_node_id, |
| 113 OrderDirection direction, |
| 114 Id server_change_id); |
109 void OnNodeDeleted(Id node_id, Id server_change_id); | 115 void OnNodeDeleted(Id node_id, Id server_change_id); |
110 void OnViewDeleted(Id view_id); | 116 void OnViewDeleted(Id view_id); |
111 void OnNodeViewReplaced(Id node_id, Id new_view_id, Id old_view_id); | 117 void OnNodeViewReplaced(Id node_id, Id new_view_id, Id old_view_id); |
112 void OnViewInputEvent(Id view_id, EventPtr event); | 118 void OnViewInputEvent(Id view_id, EventPtr event); |
113 | 119 |
114 private: | 120 private: |
115 void AddChange(const Change& change); | 121 void AddChange(const Change& change); |
116 | 122 |
117 Delegate* delegate_; | 123 Delegate* delegate_; |
118 std::vector<Change> changes_; | 124 std::vector<Change> changes_; |
119 | 125 |
120 DISALLOW_COPY_AND_ASSIGN(TestChangeTracker); | 126 DISALLOW_COPY_AND_ASSIGN(TestChangeTracker); |
121 }; | 127 }; |
122 | 128 |
123 } // namespace service | 129 } // namespace service |
124 } // namespace view_manager | 130 } // namespace view_manager |
125 } // namespace mojo | 131 } // namespace mojo |
126 | 132 |
127 #endif // MOJO_SERVICES_VIEW_MANAGER_TEST_CHANGE_TRACKER_H_ | 133 #endif // MOJO_SERVICES_VIEW_MANAGER_TEST_CHANGE_TRACKER_H_ |
OLD | NEW |