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 "services/ui/ws/test_change_tracker.h" | 5 #include "services/ui/ws/test_change_tracker.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include "base/strings/string_util.h" | 9 #include "base/strings/string_util.h" |
10 #include "base/strings/stringprintf.h" | 10 #include "base/strings/stringprintf.h" |
(...skipping 19 matching lines...) Expand all Loading... |
30 ONE, | 30 ONE, |
31 TWO, | 31 TWO, |
32 }; | 32 }; |
33 | 33 |
34 std::string ChangeToDescription(const Change& change, | 34 std::string ChangeToDescription(const Change& change, |
35 ChangeDescriptionType type) { | 35 ChangeDescriptionType type) { |
36 switch (change.type) { | 36 switch (change.type) { |
37 case CHANGE_TYPE_EMBED: | 37 case CHANGE_TYPE_EMBED: |
38 if (type == ChangeDescriptionType::ONE) | 38 if (type == ChangeDescriptionType::ONE) |
39 return "OnEmbed"; | 39 return "OnEmbed"; |
40 return base::StringPrintf("OnEmbed drawn=%s", | 40 return base::StringPrintf("OnEmbed %s drawn=%s", |
| 41 change.frame_sink_id.ToString().c_str(), |
41 change.bool_value ? "true" : "false"); | 42 change.bool_value ? "true" : "false"); |
42 | 43 |
43 case CHANGE_TYPE_EMBEDDED_APP_DISCONNECTED: | 44 case CHANGE_TYPE_EMBEDDED_APP_DISCONNECTED: |
44 return base::StringPrintf("OnEmbeddedAppDisconnected window=%s", | 45 return base::StringPrintf("OnEmbeddedAppDisconnected window=%s", |
45 WindowIdToString(change.window_id).c_str()); | 46 WindowIdToString(change.window_id).c_str()); |
46 | 47 |
47 case CHANGE_TYPE_UNEMBED: | 48 case CHANGE_TYPE_UNEMBED: |
48 return base::StringPrintf("OnUnembed window=%s", | 49 return base::StringPrintf("OnUnembed window=%s", |
49 WindowIdToString(change.window_id).c_str()); | 50 WindowIdToString(change.window_id).c_str()); |
50 | 51 |
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
127 case CHANGE_TYPE_CURSOR_CHANGED: | 128 case CHANGE_TYPE_CURSOR_CHANGED: |
128 return base::StringPrintf("CursorChanged id=%s cursor_id=%d", | 129 return base::StringPrintf("CursorChanged id=%s cursor_id=%d", |
129 WindowIdToString(change.window_id).c_str(), | 130 WindowIdToString(change.window_id).c_str(), |
130 change.cursor_id); | 131 change.cursor_id); |
131 case CHANGE_TYPE_ON_CHANGE_COMPLETED: | 132 case CHANGE_TYPE_ON_CHANGE_COMPLETED: |
132 return base::StringPrintf("ChangeCompleted id=%d sucess=%s", | 133 return base::StringPrintf("ChangeCompleted id=%d sucess=%s", |
133 change.change_id, | 134 change.change_id, |
134 change.bool_value ? "true" : "false"); | 135 change.bool_value ? "true" : "false"); |
135 | 136 |
136 case CHANGE_TYPE_ON_TOP_LEVEL_CREATED: | 137 case CHANGE_TYPE_ON_TOP_LEVEL_CREATED: |
137 return base::StringPrintf("TopLevelCreated id=%d window_id=%s drawn=%s", | 138 return base::StringPrintf( |
138 change.change_id, | 139 "TopLevelCreated id=%d %s window_id=%s drawn=%s", change.change_id, |
139 WindowIdToString(change.window_id).c_str(), | 140 change.frame_sink_id.ToString().c_str(), |
140 change.bool_value ? "true" : "false"); | 141 WindowIdToString(change.window_id).c_str(), |
| 142 change.bool_value ? "true" : "false"); |
141 case CHANGE_TYPE_OPACITY: | 143 case CHANGE_TYPE_OPACITY: |
142 return base::StringPrintf("OpacityChanged window_id=%s opacity=%.2f", | 144 return base::StringPrintf("OpacityChanged window_id=%s opacity=%.2f", |
143 WindowIdToString(change.window_id).c_str(), | 145 WindowIdToString(change.window_id).c_str(), |
144 change.float_value); | 146 change.float_value); |
145 case CHANGE_TYPE_SURFACE_CHANGED: | 147 case CHANGE_TYPE_SURFACE_CHANGED: |
146 return base::StringPrintf("SurfaceCreated window_id=%s surface_id=%s", | 148 return base::StringPrintf("SurfaceCreated window_id=%s surface_id=%s", |
147 WindowIdToString(change.window_id).c_str(), | 149 WindowIdToString(change.window_id).c_str(), |
148 change.surface_id.ToString().c_str()); | 150 change.surface_id.ToString().c_str()); |
149 } | 151 } |
150 return std::string(); | 152 return std::string(); |
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
229 Change::Change(const Change& other) = default; | 231 Change::Change(const Change& other) = default; |
230 | 232 |
231 Change::~Change() {} | 233 Change::~Change() {} |
232 | 234 |
233 TestChangeTracker::TestChangeTracker() : delegate_(NULL) {} | 235 TestChangeTracker::TestChangeTracker() : delegate_(NULL) {} |
234 | 236 |
235 TestChangeTracker::~TestChangeTracker() {} | 237 TestChangeTracker::~TestChangeTracker() {} |
236 | 238 |
237 void TestChangeTracker::OnEmbed(ClientSpecificId client_id, | 239 void TestChangeTracker::OnEmbed(ClientSpecificId client_id, |
238 mojom::WindowDataPtr root, | 240 mojom::WindowDataPtr root, |
239 bool drawn) { | 241 bool drawn, |
| 242 const cc::FrameSinkId& frame_sink_id) { |
240 Change change; | 243 Change change; |
241 change.type = CHANGE_TYPE_EMBED; | 244 change.type = CHANGE_TYPE_EMBED; |
242 change.client_id = client_id; | 245 change.client_id = client_id; |
243 change.bool_value = drawn; | 246 change.bool_value = drawn; |
| 247 change.frame_sink_id = frame_sink_id; |
244 change.windows.push_back(WindowDataToTestWindow(root)); | 248 change.windows.push_back(WindowDataToTestWindow(root)); |
245 AddChange(change); | 249 AddChange(change); |
246 } | 250 } |
247 | 251 |
248 void TestChangeTracker::OnEmbeddedAppDisconnected(Id window_id) { | 252 void TestChangeTracker::OnEmbeddedAppDisconnected(Id window_id) { |
249 Change change; | 253 Change change; |
250 change.type = CHANGE_TYPE_EMBEDDED_APP_DISCONNECTED; | 254 change.type = CHANGE_TYPE_EMBEDDED_APP_DISCONNECTED; |
251 change.window_id = window_id; | 255 change.window_id = window_id; |
252 AddChange(change); | 256 AddChange(change); |
253 } | 257 } |
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
410 } | 414 } |
411 | 415 |
412 void TestChangeTracker::OnChangeCompleted(uint32_t change_id, bool success) { | 416 void TestChangeTracker::OnChangeCompleted(uint32_t change_id, bool success) { |
413 Change change; | 417 Change change; |
414 change.type = CHANGE_TYPE_ON_CHANGE_COMPLETED; | 418 change.type = CHANGE_TYPE_ON_CHANGE_COMPLETED; |
415 change.change_id = change_id; | 419 change.change_id = change_id; |
416 change.bool_value = success; | 420 change.bool_value = success; |
417 AddChange(change); | 421 AddChange(change); |
418 } | 422 } |
419 | 423 |
420 void TestChangeTracker::OnTopLevelCreated(uint32_t change_id, | 424 void TestChangeTracker::OnTopLevelCreated( |
421 mojom::WindowDataPtr window_data, | 425 uint32_t change_id, |
422 bool drawn) { | 426 mojom::WindowDataPtr window_data, |
| 427 bool drawn, |
| 428 const cc::FrameSinkId& frame_sink_id) { |
423 Change change; | 429 Change change; |
424 change.type = CHANGE_TYPE_ON_TOP_LEVEL_CREATED; | 430 change.type = CHANGE_TYPE_ON_TOP_LEVEL_CREATED; |
425 change.change_id = change_id; | 431 change.change_id = change_id; |
426 change.window_id = window_data->window_id; | 432 change.window_id = window_data->window_id; |
427 change.bool_value = drawn; | 433 change.bool_value = drawn; |
| 434 change.frame_sink_id = frame_sink_id; |
428 AddChange(change); | 435 AddChange(change); |
429 } | 436 } |
430 | 437 |
431 void TestChangeTracker::OnWindowSurfaceChanged( | 438 void TestChangeTracker::OnWindowSurfaceChanged( |
432 Id window_id, | 439 Id window_id, |
433 const cc::SurfaceInfo& surface_info) { | 440 const cc::SurfaceInfo& surface_info) { |
434 Change change; | 441 Change change; |
435 change.type = CHANGE_TYPE_SURFACE_CHANGED; | 442 change.type = CHANGE_TYPE_SURFACE_CHANGED; |
436 change.window_id = window_id; | 443 change.window_id = window_id; |
437 change.surface_id = surface_info.id(); | 444 change.surface_id = surface_info.id(); |
(...skipping 22 matching lines...) Expand all Loading... |
460 | 467 |
461 std::string TestWindow::ToString2() const { | 468 std::string TestWindow::ToString2() const { |
462 return base::StringPrintf( | 469 return base::StringPrintf( |
463 "window=%s parent=%s visible=%s", WindowIdToString(window_id).c_str(), | 470 "window=%s parent=%s visible=%s", WindowIdToString(window_id).c_str(), |
464 WindowIdToString(parent_id).c_str(), visible ? "true" : "false"); | 471 WindowIdToString(parent_id).c_str(), visible ? "true" : "false"); |
465 } | 472 } |
466 | 473 |
467 } // namespace ws | 474 } // namespace ws |
468 | 475 |
469 } // namespace ui | 476 } // namespace ui |
OLD | NEW |