Mus-WS / Aura-Mus: Propagate LocalSurfaceId on WindowTreeHost creation

ui/aura/mus/window_tree_client_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 "ui/aura/mus/window_tree_client.h"
 
 #include <stdint.h>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 1065 matching lines @@
 
   // Ack the request to the windowtree to create the new window.
   uint32_t change_id;
   ASSERT_TRUE(window_tree()->GetAndRemoveFirstChangeOfType(
       WindowTreeChangeType::NEW_TOP_LEVEL, &change_id));
   EXPECT_EQ(window_tree()->window_id(), server_id(top_level));
 
   ui::mojom::WindowDataPtr data = ui::mojom::WindowData::New();
   data->window_id = server_id(top_level);
   const int64_t display_id = 1;
-  window_tree_client()->OnTopLevelCreated(
-      change_id, std::move(data), display_id, false, cc::FrameSinkId(1, 1));
+  window_tree_client()->OnTopLevelCreated(change_id, std::move(data),
+                                          display_id, false,
+                                          cc::FrameSinkId(1, 1), base::nullopt);
 
   EXPECT_FALSE(window_tree_host->window()->TargetVisibility());
 
   // Should not be able to add a top level as a child of another window.
   // TODO(sky): decide how to handle this.
   // root_window()->AddChild(top_level);
   // ASSERT_EQ(nullptr, top_level->parent());
 
   // Destroy the first root, shouldn't initiate tear down.
   window_tree_host.reset();
@@ skipping 18 matching lines @@
   EXPECT_EQ(window_tree()->window_id(), server_id(top_level));
 
   ui::mojom::WindowDataPtr data = ui::mojom::WindowData::New();
   data->window_id = server_id(top_level);
   data->bounds.SetRect(1, 2, 3, 4);
   data->visible = true;
   const int64_t display_id = 10;
   uint32_t change_id;
   ASSERT_TRUE(window_tree()->GetAndRemoveFirstChangeOfType(
       WindowTreeChangeType::NEW_TOP_LEVEL, &change_id));
-  window_tree_client()->OnTopLevelCreated(
-      change_id, std::move(data), display_id, true, cc::FrameSinkId(1, 1));
+  window_tree_client()->OnTopLevelCreated(change_id, std::move(data),
+                                          display_id, true,
+                                          cc::FrameSinkId(1, 1), base::nullopt);
   EXPECT_EQ(
       0u, window_tree()->GetChangeCountForType(WindowTreeChangeType::VISIBLE));
 
   // Make sure all the properties took.
   EXPECT_TRUE(IsWindowHostVisible(top_level));
   EXPECT_TRUE(top_level->TargetVisibility());
   EXPECT_EQ(display_id, window_tree_host.display_id());
   EXPECT_EQ(gfx::Rect(0, 0, 3, 4), top_level->bounds());
   EXPECT_EQ(gfx::Rect(1, 2, 3, 4), top_level->GetHost()->GetBoundsInPixels());
 }
@@ skipping 31 matching lines @@
   const uint8_t server_test_property2_value = 4;
   data->properties[kTestPropertyServerKey2] =
       ConvertToPropertyTransportValue(server_test_property2_value);
   const int64_t display_id = 1;
   // Get the id of the in flight change for creating the new top_level.
   uint32_t new_window_in_flight_change_id;
   ASSERT_TRUE(window_tree()->GetAndRemoveFirstChangeOfType(
       WindowTreeChangeType::NEW_TOP_LEVEL, &new_window_in_flight_change_id));
   window_tree_client()->OnTopLevelCreated(new_window_in_flight_change_id,
                                           std::move(data), display_id, true,
-                                          cc::FrameSinkId(1, 1));
+                                          cc::FrameSinkId(1, 1), base::nullopt);
 
   // The only value that should take effect is the property for 'yy' as it was
   // not in flight.
   EXPECT_FALSE(top_level->TargetVisibility());
   EXPECT_EQ(gfx::Rect(5, 6, 7, 8), window_tree_host.GetBoundsInPixels());
   EXPECT_EQ(gfx::Rect(0, 0, 7, 8), top_level->bounds());
   EXPECT_EQ(explicitly_set_test_property1_value,
             top_level->GetProperty(kTestPropertyKey1));
   EXPECT_EQ(server_test_property2_value,
             top_level->GetProperty(kTestPropertyKey2));
@@ skipping 201 matching lines @@
   // creation.
   window_tree_host.reset();
   EXPECT_EQ(initial_root_count, window_tree_client_impl()->GetRoots().size());
 
   // Get the id of the in flight change for creating the new window.
   uint32_t change_id;
   ASSERT_TRUE(window_tree()->GetAndRemoveFirstChangeOfType(
       WindowTreeChangeType::NEW_TOP_LEVEL, &change_id));
 
   const int64_t display_id = 1;
-  window_tree_client()->OnTopLevelCreated(
-      change_id, std::move(data), display_id, true, cc::FrameSinkId(1, 1));
+  window_tree_client()->OnTopLevelCreated(change_id, std::move(data),
+                                          display_id, true,
+                                          cc::FrameSinkId(1, 1), base::nullopt);
   EXPECT_EQ(initial_root_count, window_tree_client_impl()->GetRoots().size());
 }
 
 TEST_F(WindowTreeClientClientTest, NewTopLevelWindowGetsProperties) {
   RegisterTestProperties(GetPropertyConverter());
   const uint8_t property_value = 11;
   std::map<std::string, std::vector<uint8_t>> properties;
   properties[kTestPropertyServerKey1] =
       ConvertToPropertyTransportValue(property_value);
   const char kUnknownPropertyKey[] = "unknown-property";
@@ skipping 283 matching lines @@
   // Ack the request to the windowtree to create the new window.
   uint32_t change_id;
   ASSERT_TRUE(window_tree()->GetAndRemoveFirstChangeOfType(
       WindowTreeChangeType::NEW_TOP_LEVEL, &change_id));
   EXPECT_EQ(window_tree()->window_id(), server_id(top_level));
 
   ui::mojom::WindowDataPtr data = ui::mojom::WindowData::New();
   data->window_id = server_id(top_level);
   data->visible = true;
   const int64_t display_id = 1;
-  window_tree_client()->OnTopLevelCreated(
-      change_id, std::move(data), display_id, true, cc::FrameSinkId(1, 1));
+  window_tree_client()->OnTopLevelCreated(change_id, std::move(data),
+                                          display_id, true,
+                                          cc::FrameSinkId(1, 1), base::nullopt);
   EXPECT_EQ(
       0u, window_tree()->GetChangeCountForType(WindowTreeChangeType::VISIBLE));
   EXPECT_TRUE(top_level->TargetVisibility());
 
   std::unique_ptr<CaptureRecorder> capture_recorder1(
       base::MakeUnique<CaptureRecorder>(root_window()));
   std::unique_ptr<CaptureRecorder> capture_recorder2(
       base::MakeUnique<CaptureRecorder>(top_level));
   EXPECT_NE(client::GetCaptureClient(root_window()),
             client::GetCaptureClient(top_level));
@@ skipping 187 matching lines @@
   Window* top_level = window_tree_host.window();
   window_tree_host.InitHost();
 
   ui::mojom::WindowDataPtr data = ui::mojom::WindowData::New();
   data->window_id = server_id(top_level);
   data->bounds.SetRect(2, 4, 6, 8);
   const int64_t display_id = 10;
   uint32_t change_id;
   ASSERT_TRUE(window_tree()->GetAndRemoveFirstChangeOfType(
       WindowTreeChangeType::NEW_TOP_LEVEL, &change_id));
-  window_tree_client()->OnTopLevelCreated(
-      change_id, std::move(data), display_id, true, cc::FrameSinkId(1, 1));
+  window_tree_client()->OnTopLevelCreated(change_id, std::move(data),
+                                          display_id, true,
+                                          cc::FrameSinkId(1, 1), base::nullopt);
 
   // aura::Window should operate in DIP and aura::WindowTreeHost should operate
   // in pixels.
   EXPECT_EQ(gfx::Rect(0, 0, 3, 4), top_level->bounds());
   EXPECT_EQ(gfx::Rect(2, 4, 6, 8), top_level->GetHost()->GetBoundsInPixels());
 }
 
 TEST_F(WindowTreeClientClientTestHighDPI, PointerEventsInDip) {
   display::Screen* screen = display::Screen::GetScreen();
   const display::Display primary_display = screen->GetPrimaryDisplay();
@@ skipping 95 matching lines @@
             window_tree()->GetEventResult(event_id));
   EXPECT_TRUE(window_delegate1.got_move());
   EXPECT_FALSE(window_delegate2.got_move());
   gfx::Point transformed_event_location_in_dip(event_location_in_dip.x() + 20,
                                                event_location_in_dip.y() + 30);
   EXPECT_EQ(transformed_event_location_in_dip,
             window_delegate1.last_event_location());
 }
 
 }  // namespace aura