| 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 COMPONENTS_MUS_WS_TEST_CHANGE_TRACKER_H_ | 5 #ifndef COMPONENTS_MUS_WS_TEST_CHANGE_TRACKER_H_ |
| 6 #define COMPONENTS_MUS_WS_TEST_CHANGE_TRACKER_H_ | 6 #define COMPONENTS_MUS_WS_TEST_CHANGE_TRACKER_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <string> | 10 #include <string> |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 CHANGE_TYPE_NODE_ADD_TRANSIENT_WINDOW, | 29 CHANGE_TYPE_NODE_ADD_TRANSIENT_WINDOW, |
| 30 CHANGE_TYPE_NODE_BOUNDS_CHANGED, | 30 CHANGE_TYPE_NODE_BOUNDS_CHANGED, |
| 31 CHANGE_TYPE_NODE_VIEWPORT_METRICS_CHANGED, | 31 CHANGE_TYPE_NODE_VIEWPORT_METRICS_CHANGED, |
| 32 CHANGE_TYPE_NODE_HIERARCHY_CHANGED, | 32 CHANGE_TYPE_NODE_HIERARCHY_CHANGED, |
| 33 CHANGE_TYPE_NODE_REMOVE_TRANSIENT_WINDOW_FROM_PARENT, | 33 CHANGE_TYPE_NODE_REMOVE_TRANSIENT_WINDOW_FROM_PARENT, |
| 34 CHANGE_TYPE_NODE_REORDERED, | 34 CHANGE_TYPE_NODE_REORDERED, |
| 35 CHANGE_TYPE_NODE_VISIBILITY_CHANGED, | 35 CHANGE_TYPE_NODE_VISIBILITY_CHANGED, |
| 36 CHANGE_TYPE_NODE_DRAWN_STATE_CHANGED, | 36 CHANGE_TYPE_NODE_DRAWN_STATE_CHANGED, |
| 37 CHANGE_TYPE_NODE_DELETED, | 37 CHANGE_TYPE_NODE_DELETED, |
| 38 CHANGE_TYPE_INPUT_EVENT, | 38 CHANGE_TYPE_INPUT_EVENT, |
| 39 CHANGE_TYPE_EVENT_OBSERVED, |
| 39 CHANGE_TYPE_PROPERTY_CHANGED, | 40 CHANGE_TYPE_PROPERTY_CHANGED, |
| 40 CHANGE_TYPE_FOCUSED, | 41 CHANGE_TYPE_FOCUSED, |
| 41 CHANGE_TYPE_CURSOR_CHANGED, | 42 CHANGE_TYPE_CURSOR_CHANGED, |
| 42 CHANGE_TYPE_ON_CHANGE_COMPLETED, | 43 CHANGE_TYPE_ON_CHANGE_COMPLETED, |
| 43 CHANGE_TYPE_ON_TOP_LEVEL_CREATED, | 44 CHANGE_TYPE_ON_TOP_LEVEL_CREATED, |
| 44 CHANGE_TYPE_OPACITY, | 45 CHANGE_TYPE_OPACITY, |
| 45 }; | 46 }; |
| 46 | 47 |
| 47 // TODO(sky): consider nuking and converting directly to WindowData. | 48 // TODO(sky): consider nuking and converting directly to WindowData. |
| 48 struct TestWindow { | 49 struct TestWindow { |
| (...skipping 22 matching lines...) Expand all Loading... |
| 71 | 72 |
| 72 ChangeType type; | 73 ChangeType type; |
| 73 ConnectionSpecificId connection_id; | 74 ConnectionSpecificId connection_id; |
| 74 std::vector<TestWindow> windows; | 75 std::vector<TestWindow> windows; |
| 75 Id window_id; | 76 Id window_id; |
| 76 Id window_id2; | 77 Id window_id2; |
| 77 Id window_id3; | 78 Id window_id3; |
| 78 mojo::Rect bounds; | 79 mojo::Rect bounds; |
| 79 mojo::Rect bounds2; | 80 mojo::Rect bounds2; |
| 80 int32_t event_action; | 81 int32_t event_action; |
| 82 uint32_t event_observer_id; |
| 81 mojo::String embed_url; | 83 mojo::String embed_url; |
| 82 mojom::OrderDirection direction; | 84 mojom::OrderDirection direction; |
| 83 bool bool_value; | 85 bool bool_value; |
| 84 float float_value; | 86 float float_value; |
| 85 std::string property_key; | 87 std::string property_key; |
| 86 std::string property_value; | 88 std::string property_value; |
| 87 int32_t cursor_id; | 89 int32_t cursor_id; |
| 88 uint32_t change_id; | 90 uint32_t change_id; |
| 89 }; | 91 }; |
| 90 | 92 |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 149 Id old_parent_id, | 151 Id old_parent_id, |
| 150 Id new_parent_id, | 152 Id new_parent_id, |
| 151 mojo::Array<mojom::WindowDataPtr> windows); | 153 mojo::Array<mojom::WindowDataPtr> windows); |
| 152 void OnWindowReordered(Id window_id, | 154 void OnWindowReordered(Id window_id, |
| 153 Id relative_window_id, | 155 Id relative_window_id, |
| 154 mojom::OrderDirection direction); | 156 mojom::OrderDirection direction); |
| 155 void OnWindowDeleted(Id window_id); | 157 void OnWindowDeleted(Id window_id); |
| 156 void OnWindowVisibilityChanged(Id window_id, bool visible); | 158 void OnWindowVisibilityChanged(Id window_id, bool visible); |
| 157 void OnWindowOpacityChanged(Id window_id, float opacity); | 159 void OnWindowOpacityChanged(Id window_id, float opacity); |
| 158 void OnWindowParentDrawnStateChanged(Id window_id, bool drawn); | 160 void OnWindowParentDrawnStateChanged(Id window_id, bool drawn); |
| 159 void OnWindowInputEvent(Id window_id, mojom::EventPtr event); | 161 void OnWindowInputEvent(Id window_id, |
| 162 mojom::EventPtr event, |
| 163 uint32_t event_observer_id); |
| 164 void OnEventObserved(mojom::EventPtr event, uint32_t event_observer_id); |
| 160 void OnWindowSharedPropertyChanged(Id window_id, | 165 void OnWindowSharedPropertyChanged(Id window_id, |
| 161 mojo::String name, | 166 mojo::String name, |
| 162 mojo::Array<uint8_t> data); | 167 mojo::Array<uint8_t> data); |
| 163 void OnWindowFocused(Id window_id); | 168 void OnWindowFocused(Id window_id); |
| 164 void OnWindowPredefinedCursorChanged(Id window_id, mojom::Cursor cursor_id); | 169 void OnWindowPredefinedCursorChanged(Id window_id, mojom::Cursor cursor_id); |
| 165 void OnChangeCompleted(uint32_t change_id, bool success); | 170 void OnChangeCompleted(uint32_t change_id, bool success); |
| 166 void OnTopLevelCreated(uint32_t change_id, | 171 void OnTopLevelCreated(uint32_t change_id, |
| 167 mojom::WindowDataPtr window_data, | 172 mojom::WindowDataPtr window_data, |
| 168 bool drawn); | 173 bool drawn); |
| 169 | 174 |
| 170 private: | 175 private: |
| 171 void AddChange(const Change& change); | 176 void AddChange(const Change& change); |
| 172 | 177 |
| 173 Delegate* delegate_; | 178 Delegate* delegate_; |
| 174 std::vector<Change> changes_; | 179 std::vector<Change> changes_; |
| 175 | 180 |
| 176 DISALLOW_COPY_AND_ASSIGN(TestChangeTracker); | 181 DISALLOW_COPY_AND_ASSIGN(TestChangeTracker); |
| 177 }; | 182 }; |
| 178 | 183 |
| 179 } // namespace ws | 184 } // namespace ws |
| 180 | 185 |
| 181 } // namespace mus | 186 } // namespace mus |
| 182 | 187 |
| 183 #endif // COMPONENTS_MUS_WS_TEST_CHANGE_TRACKER_H_ | 188 #endif // COMPONENTS_MUS_WS_TEST_CHANGE_TRACKER_H_ |
| OLD | NEW |