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

content/renderer/gpu/frame_swap_message_queue.h

 // 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.
 
 #ifndef CONTENT_RENDERER_GPU_FRAME_SWAP_MESSAGE_QUEUE_H_
 #define CONTENT_RENDERER_GPU_FRAME_SWAP_MESSAGE_QUEUE_H_
 
 #include <map>
 #include <memory>
 #include <vector>
 
 #include "base/auto_reset.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
+#include "base/threading/thread_checker.h"
 #include "cc/output/swap_promise.h"
 #include "content/common/content_export.h"
 #include "content/renderer/message_delivery_policy.h"
 
 namespace IPC {
 class Message;
 };
 
 namespace content {
 
 class FrameSwapMessageSubQueue;
 
 // Queue used to keep track of which IPC::Messages should be sent after a
 // particular compositor frame swap. The messages are guaranteed to be processed
 // after the frame is processed, but there is no guarantee that nothing else
 // happens between processing the frame and processing the messages.
 class CONTENT_EXPORT FrameSwapMessageQueue
     : public base::RefCountedThreadSafe<FrameSwapMessageQueue> {
  public:
   class CONTENT_EXPORT SendMessageScope {
    public:
     virtual ~SendMessageScope() {}
   };
 
-  FrameSwapMessageQueue();
+  explicit FrameSwapMessageQueue(int32_t routing_id);
 
   // Queues message to be returned on a matching DrainMessages call.
   //
   // |policy| determines how messages are matched with DrainMessages calls.
   // |source_frame_number| frame number to queue |msg| for.
   // |msg| - message to queue. The method takes ownership of |msg|.
   // |is_first| - output parameter. Set to true if this was the first message
   //              enqueued for the given source_frame_number.
   void QueueMessageForFrame(MessageDeliveryPolicy policy,
                             int source_frame_number,
@@ skipping 40 matching lines @@
   // Returns an object that must be kept in scope till an IPC message containing
   // |messages| is sent.
   std::unique_ptr<SendMessageScope> AcquireSendMessageScope();
 
   static void TransferMessages(
       std::vector<std::unique_ptr<IPC::Message>>* source,
       std::vector<IPC::Message>* dest);
 
   uint32_t AllocateFrameToken();
 
+  int32_t routing_id() const { return routing_id_; }
+
+  void NotifyFramesAreDiscarded(bool frames_are_discarded);
+  bool AreFramesDiscarded();
+
  private:
   friend class base::RefCountedThreadSafe<FrameSwapMessageQueue>;
 
   FrameSwapMessageSubQueue* GetSubQueue(MessageDeliveryPolicy policy);
 
   ~FrameSwapMessageQueue();
 
   mutable base::Lock lock_;
   std::unique_ptr<FrameSwapMessageSubQueue> visual_state_queue_;
   std::unique_ptr<FrameSwapMessageSubQueue> swap_queue_;
   std::vector<std::unique_ptr<IPC::Message>> next_drain_messages_;
   uint32_t last_used_frame_token_ = 0;
+  int32_t routing_id_ = 0;
+  bool frames_are_discarded_ = false;
+  THREAD_CHECKER(impl_thread_checker_);
 
   DISALLOW_COPY_AND_ASSIGN(FrameSwapMessageQueue);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_GPU_FRAME_SWAP_MESSAGE_QUEUE_H_