Move VISUAL_STATE promise to activation

cc/trees/single_thread_proxy.cc

 // Copyright 2011 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/single_thread_proxy.h"
 
 #include "base/auto_reset.h"
 #include "base/profiler/scoped_tracker.h"
 #include "base/trace_event/trace_event.h"
 #include "cc/debug/benchmark_instrumentation.h"
@@ skipping 596 matching lines @@
     DebugScopedSetImplThread impl(this);
     WillBeginImplFrame(begin_frame_args);
   }
 
   // Run the "main thread" and get it to commit.
   {
     DCHECK(inside_impl_frame_);
     DoBeginMainFrame(begin_frame_args);
     DoCommit();
 
-    DCHECK_EQ(0u, layer_tree_host_->num_queued_swap_promises())
+    DCHECK_EQ(0u, layer_tree_host_->num_queued_promises())
         << "Commit should always succeed and transfer promises.";
   }
 
   // Finish the impl frame.
   {
     DebugScopedSetImplThread impl(this);
     if (layer_tree_host_impl_->settings().impl_side_painting) {
       layer_tree_host_impl_->ActivateSyncTree();
       DCHECK(!layer_tree_host_impl_->active_tree()
                   ->needs_update_draw_properties());
       layer_tree_host_impl_->PrepareTiles();
       layer_tree_host_impl_->SynchronouslyInitializeAllTiles();
     }
 
     DoAnimate();
 
     LayerTreeHostImpl::FrameData frame;
     DoComposite(&frame);
 
     // DoComposite could abort, but because this is a synchronous composite
     // another draw will never be scheduled, so break remaining promises.
     layer_tree_host_impl_->active_tree()->BreakSwapPromises(
-        SwapPromise::SWAP_FAILS);
+        Promise::DidNotSwap::SWAP_FAILS);
 
     DidBeginImplFrameDeadline();
   }
 }
 
 void SingleThreadProxy::ForceSerializeOnSwapBuffers() {
   {
     DebugScopedSetImplThread impl(this);
     if (layer_tree_host_impl_->renderer()) {
       DCHECK(!layer_tree_host_->output_surface_lost());
@@ skipping 332 matching lines @@
   DCHECK(inside_impl_frame_)
       << "DidBeginImplFrameDeadline called while not inside an impl frame!";
   inside_impl_frame_ = false;
 }
 
 void SingleThreadProxy::SendBeginFramesToChildren(const BeginFrameArgs& args) {
   layer_tree_host_->SendBeginFramesToChildren(args);
 }
 
 }  // namespace cc