Fixes problems with drawn state

components/mus/ws/window_tree_client_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 253 matching lines @@
     if (wait_state_.get() &&
         tracker_.changes()->size() >= wait_state_->change_count) {
       wait_state_->run_loop.Quit();
     }
   }
 
   // WindowTreeClient:
   void OnEmbed(ConnectionSpecificId connection_id,
                WindowDataPtr root,
                mojom::WindowTreePtr tree,
-               Id focused_window_id) override {
+               Id focused_window_id,
+               bool drawn) override {
     // TODO(sky): add coverage of |focused_window_id|.
     ASSERT_TRUE(root);
     root_window_id_ = root->window_id;
     tree_ = std::move(tree);
     connection_id_ = connection_id;
-    tracker()->OnEmbed(connection_id, std::move(root));
+    tracker()->OnEmbed(connection_id, std::move(root), drawn);
     if (embed_run_loop_)
       embed_run_loop_->Quit();
   }
   void OnEmbeddedAppDisconnected(Id window_id) override {
     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));
+                         mojom::WindowDataPtr data,
+                         bool drawn) override {
+    tracker()->OnTopLevelCreated(change_id, std::move(data), drawn);
   }
   void OnWindowBoundsChanged(Id window_id,
                              RectPtr old_bounds,
                              RectPtr new_bounds) override {
     // The bounds of the root may change during startup on Android at random
     // times. As this doesn't matter, and shouldn't impact test exepctations,
     // it is ignored.
     if (window_id == root_window_id_ && !track_root_bounds_changes_)
       return;
     tracker()->OnWindowBoundsChanged(window_id, std::move(old_bounds),
@@ skipping 28 matching lines @@
                          Id relative_window_id,
                          mojom::OrderDirection direction) override {
     tracker()->OnWindowReordered(window_id, relative_window_id, direction);
   }
   void OnWindowDeleted(Id window) override {
     tracker()->OnWindowDeleted(window);
   }
   void OnWindowVisibilityChanged(uint32_t window, bool visible) override {
     tracker()->OnWindowVisibilityChanged(window, visible);
   }
-  void OnWindowDrawnStateChanged(uint32_t window, bool drawn) override {
-    tracker()->OnWindowDrawnStateChanged(window, drawn);
+  void OnWindowParentDrawnStateChanged(uint32_t window, bool drawn) override {
+    tracker()->OnWindowParentDrawnStateChanged(window, drawn);
   }
   void OnWindowInputEvent(uint32_t event_id,
                           Id window_id,
                           EventPtr event) override {
     // Ack input events to clear the state on the server. These can be received
     // during test startup. X11Window::DispatchEvent sends a synthetic move
     // event to notify of entry.
     tree()->OnWindowInputEventAck(event_id, true);
     // Don't log input events as none of the tests care about them and they
     // may come in at random points.
@@ skipping 1050 matching lines @@
   Id window_1_1 = wt_client1()->NewWindow(1);
   Id window_1_2 = wt_client1()->NewWindow(2);
   ASSERT_TRUE(window_1_1);
   ASSERT_TRUE(window_1_2);
 
   ASSERT_TRUE(wt_client1()->AddWindow(root_window_id(), window_1_1));
   {
     std::vector<TestWindow> windows;
     GetWindowTree(wt1(), root_window_id(), &windows);
     ASSERT_EQ(2u, windows.size());
-    EXPECT_EQ(WindowParentToString(root_window_id(), kNullParentId) +
-                  " visible=true drawn=true",
-              windows[0].ToString2());
-    EXPECT_EQ(WindowParentToString(window_1_1, root_window_id()) +
-                  " visible=false drawn=false",
-              windows[1].ToString2());
+    EXPECT_EQ(
+        WindowParentToString(root_window_id(), kNullParentId) + " visible=true",
+        windows[0].ToString2());
+    EXPECT_EQ(
+        WindowParentToString(window_1_1, root_window_id()) + " visible=false",
+        windows[1].ToString2());
   }
 
   // Show all the windows.
   ASSERT_TRUE(wt_client1()->SetWindowVisibility(window_1_1, true));
   ASSERT_TRUE(wt_client1()->SetWindowVisibility(window_1_2, true));
   {
     std::vector<TestWindow> windows;
     GetWindowTree(wt1(), root_window_id(), &windows);
     ASSERT_EQ(2u, windows.size());
-    EXPECT_EQ(WindowParentToString(root_window_id(), kNullParentId) +
-                  " visible=true drawn=true",
-              windows[0].ToString2());
-    EXPECT_EQ(WindowParentToString(window_1_1, root_window_id()) +
-                  " visible=true drawn=true",
-              windows[1].ToString2());
+    EXPECT_EQ(
+        WindowParentToString(root_window_id(), kNullParentId) + " visible=true",
+        windows[0].ToString2());
+    EXPECT_EQ(
+        WindowParentToString(window_1_1, root_window_id()) + " visible=true",
+        windows[1].ToString2());
   }
 
   // Hide 1.
   ASSERT_TRUE(wt_client1()->SetWindowVisibility(window_1_1, false));
   {
     std::vector<TestWindow> windows;
     GetWindowTree(wt1(), window_1_1, &windows);
     ASSERT_EQ(1u, windows.size());
-    EXPECT_EQ(WindowParentToString(window_1_1, root_window_id()) +
-                  " visible=false drawn=false",
-              windows[0].ToString2());
+    EXPECT_EQ(
+        WindowParentToString(window_1_1, root_window_id()) + " visible=false",
+        windows[0].ToString2());
   }
 
   // Attach 2 to 1.
   ASSERT_TRUE(wt_client1()->AddWindow(window_1_1, window_1_2));
   {
     std::vector<TestWindow> windows;
     GetWindowTree(wt1(), window_1_1, &windows);
     ASSERT_EQ(2u, windows.size());
-    EXPECT_EQ(WindowParentToString(window_1_1, root_window_id()) +
-                  " visible=false drawn=false",
-              windows[0].ToString2());
-    EXPECT_EQ(WindowParentToString(window_1_2, window_1_1) +
-                  " visible=true drawn=false",
+    EXPECT_EQ(
+        WindowParentToString(window_1_1, root_window_id()) + " visible=false",
+        windows[0].ToString2());
+    EXPECT_EQ(WindowParentToString(window_1_2, window_1_1) + " visible=true",
               windows[1].ToString2());
   }
 
   // Show 1.
   ASSERT_TRUE(wt_client1()->SetWindowVisibility(window_1_1, true));
   {
     std::vector<TestWindow> windows;
     GetWindowTree(wt1(), window_1_1, &windows);
     ASSERT_EQ(2u, windows.size());
-    EXPECT_EQ(WindowParentToString(window_1_1, root_window_id()) +
-                  " visible=true drawn=true",
-              windows[0].ToString2());
-    EXPECT_EQ(WindowParentToString(window_1_2, window_1_1) +
-                  " visible=true drawn=true",
+    EXPECT_EQ(
+        WindowParentToString(window_1_1, root_window_id()) + " visible=true",
+        windows[0].ToString2());
+    EXPECT_EQ(WindowParentToString(window_1_2, window_1_1) + " visible=true",
               windows[1].ToString2());
   }
 }
 
 // Test that we hear the cursor change in other connections.
 TEST_F(WindowTreeClientTest, SetCursor) {
   // Get a second connection to listen in.
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(true));
   Id window_1_1 = BuildWindowId(connection_id_1(), 1);
   changes2()->clear();
@@ skipping 92 matching lines @@
   // Add 1,1 back to the root, connection 2 should see drawn state changed.
   ASSERT_TRUE(wt_client1()->AddWindow(root_window_id(), window_1_1));
   {
     wt_client2_->WaitForChangeCount(1);
     EXPECT_EQ(
         "DrawnStateChanged window=" + IdToString(window_1_2) + " drawn=true",
         SingleChangeToDescription(*changes2()));
   }
 }
 
+// Assertions for SetWindowVisibility sending notifications.
+TEST_F(WindowTreeClientTest, SetWindowVisibilityNotifications2) {
+  // Create 1,1 and 1,2. 1,2 is made a child of 1,1 and 1,1 a child of the root.
+  Id window_1_1 = wt_client1()->NewWindow(1);
+  ASSERT_TRUE(window_1_1);
+  ASSERT_TRUE(wt_client1()->SetWindowVisibility(window_1_1, true));
+  Id window_1_2 = wt_client1()->NewWindow(2);
+  ASSERT_TRUE(window_1_2);
+  ASSERT_TRUE(wt_client1()->AddWindow(root_window_id(), window_1_1));
+  ASSERT_TRUE(wt_client1()->AddWindow(window_1_1, window_1_2));
+
+  // Establish the second connection at 1,2.
+  ASSERT_NO_FATAL_FAILURE(EstablishSecondConnectionWithRoot(window_1_2));
+  EXPECT_EQ("OnEmbed drawn=true", SingleChangeToDescription2(*changes2()));
+  changes2()->clear();
+
+  // Show 1,2 from connection 1. Connection 2 should see this.
+  ASSERT_TRUE(wt_client1()->SetWindowVisibility(window_1_2, true));
+  {
+    wt_client2_->WaitForChangeCount(1);
+    EXPECT_EQ(
+        "VisibilityChanged window=" + IdToString(window_1_2) + " visible=true",
+        SingleChangeToDescription(*changes2()));
+  }
+}
+
+// Assertions for SetWindowVisibility sending notifications.
+TEST_F(WindowTreeClientTest, SetWindowVisibilityNotifications3) {
+  // Create 1,1 and 1,2. 1,2 is made a child of 1,1 and 1,1 a child of the root.
+  Id window_1_1 = wt_client1()->NewWindow(1);
+  ASSERT_TRUE(window_1_1);
+  Id window_1_2 = wt_client1()->NewWindow(2);
+  ASSERT_TRUE(window_1_2);
+  ASSERT_TRUE(wt_client1()->AddWindow(root_window_id(), window_1_1));
+  ASSERT_TRUE(wt_client1()->AddWindow(window_1_1, window_1_2));
+
+  // Establish the second connection at 1,2.
+  ASSERT_NO_FATAL_FAILURE(EstablishSecondConnectionWithRoot(window_1_2));
+  EXPECT_EQ("OnEmbed drawn=false", SingleChangeToDescription2(*changes2()));
+  changes2()->clear();
+
+  // Show 1,1, drawn should be true for 1,2 (as that is all the child sees).
+  ASSERT_TRUE(wt_client1()->SetWindowVisibility(window_1_1, true));
+  {
+    wt_client2_->WaitForChangeCount(1);
+    EXPECT_EQ(
+        "DrawnStateChanged window=" + IdToString(window_1_2) + " drawn=true",
+        SingleChangeToDescription(*changes2()));
+  }
+  changes2()->clear();
+
+  // Show 1,2, visible should be true.
+  ASSERT_TRUE(wt_client1()->SetWindowVisibility(window_1_2, true));
+  {
+    wt_client2_->WaitForChangeCount(1);
+    EXPECT_EQ(
+        "VisibilityChanged window=" + IdToString(window_1_2) + " visible=true",
+        SingleChangeToDescription(*changes2()));
+  }
+}
+
 TEST_F(WindowTreeClientTest, SetWindowProperty) {
   Id window_1_1 = wt_client1()->NewWindow(1);
   ASSERT_TRUE(window_1_1);
 
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(false));
   changes2()->clear();
 
   ASSERT_TRUE(wt_client1()->AddWindow(root_window_id(), window_1_1));
   {
     std::vector<TestWindow> windows;
@@ skipping 331 matching lines @@
 
 // TODO(sky): make sure coverage of what was
 // WindowManagerTest.SecondEmbedRoot_InitService and
 // WindowManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window
 // manager
 // tests.
 
 }  // namespace test
 }  // namespace ws
 }  // namespace mus