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

Side by Side Diff: services/ui/ws/test_change_tracker.h

Issue 2764433003: mus-ws: Plumb FrameSinkId to Children (Closed)
Patch Set: Addressed Antoine's comment Created 3 years, 9 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
« no previous file with comments | « services/ui/public/interfaces/window_tree.mojom ('k') | services/ui/ws/test_change_tracker.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef SERVICES_UI_WS_TEST_CHANGE_TRACKER_H_ 5 #ifndef SERVICES_UI_WS_TEST_CHANGE_TRACKER_H_
6 #define SERVICES_UI_WS_TEST_CHANGE_TRACKER_H_ 6 #define SERVICES_UI_WS_TEST_CHANGE_TRACKER_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 ~Change(); 70 ~Change();
71 71
72 ChangeType type; 72 ChangeType type;
73 ClientSpecificId client_id; 73 ClientSpecificId client_id;
74 std::vector<TestWindow> windows; 74 std::vector<TestWindow> windows;
75 Id window_id; 75 Id window_id;
76 Id window_id2; 76 Id window_id2;
77 Id window_id3; 77 Id window_id3;
78 gfx::Rect bounds; 78 gfx::Rect bounds;
79 gfx::Rect bounds2; 79 gfx::Rect bounds2;
80 cc::FrameSinkId frame_sink_id;
80 base::Optional<cc::LocalSurfaceId> local_surface_id; 81 base::Optional<cc::LocalSurfaceId> local_surface_id;
81 int32_t event_action; 82 int32_t event_action;
82 bool matches_pointer_watcher; 83 bool matches_pointer_watcher;
83 std::string embed_url; 84 std::string embed_url;
84 mojom::OrderDirection direction; 85 mojom::OrderDirection direction;
85 bool bool_value; 86 bool bool_value;
86 float float_value; 87 float float_value;
87 std::string property_key; 88 std::string property_key;
88 std::string property_value; 89 std::string property_value;
89 int32_t cursor_id; 90 int32_t cursor_id;
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 ~TestChangeTracker(); 133 ~TestChangeTracker();
133 134
134 void set_delegate(Delegate* delegate) { delegate_ = delegate; } 135 void set_delegate(Delegate* delegate) { delegate_ = delegate; }
135 136
136 std::vector<Change>* changes() { return &changes_; } 137 std::vector<Change>* changes() { return &changes_; }
137 138
138 // Each of these functions generate a Change. There is one per 139 // Each of these functions generate a Change. There is one per
139 // WindowTreeClient function. 140 // WindowTreeClient function.
140 void OnEmbed(ClientSpecificId client_id, 141 void OnEmbed(ClientSpecificId client_id,
141 mojom::WindowDataPtr root, 142 mojom::WindowDataPtr root,
142 bool drawn); 143 bool drawn,
144 const cc::FrameSinkId& frame_sink_id);
143 void OnEmbeddedAppDisconnected(Id window_id); 145 void OnEmbeddedAppDisconnected(Id window_id);
144 void OnUnembed(Id window_id); 146 void OnUnembed(Id window_id);
145 void OnCaptureChanged(Id new_capture_window_id, Id old_capture_window_id); 147 void OnCaptureChanged(Id new_capture_window_id, Id old_capture_window_id);
146 void OnTransientWindowAdded(Id window_id, Id transient_window_id); 148 void OnTransientWindowAdded(Id window_id, Id transient_window_id);
147 void OnTransientWindowRemoved(Id window_id, Id transient_window_id); 149 void OnTransientWindowRemoved(Id window_id, Id transient_window_id);
148 void OnWindowBoundsChanged( 150 void OnWindowBoundsChanged(
149 Id window_id, 151 Id window_id,
150 const gfx::Rect& old_bounds, 152 const gfx::Rect& old_bounds,
151 const gfx::Rect& new_bounds, 153 const gfx::Rect& new_bounds,
152 const base::Optional<cc::LocalSurfaceId>& local_surface_id); 154 const base::Optional<cc::LocalSurfaceId>& local_surface_id);
(...skipping 15 matching lines...) Expand all
168 uint32_t window_id); 170 uint32_t window_id);
169 void OnWindowSharedPropertyChanged( 171 void OnWindowSharedPropertyChanged(
170 Id window_id, 172 Id window_id,
171 const std::string& name, 173 const std::string& name,
172 const base::Optional<std::vector<uint8_t>>& data); 174 const base::Optional<std::vector<uint8_t>>& data);
173 void OnWindowFocused(Id window_id); 175 void OnWindowFocused(Id window_id);
174 void OnWindowPredefinedCursorChanged(Id window_id, mojom::Cursor cursor_id); 176 void OnWindowPredefinedCursorChanged(Id window_id, mojom::Cursor cursor_id);
175 void OnChangeCompleted(uint32_t change_id, bool success); 177 void OnChangeCompleted(uint32_t change_id, bool success);
176 void OnTopLevelCreated(uint32_t change_id, 178 void OnTopLevelCreated(uint32_t change_id,
177 mojom::WindowDataPtr window_data, 179 mojom::WindowDataPtr window_data,
178 bool drawn); 180 bool drawn,
181 const cc::FrameSinkId& frame_sink_id);
179 void OnWindowSurfaceChanged(Id window_id, 182 void OnWindowSurfaceChanged(Id window_id,
180 const cc::SurfaceInfo& surface_info); 183 const cc::SurfaceInfo& surface_info);
181 184
182 private: 185 private:
183 void AddChange(const Change& change); 186 void AddChange(const Change& change);
184 187
185 Delegate* delegate_; 188 Delegate* delegate_;
186 std::vector<Change> changes_; 189 std::vector<Change> changes_;
187 190
188 DISALLOW_COPY_AND_ASSIGN(TestChangeTracker); 191 DISALLOW_COPY_AND_ASSIGN(TestChangeTracker);
189 }; 192 };
190 193
191 } // namespace ws 194 } // namespace ws
192 195
193 } // namespace ui 196 } // namespace ui
194 197
195 #endif // SERVICES_UI_WS_TEST_CHANGE_TRACKER_H_ 198 #endif // SERVICES_UI_WS_TEST_CHANGE_TRACKER_H_
OLDNEW
« no previous file with comments | « services/ui/public/interfaces/window_tree.mojom ('k') | services/ui/ws/test_change_tracker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698