Replace usage of SurfaceId's client_id with FrameSinkId

cc/surfaces/surface_manager_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 <stddef.h>
 
 #include "cc/scheduler/begin_frame_source.h"
 #include "cc/surfaces/surface_factory_client.h"
 #include "cc/surfaces/surface_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {
 
 class FakeSurfaceFactoryClient : public SurfaceFactoryClient {
  public:
-  explicit FakeSurfaceFactoryClient(int id_namespace)
-      : source_(nullptr), manager_(nullptr), id_namespace_(id_namespace) {}
-  FakeSurfaceFactoryClient(int id_namespace, SurfaceManager* manager)
-      : source_(nullptr), manager_(nullptr), id_namespace_(id_namespace) {
+  explicit FakeSurfaceFactoryClient(const FrameSinkId& frame_sink_id)
+      : source_(nullptr), manager_(nullptr), frame_sink_id_(frame_sink_id) {}
+
+  FakeSurfaceFactoryClient(const FrameSinkId& frame_sink_id,
+                           SurfaceManager* manager)
+      : source_(nullptr), manager_(nullptr), frame_sink_id_(frame_sink_id) {
     DCHECK(manager);
     Register(manager);
   }
 
   ~FakeSurfaceFactoryClient() override {
     if (manager_) {
       Unregister();
     }
     EXPECT_EQ(source_, nullptr);
   }
 
   BeginFrameSource* source() { return source_; }
-  uint32_t id_namespace() { return id_namespace_; }
+  const FrameSinkId& frame_sink_id() { return frame_sink_id_; }
 
   void Register(SurfaceManager* manager) {
     EXPECT_EQ(manager_, nullptr);
     manager_ = manager;
-    manager_->RegisterSurfaceFactoryClient(id_namespace_, this);
+    manager_->RegisterSurfaceFactoryClient(frame_sink_id_, this);
   }
 
   void Unregister() {
     EXPECT_NE(manager_, nullptr);
-    manager_->UnregisterSurfaceFactoryClient(id_namespace_);
+    manager_->UnregisterSurfaceFactoryClient(frame_sink_id_);
     manager_ = nullptr;
   }
 
   // SurfaceFactoryClient implementation.
   void ReturnResources(const ReturnedResourceArray& resources) override {}
   void SetBeginFrameSource(BeginFrameSource* begin_frame_source) override {
     DCHECK(!source_ || !begin_frame_source);
     source_ = begin_frame_source;
   };
 
  private:
   BeginFrameSource* source_;
   SurfaceManager* manager_;
-  uint32_t id_namespace_;
+  FrameSinkId frame_sink_id_;
 };
 
 class SurfaceManagerTest : public testing::Test {
  public:
   // These tests don't care about namespace registration, so just preregister
   // a set of namespaces that tests can use freely without worrying if they're
   // valid or not.
-  enum { MAX_NAMESPACE = 10 };
+  enum { MAX_FRAME_SINK = 10 };
 
   SurfaceManagerTest() {
-    for (size_t i = 0; i < MAX_NAMESPACE; ++i)
-      manager_.RegisterSurfaceClientId(i);
+    for (size_t i = 0; i < MAX_FRAME_SINK; ++i)
+      manager_.RegisterFrameSinkId(FrameSinkId(i, i));
   }
 
   ~SurfaceManagerTest() override {
-    for (size_t i = 0; i < MAX_NAMESPACE; ++i)
-      manager_.InvalidateSurfaceClientId(i);
+    for (size_t i = 0; i < MAX_FRAME_SINK; ++i)
+      manager_.InvalidateFrameSinkId(FrameSinkId(i, i));
   }
 
  protected:
   SurfaceManager manager_;
 };
 
 TEST_F(SurfaceManagerTest, SingleClients) {
-  FakeSurfaceFactoryClient client(1);
-  FakeSurfaceFactoryClient other_client(2);
+  FakeSurfaceFactoryClient client(FrameSinkId(1, 1));
+  FakeSurfaceFactoryClient other_client(FrameSinkId(2, 2));
   StubBeginFrameSource source;
 
   EXPECT_EQ(client.source(), nullptr);
   EXPECT_EQ(other_client.source(), nullptr);
   client.Register(&manager_);
   other_client.Register(&manager_);
   EXPECT_EQ(client.source(), nullptr);
   EXPECT_EQ(other_client.source(), nullptr);
 
   // Test setting unsetting BFS
-  manager_.RegisterBeginFrameSource(&source, client.id_namespace());
+  manager_.RegisterBeginFrameSource(&source, client.frame_sink_id());
   EXPECT_EQ(client.source(), &source);
   EXPECT_EQ(other_client.source(), nullptr);
   manager_.UnregisterBeginFrameSource(&source);
   EXPECT_EQ(client.source(), nullptr);
   EXPECT_EQ(other_client.source(), nullptr);
 
   // Set BFS for other namespace
-  manager_.RegisterBeginFrameSource(&source, other_client.id_namespace());
+  manager_.RegisterBeginFrameSource(&source, other_client.frame_sink_id());
   EXPECT_EQ(other_client.source(), &source);
   EXPECT_EQ(client.source(), nullptr);
   manager_.UnregisterBeginFrameSource(&source);
   EXPECT_EQ(client.source(), nullptr);
   EXPECT_EQ(other_client.source(), nullptr);
 
   // Re-set BFS for original
-  manager_.RegisterBeginFrameSource(&source, client.id_namespace());
+  manager_.RegisterBeginFrameSource(&source, client.frame_sink_id());
   EXPECT_EQ(client.source(), &source);
   manager_.UnregisterBeginFrameSource(&source);
   EXPECT_EQ(client.source(), nullptr);
 }
 
 TEST_F(SurfaceManagerTest, MultipleDisplays) {
   StubBeginFrameSource root1_source;
   StubBeginFrameSource root2_source;
 
   // root1 -> A -> B
   // root2 -> C
-  FakeSurfaceFactoryClient root1(1, &manager_);
-  FakeSurfaceFactoryClient root2(2, &manager_);
-  FakeSurfaceFactoryClient client_a(3, &manager_);
-  FakeSurfaceFactoryClient client_b(4, &manager_);
-  FakeSurfaceFactoryClient client_c(5, &manager_);
+  FakeSurfaceFactoryClient root1(FrameSinkId(1, 1), &manager_);
+  FakeSurfaceFactoryClient root2(FrameSinkId(2, 2), &manager_);
+  FakeSurfaceFactoryClient client_a(FrameSinkId(3, 3), &manager_);
+  FakeSurfaceFactoryClient client_b(FrameSinkId(4, 4), &manager_);
+  FakeSurfaceFactoryClient client_c(FrameSinkId(5, 5), &manager_);
 
-  manager_.RegisterBeginFrameSource(&root1_source, root1.id_namespace());
-  manager_.RegisterBeginFrameSource(&root2_source, root2.id_namespace());
+  manager_.RegisterBeginFrameSource(&root1_source, root1.frame_sink_id());
+  manager_.RegisterBeginFrameSource(&root2_source, root2.frame_sink_id());
   EXPECT_EQ(root1.source(), &root1_source);
   EXPECT_EQ(root2.source(), &root2_source);
 
   // Set up initial hierarchy.
-  manager_.RegisterSurfaceNamespaceHierarchy(root1.id_namespace(),
-                                             client_a.id_namespace());
+  manager_.RegisterFrameSinkHierarchy(root1.frame_sink_id(),
+                                      client_a.frame_sink_id());
   EXPECT_EQ(client_a.source(), root1.source());
-  manager_.RegisterSurfaceNamespaceHierarchy(client_a.id_namespace(),
-                                             client_b.id_namespace());
+  manager_.RegisterFrameSinkHierarchy(client_a.frame_sink_id(),
+                                      client_b.frame_sink_id());
   EXPECT_EQ(client_b.source(), root1.source());
-  manager_.RegisterSurfaceNamespaceHierarchy(root2.id_namespace(),
-                                             client_c.id_namespace());
+  manager_.RegisterFrameSinkHierarchy(root2.frame_sink_id(),
+                                      client_c.frame_sink_id());
   EXPECT_EQ(client_c.source(), root2.source());
 
   // Attach A into root2's subtree, like a window moving across displays.
   // root1 -> A -> B
   // root2 -> C -> A -> B
-  manager_.RegisterSurfaceNamespaceHierarchy(client_c.id_namespace(),
-                                             client_a.id_namespace());
+  manager_.RegisterFrameSinkHierarchy(client_c.frame_sink_id(),
+                                      client_a.frame_sink_id());
   // With the heuristic of just keeping existing BFS in the face of multiple,
   // no client sources should change.
   EXPECT_EQ(client_a.source(), root1.source());
   EXPECT_EQ(client_b.source(), root1.source());
   EXPECT_EQ(client_c.source(), root2.source());
 
   // Detach A from root1.  A and B should now be updated to root2.
-  manager_.UnregisterSurfaceNamespaceHierarchy(root1.id_namespace(),
-                                               client_a.id_namespace());
+  manager_.UnregisterFrameSinkHierarchy(root1.frame_sink_id(),
+                                        client_a.frame_sink_id());
   EXPECT_EQ(client_a.source(), root2.source());
   EXPECT_EQ(client_b.source(), root2.source());
   EXPECT_EQ(client_c.source(), root2.source());
 
   // Detach root1 from BFS.  root1 should now have no source.
   manager_.UnregisterBeginFrameSource(&root1_source);
   EXPECT_EQ(root1.source(), nullptr);
   EXPECT_NE(root2.source(), nullptr);
 
   // Detatch root2 from BFS.
   manager_.UnregisterBeginFrameSource(&root2_source);
   EXPECT_EQ(client_a.source(), nullptr);
   EXPECT_EQ(client_b.source(), nullptr);
   EXPECT_EQ(client_c.source(), nullptr);
   EXPECT_EQ(root2.source(), nullptr);
 
   // Cleanup hierarchy.
-  manager_.UnregisterSurfaceNamespaceHierarchy(root2.id_namespace(),
-                                               client_c.id_namespace());
-  manager_.UnregisterSurfaceNamespaceHierarchy(client_c.id_namespace(),
-                                               client_a.id_namespace());
-  manager_.UnregisterSurfaceNamespaceHierarchy(client_a.id_namespace(),
-                                               client_b.id_namespace());
+  manager_.UnregisterFrameSinkHierarchy(root2.frame_sink_id(),
+                                        client_c.frame_sink_id());
+  manager_.UnregisterFrameSinkHierarchy(client_c.frame_sink_id(),
+                                        client_a.frame_sink_id());
+  manager_.UnregisterFrameSinkHierarchy(client_a.frame_sink_id(),
+                                        client_b.frame_sink_id());
 }
 
 // In practice, registering and unregistering both parent/child relationships
 // and SurfaceFactoryClients can happen in any ordering with respect to
 // each other.  These following tests verify that all the data structures
 // are properly set up and cleaned up under the four permutations of orderings
 // of this nesting.
 
 class SurfaceManagerOrderingTest : public SurfaceManagerTest {
  public:
   SurfaceManagerOrderingTest()
-      : client_a_(1),
-        client_b_(2),
-        client_c_(3),
+      : client_a_(FrameSinkId(1, 1)),
+        client_b_(FrameSinkId(2, 2)),
+        client_c_(FrameSinkId(3, 3)),
         hierarchy_registered_(false),
         clients_registered_(false),
         bfs_registered_(false) {
     AssertCorrectBFSState();
   }
 
   ~SurfaceManagerOrderingTest() override {
     EXPECT_EQ(hierarchy_registered_, false);
     EXPECT_EQ(clients_registered_, false);
     EXPECT_EQ(bfs_registered_, false);
     AssertCorrectBFSState();
   }
 
   void RegisterHierarchy() {
     DCHECK(!hierarchy_registered_);
     hierarchy_registered_ = true;
-    manager_.RegisterSurfaceNamespaceHierarchy(client_a_.id_namespace(),
-                                               client_b_.id_namespace());
-    manager_.RegisterSurfaceNamespaceHierarchy(client_b_.id_namespace(),
-                                               client_c_.id_namespace());
+    manager_.RegisterFrameSinkHierarchy(client_a_.frame_sink_id(),
+                                        client_b_.frame_sink_id());
+    manager_.RegisterFrameSinkHierarchy(client_b_.frame_sink_id(),
+                                        client_c_.frame_sink_id());
     AssertCorrectBFSState();
   }
   void UnregisterHierarchy() {
     DCHECK(hierarchy_registered_);
     hierarchy_registered_ = false;
-    manager_.UnregisterSurfaceNamespaceHierarchy(client_a_.id_namespace(),
-                                                 client_b_.id_namespace());
-    manager_.UnregisterSurfaceNamespaceHierarchy(client_b_.id_namespace(),
-                                                 client_c_.id_namespace());
+    manager_.UnregisterFrameSinkHierarchy(client_a_.frame_sink_id(),
+                                          client_b_.frame_sink_id());
+    manager_.UnregisterFrameSinkHierarchy(client_b_.frame_sink_id(),
+                                          client_c_.frame_sink_id());
     AssertCorrectBFSState();
   }
 
   void RegisterClients() {
     DCHECK(!clients_registered_);
     clients_registered_ = true;
     client_a_.Register(&manager_);
     client_b_.Register(&manager_);
     client_c_.Register(&manager_);
     AssertCorrectBFSState();
   }
 
   void UnregisterClients() {
     DCHECK(clients_registered_);
     clients_registered_ = false;
     client_a_.Unregister();
     client_b_.Unregister();
     client_c_.Unregister();
     AssertCorrectBFSState();
   }
 
   void RegisterBFS() {
     DCHECK(!bfs_registered_);
     bfs_registered_ = true;
-    manager_.RegisterBeginFrameSource(&source_, client_a_.id_namespace());
+    manager_.RegisterBeginFrameSource(&source_, client_a_.frame_sink_id());
     AssertCorrectBFSState();
   }
   void UnregisterBFS() {
     DCHECK(bfs_registered_);
     bfs_registered_ = false;
     manager_.UnregisterBeginFrameSource(&source_);
     AssertCorrectBFSState();
   }
 
   void AssertEmptyBFS() {
@@ skipping 106 matching lines @@
 }
 
 INSTANTIATE_TEST_CASE_P(
     SurfaceManagerOrderingParamTestInstantiation,
     SurfaceManagerOrderingParamTest,
     ::testing::Combine(::testing::ValuesIn(kRegisterOrderList),
                        ::testing::ValuesIn(kUnregisterOrderList),
                        ::testing::ValuesIn(kBFSOrderList)));
 
 }  // namespace cc