WIP: Surface Synchronization System

services/ui/ws/window_manager_state_unittest.cc

 // Copyright 2016 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 "services/ui/ws/window_manager_state.h"
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 199 matching lines @@
   WindowTreeTestApi(window_tree()).AckOldestEvent();
   EXPECT_TRUE(window_manager()->on_accelerator_called());
   EXPECT_EQ(accelerator->id(), window_manager()->on_accelerator_id());
 }
 
 // Tests that if a pre target accelerator consumes the event no other processing
 // is done.
 TEST_F(WindowManagerStateTest, PreTargetConsumed) {
   // Set up two trees with focus on a child in the second.
   const ClientWindowId child_window_id(11);
-  window_tree()->NewWindow(child_window_id, ServerWindow::Properties());
+  window_tree()->NewWindow(child_window_id, ServerWindow::Properties(),
+                           cc::LocalFrameId());
   ServerWindow* child_window =
       window_tree()->GetWindowByClientId(child_window_id);
   window_tree()->AddWindow(FirstRootId(window_tree()), child_window_id);
   child_window->SetVisible(true);
   SetCanFocusUp(child_window);
   tree()->GetDisplay(child_window)->AddActivationParent(child_window->parent());
   ASSERT_TRUE(window_tree()->SetFocus(child_window_id));
 
   // Register a pre-accelerator.
   uint32_t accelerator_id = 11;
@@ skipping 188 matching lines @@
   OnEventAckTimeout(window()->id().client_id);
   EXPECT_TRUE(window_manager()->on_accelerator_called());
   EXPECT_EQ(accelerator->id(), window_manager()->on_accelerator_id());
 }
 
 TEST_F(WindowManagerStateTest, InterceptingEmbedderReceivesEvents) {
   WindowTree* embedder_tree = tree();
   ServerWindow* embedder_root = window();
   const ClientWindowId embed_window_id(
       WindowIdToTransportId(WindowId(embedder_tree->id(), 12)));
-  embedder_tree->NewWindow(embed_window_id, ServerWindow::Properties());
+  embedder_tree->NewWindow(embed_window_id, ServerWindow::Properties(),
+                           cc::LocalFrameId());
   ServerWindow* embedder_window =
       embedder_tree->GetWindowByClientId(embed_window_id);
   ASSERT_TRUE(embedder_tree->AddWindow(
       ClientWindowId(WindowIdToTransportId(embedder_root->id())),
       embed_window_id));
 
   TestWindowTreeClient* embedder_client = wm_client();
 
   {
     // Do a normal embed.
@@ skipping 35 matching lines @@
     ASSERT_EQ(1u, embedder_client->tracker()->changes()->size());
     EXPECT_EQ(CHANGE_TYPE_INPUT_EVENT,
               (*embedder_client->tracker()->changes())[0].type);
     WindowTreeTestApi(embedder_tree)
         .AckLastEvent(mojom::EventResult::UNHANDLED);
     embedder_client->tracker()->changes()->clear();
 
     // Embed another tree in the embedded tree.
     const ClientWindowId nested_embed_window_id(
         WindowIdToTransportId(WindowId(embed_tree->id(), 23)));
-    embed_tree->NewWindow(nested_embed_window_id, ServerWindow::Properties());
+    embed_tree->NewWindow(nested_embed_window_id, ServerWindow::Properties(),
+                          cc::LocalFrameId());
     const ClientWindowId embed_root_id(
         WindowIdToTransportId((*embed_tree->roots().begin())->id()));
     ASSERT_TRUE(embed_tree->AddWindow(embed_root_id, nested_embed_window_id));
 
     WindowTree* nested_embed_tree = nullptr;
     TestWindowTreeClient* nested_embed_client_proxy = nullptr;
     EmbedAt(embed_tree, nested_embed_window_id, embed_flags, &nested_embed_tree,
             &nested_embed_client_proxy);
     ASSERT_TRUE(nested_embed_client_proxy);
     embed_client_proxy->tracker()->changes()->clear();
@@ skipping 67 matching lines @@
   ASSERT_EQ(1u, tree->roots().size());
   ClientWindowId root_client_id;
   ASSERT_TRUE(tree->IsWindowKnown(*(tree->roots().begin()), &root_client_id));
   EXPECT_TRUE(tree->DeleteWindow(root_client_id));
   window_server->DestroyTree(tree);
 }
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui