Fixes problems with drawn state

components/mus/public/cpp/tests/window_tree_client_impl_unittest.cc

 // Copyright 2015 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 "components/mus/public/cpp/lib/window_tree_client_impl.h"
 
 #include <stdint.h>
 
 #include "base/logging.h"
 #include "base/macros.h"
@@ skipping 52 matching lines @@
       : tree_client_impl_(tree_client_impl) {}
   ~WindowTreeClientImplPrivate() {}
 
   void Init(mojom::WindowTree* window_tree) {
     mojom::WindowDataPtr root_data(mojom::WindowData::New());
     root_data->parent_id = 0;
     root_data->window_id = 1;
     root_data->bounds = mojo::Rect::From(gfx::Rect());
     root_data->properties.SetToEmpty();
     root_data->visible = true;
-    root_data->drawn = true;
     root_data->viewport_metrics = mojom::ViewportMetrics::New();
     root_data->viewport_metrics->size_in_pixels =
         mojo::Size::From(gfx::Size(1000, 1000));
     root_data->viewport_metrics->device_pixel_ratio = 1;
-    tree_client_impl_->OnEmbedImpl(window_tree, 1, std::move(root_data), 0);
+    tree_client_impl_->OnEmbedImpl(window_tree, 1, std::move(root_data), 0,
+                                   true);
   }
 
  private:
   WindowTreeClientImpl* tree_client_impl_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTreeClientImplPrivate);
 };
 
 class WindowTreeSetup {
  public:
@@ skipping 421 matching lines @@
   ASSERT_TRUE(setup.window_tree()->GetAndClearChangeId(&change_id));
   setup.window_tree_client()->OnChangeCompleted(change_id, true);
 }
 
 TEST_F(WindowTreeClientImplTest, NewTopLevelWindow) {
   WindowTreeSetup setup;
   Window* root1 = setup.GetFirstRoot();
   ASSERT_TRUE(root1);
   Window* root2 = setup.window_tree_connection()->NewTopLevelWindow(nullptr);
   ASSERT_TRUE(root2);
+  EXPECT_TRUE(WindowPrivate(root2).parent_drawn());
   ASSERT_NE(root2, root1);
   EXPECT_NE(root2->id(), root1->id());
   EXPECT_EQ(2u, setup.window_tree_connection()->GetRoots().size());
   EXPECT_TRUE(setup.window_tree_connection()->GetRoots().count(root1) > 0u);
   EXPECT_TRUE(setup.window_tree_connection()->GetRoots().count(root2) > 0u);
 
   // Ack the request to the windowtree to create the new window.
   uint32_t change_id;
   ASSERT_TRUE(setup.window_tree()->GetAndClearChangeId(&change_id));
   EXPECT_EQ(setup.window_tree()->window_id(), root2->id());
 
   mojom::WindowDataPtr data = mojom::WindowData::New();
   data->window_id = root2->id();
   data->viewport_metrics = mojom::ViewportMetrics::New();
-  setup.window_tree_client()->OnTopLevelCreated(change_id, std::move(data));
+  setup.window_tree_client()->OnTopLevelCreated(change_id, std::move(data),
+                                                false);
+
+  EXPECT_FALSE(WindowPrivate(root2).parent_drawn());
 
   // Should not be able to add a top level as a child of another window.
   root1->AddChild(root2);
   ASSERT_EQ(nullptr, root2->parent());
 
   // Destroy the first root, shouldn't initiate tear down.
   root1->Destroy();
   root1 = nullptr;
   EXPECT_EQ(1u, setup.window_tree_connection()->GetRoots().size());
   EXPECT_TRUE(setup.window_tree_connection()->GetRoots().count(root2) > 0u);
@@ skipping 13 matching lines @@
   uint32_t change_id;
   ASSERT_TRUE(setup.window_tree()->GetAndClearChangeId(&change_id));
   EXPECT_EQ(setup.window_tree()->window_id(), root2->id());
 
   mojom::WindowDataPtr data = mojom::WindowData::New();
   data->window_id = root2->id();
   data->viewport_metrics = mojom::ViewportMetrics::New();
   data->viewport_metrics->size_in_pixels = mojo::Size::From(gfx::Size(1, 2));
   data->bounds = mojo::Rect::From(gfx::Rect(1, 2, 3, 4));
   data->visible = true;
-  data->drawn = true;
-  setup.window_tree_client()->OnTopLevelCreated(change_id, std::move(data));
+  setup.window_tree_client()->OnTopLevelCreated(change_id, std::move(data),
+                                                true);
 
   // Make sure all the properties took.
   EXPECT_TRUE(root2->IsDrawn());
   EXPECT_TRUE(root2->visible());
   EXPECT_EQ(gfx::Size(1, 2),
             root2->viewport_metrics().size_in_pixels.To<gfx::Size>());
   EXPECT_EQ(gfx::Rect(1, 2, 3, 4), root2->bounds());
 }
 
 TEST_F(WindowTreeClientImplTest, NewTopLevelWindowGetsAllChangesInFlight) {
@@ skipping 37 matching lines @@
       setup.window_tree()->GetAndClearChangeId(&property_in_flight_change_id));
   EXPECT_NE(bounds_in_flight_change_id, property_in_flight_change_id);
 
   // Ack the new window top level window. Vis and bounds shouldn't change.
   mojom::WindowDataPtr data = mojom::WindowData::New();
   data->window_id = root2->id();
   data->viewport_metrics = mojom::ViewportMetrics::New();
   data->viewport_metrics->size_in_pixels = mojo::Size::From(gfx::Size(1, 2));
   data->bounds = mojo::Rect::From(gfx::Rect(1, 2, 3, 4));
   data->visible = true;
