Splitting DidSwap in cc::SwapPromise into WillSwap and DidSwap

cc/trees/layer_tree_impl_unittest.cc

 // Copyright 2014 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 "cc/trees/layer_tree_impl.h"
 
 #include "base/macros.h"
 #include "cc/layers/heads_up_display_layer_impl.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
 #include "cc/test/geometry_test_utils.h"
@@ skipping 2295 matching lines @@
 namespace {
 
 class PersistentSwapPromise
     : public SwapPromise,
       public base::SupportsWeakPtr<PersistentSwapPromise> {
  public:
   PersistentSwapPromise() = default;
   ~PersistentSwapPromise() override = default;
 
   void DidActivate() override {}
-  MOCK_METHOD1(DidSwap, void(CompositorFrameMetadata* metadata));
+  MOCK_METHOD1(WillSwap, void(CompositorFrameMetadata* metadata));
+  MOCK_METHOD0(DidSwap, void());
 
   DidNotSwapAction DidNotSwap(DidNotSwapReason reason) override {
     return DidNotSwapAction::KEEP_ACTIVE;
   }
 
   void OnCommit() override {}
   int64_t TraceId() const override { return 0; }
 };
 
 class NotPersistentSwapPromise
     : public SwapPromise,
       public base::SupportsWeakPtr<NotPersistentSwapPromise> {
  public:
   NotPersistentSwapPromise() = default;
   ~NotPersistentSwapPromise() override = default;
 
   void DidActivate() override {}
-  void DidSwap(CompositorFrameMetadata* metadata) override {}
+  void WillSwap(CompositorFrameMetadata* metadata) override {}
+  void DidSwap() override {}
 
   DidNotSwapAction DidNotSwap(DidNotSwapReason reason) override {
     return DidNotSwapAction::BREAK_PROMISE;
   }
 
   void OnCommit() override {}
   int64_t TraceId() const override { return 0; }
 };
 
 }  // namespace
@@ skipping 16 matching lines @@
 
   std::vector<std::unique_ptr<SwapPromise>> promises;
   host_impl().active_tree()->PassSwapPromises(std::move(promises));
   host_impl().active_tree()->BreakSwapPromises(
       SwapPromise::DidNotSwapReason::SWAP_FAILS);
 
   ASSERT_EQ(promises_count, persistent_promises.size());
   for (size_t i = 0; i < persistent_promises.size(); ++i) {
     SCOPED_TRACE(testing::Message() << "While checking case #" << i);
     ASSERT_TRUE(persistent_promises[i]);
-    EXPECT_CALL(*persistent_promises[i], DidSwap(testing::_));
+    EXPECT_CALL(*persistent_promises[i], WillSwap(testing::_));
   }
   host_impl().active_tree()->FinishSwapPromises(nullptr);
 }
 
 TEST_F(LayerTreeImplTest, NotPersistentSwapPromisesAreDroppedWhenSwapFails) {
   const size_t promises_count = 2;
 
   std::vector<base::WeakPtr<NotPersistentSwapPromise>> not_persistent_promises;
   std::vector<std::unique_ptr<NotPersistentSwapPromise>>
       not_persistent_promises_to_pass;
@@ skipping 22 matching lines @@
     auto weak_promise = promise->AsWeakPtr();
     host_impl().active_tree()->QueueSwapPromise(std::move(promise));
     host_impl().active_tree()->BreakSwapPromises(
         SwapPromise::DidNotSwapReason::SWAP_FAILS);
     EXPECT_FALSE(weak_promise);
   }
 }
 
 }  // namespace
 }  // namespace cc