Send FrameSwapMessageQueue's messages in QueueMessageSwapPromise

content/renderer/gpu/renderer_compositor_frame_sink.cc

 // 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.
 
 #include "content/renderer/gpu/renderer_compositor_frame_sink.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/location.h"
@@ skipping 122 matching lines @@
   DCHECK_LE(cc::BeginFrameArgs::kStartingFrameNumber,
             frame.metadata.begin_frame_ack.sequence_number);
   auto new_surface_properties =
       RenderWidgetSurfaceProperties::FromCompositorFrame(frame);
   if (!local_surface_id_.is_valid() ||
       new_surface_properties != current_surface_properties_) {
     local_surface_id_ = id_allocator_.GenerateId();
     current_surface_properties_ = new_surface_properties;
   }
 
-  {
-    std::unique_ptr<FrameSwapMessageQueue::SendMessageScope>
-        send_message_scope =
-            frame_swap_message_queue_->AcquireSendMessageScope();
-    std::vector<std::unique_ptr<IPC::Message>> messages;
-    frame_swap_message_queue_->DrainMessages(&messages);
-    std::vector<IPC::Message> messages_to_send;
-    FrameSwapMessageQueue::TransferMessages(&messages, &messages_to_send);
-    uint32_t frame_token = 0;
-    if (!messages_to_send.empty())
-      frame_token = frame_swap_message_queue_->AllocateFrameToken();
-    frame.metadata.frame_token = frame_token;
-    sink_->SubmitCompositorFrame(local_surface_id_, std::move(frame));
-    if (frame_token) {
-      message_sender_->Send(new ViewHostMsg_FrameSwapMessages(
-          routing_id_, frame_token, messages_to_send));
-    }
-    // ~send_message_scope.
-  }
+  sink_->SubmitCompositorFrame(local_surface_id_, std::move(frame));
 }
 
 void RendererCompositorFrameSink::DidNotProduceFrame(
     const cc::BeginFrameAck& ack) {
   DCHECK(!ack.has_damage);
   DCHECK_LE(cc::BeginFrameArgs::kStartingFrameNumber, ack.sequence_number);
   sink_->DidNotProduceFrame(ack);
 }
 
 void RendererCompositorFrameSink::OnMessageReceived(
@@ skipping 24 matching lines @@
 void RendererCompositorFrameSink::ReclaimResources(
     const cc::ReturnedResourceArray& resources) {
   client_->ReclaimResources(resources);
 }
 
 void RendererCompositorFrameSink::OnNeedsBeginFrames(bool needs_begin_frames) {
   sink_->SetNeedsBeginFrame(needs_begin_frames);
 }
 
 }  // namespace content