Index: components/mus/ws/window_tree_apptest.cc |
diff --git a/components/mus/ws/window_tree_apptest.cc b/components/mus/ws/window_tree_apptest.cc |
index 9965e99fd5f721db3db1b995b105415035a60f31..cb2c54b082e0654fe17833b7ba7fbf5a4ec66baa 100644 |
--- a/components/mus/ws/window_tree_apptest.cc |
+++ b/components/mus/ws/window_tree_apptest.cc |
@@ -293,6 +293,9 @@ class TestWindowTreeClientImpl : public mojom::WindowTreeClient, |
tracker()->OnEmbeddedAppDisconnected(window_id); |
} |
void OnUnembed(Id window_id) override { tracker()->OnUnembed(window_id); } |
+ void OnLostCapture(Id window_id) override { |
+ tracker()->OnLostCapture(window_id); |
+ } |
void OnTopLevelCreated(uint32_t change_id, |
mojom::WindowDataPtr data) override { |
tracker()->OnTopLevelCreated(change_id, std::move(data)); |
@@ -1863,6 +1866,35 @@ TEST_F(WindowTreeAppTest, Ids) { |
SingleChangeToDescription(*changes2())); |
} |
+// TODO(jonross): Enable this once apptests can send input events to the server. |
+// Enabling capture requires that the connection be processing events. |
+TEST_F(WindowTreeAppTest, DISABLED_ExplicitCapturePropagation) { |
+ Id window_1_1 = ws_client1()->NewWindow(1); |
+ Id window_1_2 = ws_client1()->NewWindow(2); |
+ |
+ // Add the windows to the root, so that they have a WindowTreeHostImpl to |
+ // handle input capture. |
+ ASSERT_TRUE(ws_client1()->AddWindow(root_window_id(), window_1_1)); |
+ ASSERT_TRUE(ws_client1()->AddWindow(root_window_id(), window_1_2)); |
+ |
+ changes1()->clear(); |
+ // Window 1 takes capture then Window 2 takes capture. |
+ // Verify that window 1 has lost capture. |
+ ws1()->SetCapture(1, window_1_1); |
+ ws1()->SetCapture(2, window_1_2); |
+ ws_client1_->WaitForChangeCount(1); |
+ |
+ EXPECT_EQ("OnLostCapture window=" + IdToString(window_1_1), |
+ SingleChangeToDescription(*changes1())); |
+ |
+ changes1()->clear(); |
+ // Explicitly releasing capture should not notify of lost capture. |
+ ws1()->ReleaseCapture(3, window_1_2); |
+ ws_client1_->WaitForAllMessages(); |
+ |
+ EXPECT_TRUE(changes1()->empty()); |
+} |
+ |
// TODO(sky): need to better track changes to initial connection. For example, |
// that SetBounsdWindows/AddWindow and the like don't result in messages to the |
// originating connection. |