Move VISUAL_STATE promise to activation

content/renderer/gpu/queue_message_swap_promise.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 "content/renderer/gpu/queue_message_swap_promise.h"
 
-#include "content/renderer/gpu/frame_swap_message_queue.h"
+#include "content/renderer/gpu/frame_update_message_queue.h"
+#include "ipc/ipc_message.h"
 #include "ipc/ipc_sync_message_filter.h"
 
 namespace content {
 
 QueueMessageSwapPromise::QueueMessageSwapPromise(
     scoped_refptr<IPC::SyncMessageFilter> message_sender,
-    scoped_refptr<content::FrameSwapMessageQueue> message_queue,
+    scoped_refptr<content::FrameUpdateMessageQueue> message_queue,
     int source_frame_number)
-    : message_sender_(message_sender),
-      message_queue_(message_queue),
-      source_frame_number_(source_frame_number)
-#if DCHECK_IS_ON()
-      ,
-      completed_(false)
-#endif
-{
-  DCHECK(message_sender_.get());
-  DCHECK(message_queue_.get());
+    : QueueMessagePromise(message_sender, message_queue, source_frame_number) {
 }
 
 QueueMessageSwapPromise::~QueueMessageSwapPromise() {
   // The promise should have either been kept or broken before it's deleted.
 #if DCHECK_IS_ON()
   DCHECK(completed_);
 #endif
 }
 
 void QueueMessageSwapPromise::DidSwap(cc::CompositorFrameMetadata* metadata) {
 #if DCHECK_IS_ON()
   DCHECK(!completed_);
 #endif
   message_queue_->DidSwap(source_frame_number_);
   // The OutputSurface will take care of the Drain+Send.
   PromiseCompleted();
 }
 
-void QueueMessageSwapPromise::DidNotSwap(DidNotSwapReason reason) {
+void QueueMessageSwapPromise::DidNotSwap(DidNotSwap::Reason reason) {
 #if DCHECK_IS_ON()
   DCHECK(!completed_);
 #endif
   ScopedVector<IPC::Message> messages;
   message_queue_->DidNotSwap(source_frame_number_, reason, &messages);
-  for (ScopedVector<IPC::Message>::iterator i = messages.begin();
-       i != messages.end();
-       ++i) {
-    message_sender_->Send(*i);
-  }
-  messages.weak_clear();
+  DeliverMessages(&messages);
   PromiseCompleted();
 }
 
-void QueueMessageSwapPromise::PromiseCompleted() {
-#if DCHECK_IS_ON()
-  completed_ = true;
-#endif
-}
-
 int64 QueueMessageSwapPromise::TraceId() const {
   return 0;
 }
 
 }  // namespace content