Reland "Send FrameSwapMessageQueue's messages in QueueMessageSwapPromise" with fixes

content/renderer/gpu/frame_swap_message_queue.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/frame_swap_message_queue.h"
 
 #include <algorithm>
 #include <limits>
 #include <memory>
 #include <utility>
@@ skipping 94 matching lines @@
   }
 
  private:
   std::vector<std::unique_ptr<IPC::Message>> queue_;
 
   DISALLOW_COPY_AND_ASSIGN(SwapQueue);
 };
 
 }  // namespace
 
-FrameSwapMessageQueue::FrameSwapMessageQueue()
+FrameSwapMessageQueue::FrameSwapMessageQueue(int32_t routing_id)
     : visual_state_queue_(new VisualStateQueue()),
-      swap_queue_(new SwapQueue()) {
+      swap_queue_(new SwapQueue()),
+      routing_id_(routing_id) {
+  DETACH_FROM_THREAD(impl_thread_checker_);
 }
 
 FrameSwapMessageQueue::~FrameSwapMessageQueue() {
 }
 
 bool FrameSwapMessageQueue::Empty() const {
   base::AutoLock lock(lock_);
   return next_drain_messages_.empty() && visual_state_queue_->Empty() &&
          swap_queue_->Empty();
 }
@@ skipping 75 matching lines @@
   for (const auto& msg : *source) {
     dest->push_back(*msg.get());
   }
   source->clear();
 }
 
 uint32_t FrameSwapMessageQueue::AllocateFrameToken() {
   return ++last_used_frame_token_;
 }
 
+void FrameSwapMessageQueue::NotifyFramesAreDiscarded(
+    bool frames_are_discarded) {
+  DCHECK_CALLED_ON_VALID_THREAD(impl_thread_checker_);
+  frames_are_discarded_ = frames_are_discarded;
+}
+
+bool FrameSwapMessageQueue::AreFramesDiscarded() {
+  DCHECK_CALLED_ON_VALID_THREAD(impl_thread_checker_);
+  return frames_are_discarded_;
+}
+
 }  // namespace content