Decouple FrameSink Hierarchy registration from SurfaceFactoryClient registration

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(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);
+    EXPECT_EQ(nullptr, source_);
   }
 
   BeginFrameSource* source() { return source_; }
   const FrameSinkId& frame_sink_id() { return frame_sink_id_; }
 
   void Register(SurfaceManager* manager) {
-    EXPECT_EQ(manager_, nullptr);
+    EXPECT_EQ(nullptr, manager_);
     manager_ = manager;
     manager_->RegisterSurfaceFactoryClient(frame_sink_id_, this);
   }
 
   void Unregister() {
     EXPECT_NE(manager_, nullptr);
     manager_->UnregisterSurfaceFactoryClient(frame_sink_id_);
     manager_ = nullptr;
   }
 
@@ skipping 29 matching lines @@
 
  protected:
   SurfaceManager manager_;
 };
 
 TEST_F(SurfaceManagerTest, SingleClients) {
   FakeSurfaceFactoryClient client(FrameSinkId(1, 1));
   FakeSurfaceFactoryClient other_client(FrameSinkId(2, 2));
   StubBeginFrameSource source;
 
-  EXPECT_EQ(client.source(), nullptr);
-  EXPECT_EQ(other_client.source(), nullptr);
+  EXPECT_EQ(nullptr, client.source());
+  EXPECT_EQ(nullptr, other_client.source());
   client.Register(&manager_);
   other_client.Register(&manager_);
-  EXPECT_EQ(client.source(), nullptr);
-  EXPECT_EQ(other_client.source(), nullptr);
+  EXPECT_EQ(nullptr, client.source());
+  EXPECT_EQ(nullptr, other_client.source());
 
   // Test setting unsetting BFS
   manager_.RegisterBeginFrameSource(&source, client.frame_sink_id());
-  EXPECT_EQ(client.source(), &source);
-  EXPECT_EQ(other_client.source(), nullptr);
+  EXPECT_EQ(&source, client.source());
+  EXPECT_EQ(nullptr, other_client.source());
   manager_.UnregisterBeginFrameSource(&source);
-  EXPECT_EQ(client.source(), nullptr);
-  EXPECT_EQ(other_client.source(), nullptr);
+  EXPECT_EQ(nullptr, client.source());
+  EXPECT_EQ(nullptr, other_client.source());
 
   // Set BFS for other namespace
   manager_.RegisterBeginFrameSource(&source, other_client.frame_sink_id());
-  EXPECT_EQ(other_client.source(), &source);
-  EXPECT_EQ(client.source(), nullptr);
+  EXPECT_EQ(&source, other_client.source());
+  EXPECT_EQ(nullptr, client.source());
   manager_.UnregisterBeginFrameSource(&source);
-  EXPECT_EQ(client.source(), nullptr);
-  EXPECT_EQ(other_client.source(), nullptr);
+  EXPECT_EQ(nullptr, client.source());
+  EXPECT_EQ(nullptr, other_client.source());
 
   // Re-set BFS for original
   manager_.RegisterBeginFrameSource(&source, client.frame_sink_id());
-  EXPECT_EQ(client.source(), &source);
+  EXPECT_EQ(&source, client.source());
   manager_.UnregisterBeginFrameSource(&source);
-  EXPECT_EQ(client.source(), nullptr);
+  EXPECT_EQ(nullptr, client.source());
 }
 
 TEST_F(SurfaceManagerTest, MultipleDisplays) {
   StubBeginFrameSource root1_source;
   StubBeginFrameSource root2_source;
 
   // root1 -> A -> B
   // root2 -> C
   FakeSurfaceFactoryClient root1(FrameSinkId(1, 1), &manager_);
   FakeSurfaceFactoryClient root2(FrameSinkId(2, 2), &manager_);
@@ skipping 30 matching lines @@
 
   // Detach A from root1.  A and B should now be updated to root2.
   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);
+  EXPECT_EQ(nullptr, root1.source());
+  EXPECT_NE(nullptr, root2.source());
 
   // 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);
+  EXPECT_EQ(nullptr, client_a.source());
+  EXPECT_EQ(nullptr, client_b.source());
+  EXPECT_EQ(nullptr, client_c.source());
+  EXPECT_EQ(nullptr, root2.source());
 
   // Cleanup hierarchy.
   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_(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);
+    EXPECT_FALSE(hierarchy_registered_);
+    EXPECT_FALSE(clients_registered_);
+    EXPECT_FALSE(bfs_registered_);
     AssertCorrectBFSState();
   }
 
   void RegisterHierarchy() {
     DCHECK(!hierarchy_registered_);
     hierarchy_registered_ = true;
     manager_.RegisterFrameSinkHierarchy(client_a_.frame_sink_id(),
                                         client_b_.frame_sink_id());
     manager_.RegisterFrameSinkHierarchy(client_b_.frame_sink_id(),
                                         client_c_.frame_sink_id());
@@ skipping 34 matching lines @@
     AssertCorrectBFSState();
   }
   void UnregisterBFS() {
     DCHECK(bfs_registered_);
     bfs_registered_ = false;
     manager_.UnregisterBeginFrameSource(&source_);
     AssertCorrectBFSState();
   }
 
   void AssertEmptyBFS() {
-    EXPECT_EQ(client_a_.source(), nullptr);
-    EXPECT_EQ(client_b_.source(), nullptr);
-    EXPECT_EQ(client_c_.source(), nullptr);
+    EXPECT_EQ(nullptr, client_a_.source());
+    EXPECT_EQ(nullptr, client_b_.source());
+    EXPECT_EQ(nullptr, client_c_.source());
   }
 
   void AssertAllValidBFS() {
-    EXPECT_EQ(client_a_.source(), &source_);
-    EXPECT_EQ(client_b_.source(), &source_);
-    EXPECT_EQ(client_c_.source(), &source_);
+    EXPECT_EQ(&source_, client_a_.source());
+    EXPECT_EQ(&source_, client_b_.source());
+    EXPECT_EQ(&source_, client_c_.source());
   }
 
  protected:
   void AssertCorrectBFSState() {
     if (!clients_registered_ || !bfs_registered_) {
       AssertEmptyBFS();
       return;
     }
     if (!hierarchy_registered_) {
       // A valid but not attached to anything.
-      EXPECT_EQ(client_a_.source(), &source_);
-      EXPECT_EQ(client_b_.source(), nullptr);
-      EXPECT_EQ(client_c_.source(), nullptr);
+      EXPECT_EQ(&source_, client_a_.source());
+      EXPECT_EQ(nullptr, client_b_.source());
+      EXPECT_EQ(nullptr, client_c_.source());
       return;
     }
 
     AssertAllValidBFS();
   }
 
   StubBeginFrameSource source_;
   // A -> B -> C hierarchy, with A always having the BFS.
   FakeSurfaceFactoryClient client_a_;
   FakeSurfaceFactoryClient client_b_;
@@ skipping 74 matching lines @@
 }
 
 INSTANTIATE_TEST_CASE_P(
     SurfaceManagerOrderingParamTestInstantiation,
     SurfaceManagerOrderingParamTest,
     ::testing::Combine(::testing::ValuesIn(kRegisterOrderList),
                        ::testing::ValuesIn(kUnregisterOrderList),
                        ::testing::ValuesIn(kBFSOrderList)));
 
 }  // namespace cc