-  data->drawn = true;
   data->properties["xx"] = mojo::Array<uint8_t>::From(std::string("server_xx"));
   data->properties["yy"] = mojo::Array<uint8_t>::From(std::string("server_yy"));
   setup.window_tree_client()->OnTopLevelCreated(new_window_in_flight_change_id,
-                                                std::move(data));
+                                                std::move(data), true);
 
   // The only value that should take effect is the property for 'yy' as it was
   // not in flight.
-  EXPECT_TRUE(WindowPrivate(root2).drawn());
+  EXPECT_TRUE(WindowPrivate(root2).parent_drawn());
   EXPECT_FALSE(root2->visible());
   EXPECT_EQ(gfx::Size(1, 2),
             root2->viewport_metrics().size_in_pixels.To<gfx::Size>());
   EXPECT_EQ(gfx::Rect(5, 6, 7, 8), root2->bounds());
   EXPECT_EQ(2u, root2->shared_properties().size());
   ASSERT_TRUE(root2->HasSharedProperty("yy"));
   EXPECT_EQ("server_yy", root2->GetSharedProperty<std::string>("yy"));
   ASSERT_TRUE(root2->HasSharedProperty("xx"));
   EXPECT_EQ("client_xx", root2->GetSharedProperty<std::string>("xx"));
 
@@ skipping 49 matching lines @@
 
   mojom::WindowDataPtr data = mojom::WindowData::New();
   data->window_id = root2->id();
   data->viewport_metrics = mojom::ViewportMetrics::New();
 
   // Destroy the window before the server has a chance to ack the window
   // creation.
   root2->Destroy();
   EXPECT_EQ(1u, setup.window_tree_connection()->GetRoots().size());
 
-  setup.window_tree_client()->OnTopLevelCreated(change_id, std::move(data));
+  setup.window_tree_client()->OnTopLevelCreated(change_id, std::move(data),
+                                                true);
   EXPECT_EQ(1u, setup.window_tree_connection()->GetRoots().size());
 }
 
 // Tests both SetCapture and ReleaseCapture, to ensure that Window is properly
 // updated on failures.
 TEST_F(WindowTreeClientImplTest, ExplicitCapture) {
   WindowTreeSetup setup;
   Window* root = setup.GetFirstRoot();
   ASSERT_TRUE(root);
 
@@ skipping 100 matching lines @@
 
   setup.window_tree_client()->OnChangeCompleted(change_id2, false);
   EXPECT_FALSE(child->HasCapture());
   EXPECT_TRUE(root->HasCapture());
 
   setup.window_tree_client()->OnLostCapture(root->id());
   EXPECT_FALSE(root->HasCapture());
 }
 
 }  // namespace mus