Index: services/ui/ws/test_change_tracker.cc |
diff --git a/services/ui/ws/test_change_tracker.cc b/services/ui/ws/test_change_tracker.cc |
index 172c9b81a49de01b22d4f914651b16a2bbcb992f..afb9efb54b17368bea356eac8d38d3ea7548ca95 100644 |
--- a/services/ui/ws/test_change_tracker.cc |
+++ b/services/ui/ws/test_change_tracker.cc |
@@ -37,7 +37,8 @@ std::string ChangeToDescription(const Change& change, |
case CHANGE_TYPE_EMBED: |
if (type == ChangeDescriptionType::ONE) |
return "OnEmbed"; |
- return base::StringPrintf("OnEmbed drawn=%s", |
+ return base::StringPrintf("OnEmbed %s drawn=%s", |
+ change.frame_sink_id.ToString().c_str(), |
change.bool_value ? "true" : "false"); |
case CHANGE_TYPE_EMBEDDED_APP_DISCONNECTED: |
@@ -134,10 +135,11 @@ std::string ChangeToDescription(const Change& change, |
change.bool_value ? "true" : "false"); |
case CHANGE_TYPE_ON_TOP_LEVEL_CREATED: |
- return base::StringPrintf("TopLevelCreated id=%d window_id=%s drawn=%s", |
- change.change_id, |
- WindowIdToString(change.window_id).c_str(), |
- change.bool_value ? "true" : "false"); |
+ return base::StringPrintf( |
+ "TopLevelCreated id=%d %s window_id=%s drawn=%s", change.change_id, |
+ change.frame_sink_id.ToString().c_str(), |
+ WindowIdToString(change.window_id).c_str(), |
+ change.bool_value ? "true" : "false"); |
case CHANGE_TYPE_OPACITY: |
return base::StringPrintf("OpacityChanged window_id=%s opacity=%.2f", |
WindowIdToString(change.window_id).c_str(), |
@@ -236,11 +238,13 @@ TestChangeTracker::~TestChangeTracker() {} |
void TestChangeTracker::OnEmbed(ClientSpecificId client_id, |
mojom::WindowDataPtr root, |
- bool drawn) { |
+ bool drawn, |
+ const cc::FrameSinkId& frame_sink_id) { |
Change change; |
change.type = CHANGE_TYPE_EMBED; |
change.client_id = client_id; |
change.bool_value = drawn; |
+ change.frame_sink_id = frame_sink_id; |
change.windows.push_back(WindowDataToTestWindow(root)); |
AddChange(change); |
} |
@@ -417,14 +421,17 @@ void TestChangeTracker::OnChangeCompleted(uint32_t change_id, bool success) { |
AddChange(change); |
} |
-void TestChangeTracker::OnTopLevelCreated(uint32_t change_id, |
- mojom::WindowDataPtr window_data, |
- bool drawn) { |
+void TestChangeTracker::OnTopLevelCreated( |
+ uint32_t change_id, |
+ mojom::WindowDataPtr window_data, |
+ bool drawn, |
+ const cc::FrameSinkId& frame_sink_id) { |
Change change; |
change.type = CHANGE_TYPE_ON_TOP_LEVEL_CREATED; |
change.change_id = change_id; |
change.window_id = window_data->window_id; |
change.bool_value = drawn; |
+ change.frame_sink_id = frame_sink_id; |
AddChange(change); |
} |