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

content/renderer/gpu/renderer_compositor_frame_sink.h

 // Copyright (c) 2012 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_RENDERER_COMPOSITOR_FRAME_SINK_H_
 #define CONTENT_RENDERER_GPU_RENDERER_COMPOSITOR_FRAME_SINK_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 23 matching lines @@
 namespace IPC {
 class Message;
 }
 
 namespace cc {
 class CompositorFrame;
 class ContextProvider;
 }
 
 namespace content {
-class FrameSwapMessageQueue;
 
 // This class can be created only on the main thread, but then becomes pinned
 // to a fixed thread when BindToClient is called.
 class RendererCompositorFrameSink
     : NON_EXPORTED_BASE(public viz::ClientCompositorFrameSink) {
  public:
   RendererCompositorFrameSink(
       int32_t routing_id,
       std::unique_ptr<cc::SyntheticBeginFrameSource>
           synthetic_begin_frame_source,
       scoped_refptr<cc::ContextProvider> context_provider,
       scoped_refptr<cc::ContextProvider> worker_context_provider,
       gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
       cc::SharedBitmapManager* shared_bitmap_manager,
       cc::mojom::MojoCompositorFrameSinkPtrInfo sink_info,
-      cc::mojom::MojoCompositorFrameSinkClientRequest sink_client_request,
-      scoped_refptr<FrameSwapMessageQueue> swap_frame_message_queue);
+      cc::mojom::MojoCompositorFrameSinkClientRequest sink_client_request);
   RendererCompositorFrameSink(
       int32_t routing_id,
       std::unique_ptr<cc::SyntheticBeginFrameSource>
           synthetic_begin_frame_source,
       scoped_refptr<cc::VulkanContextProvider> vulkan_context_provider,
       cc::mojom::MojoCompositorFrameSinkPtrInfo sink_info,
-      cc::mojom::MojoCompositorFrameSinkClientRequest sink_client_request,
-      scoped_refptr<FrameSwapMessageQueue> swap_frame_message_queue);
+      cc::mojom::MojoCompositorFrameSinkClientRequest sink_client_request);
   ~RendererCompositorFrameSink() override;
 
   // Overriden from viz::ClientCompositorFrameSink.
   bool BindToClient(cc::CompositorFrameSinkClient* client) override;
   void DetachFromClient() override;
   void SubmitCompositorFrame(cc::CompositorFrame frame) override;
   bool ShouldAllocateNewLocalSurfaceId(
       const cc::CompositorFrame& frame) override;
 
  private:
@@ skipping 18 matching lines @@
   };
 
   void OnMessageReceived(const IPC::Message& message) {}
 
   scoped_refptr<CompositorForwardingMessageFilter>
       compositor_frame_sink_filter_;
   CompositorForwardingMessageFilter::Handler
       compositor_frame_sink_filter_handler_;
   scoped_refptr<RendererCompositorFrameSinkProxy> compositor_frame_sink_proxy_;
   scoped_refptr<IPC::SyncMessageFilter> message_sender_;
-  scoped_refptr<FrameSwapMessageQueue> frame_swap_message_queue_;
   int routing_id_;
 
   RenderWidgetSurfaceProperties current_surface_properties_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_GPU_RENDERER_COMPOSITOR_FRAME_SINK_H_