RendererCompositorFrameSink should handle local surface id allocation

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 91 matching lines @@
   begin_frame_source_ = nullptr;
   compositor_frame_sink_proxy_->ClearCompositorFrameSink();
   compositor_frame_sink_filter_->RemoveHandlerOnCompositorThread(
       routing_id_, compositor_frame_sink_filter_handler_);
 
   cc::CompositorFrameSink::DetachFromClient();
 }
 
 void RendererCompositorFrameSink::SubmitCompositorFrame(
     cc::CompositorFrame frame) {
+  float device_scale_factor = frame.metadata.device_scale_factor;
+  cc::RenderPass* root_pass = frame.render_pass_list.back().get();
+  gfx::Size frame_size = root_pass->output_rect.size();
+
+  if (!local_surface_id_.is_valid() || frame_size != last_frame_size_ ||

[Fady Samuel, 2017/03/15 12:05:48]

As discussed offline you need all the conditions checked by
DelegatedFrameHostAndroid but most only apply to Android so maybe you can put
them behind an #ifdef. Maybe a helper method would be useful here.

[Saman Sami, 2017/03/16 18:33:07]

Done.

+      device_scale_factor != last_device_scale_factor_)
+    local_surface_id_ = id_allocator_.GenerateId();
+
+  last_frame_size_ = frame_size;
+  last_device_scale_factor_ = device_scale_factor;
+
   {
     std::unique_ptr<FrameSwapMessageQueue::SendMessageScope>
         send_message_scope =
             frame_swap_message_queue_->AcquireSendMessageScope();
     std::vector<std::unique_ptr<IPC::Message>> messages;
     std::vector<IPC::Message> messages_to_deliver_with_frame;
     frame_swap_message_queue_->DrainMessages(&messages);
     FrameSwapMessageQueue::TransferMessages(&messages,
                                             &messages_to_deliver_with_frame);
-    Send(new ViewHostMsg_SwapCompositorFrame(routing_id_,
-                                             compositor_frame_sink_id_, frame,
-                                             messages_to_deliver_with_frame));
+    Send(new ViewHostMsg_SwapCompositorFrame(
+        routing_id_, compositor_frame_sink_id_, local_surface_id_, frame,
+        messages_to_deliver_with_frame));
     // ~send_message_scope.
   }
 }
 
 void RendererCompositorFrameSink::OnMessageReceived(
     const IPC::Message& message) {
   DCHECK(thread_checker_.CalledOnValidThread());
   IPC_BEGIN_MESSAGE_MAP(RendererCompositorFrameSink, message)
     IPC_MESSAGE_HANDLER(ViewMsg_ReclaimCompositorResources,
                         OnReclaimCompositorResources);
@@ skipping 11 matching lines @@
   client_->ReclaimResources(resources);
   if (is_swap_ack)
     client_->DidReceiveCompositorFrameAck();
 }
 
 bool RendererCompositorFrameSink::Send(IPC::Message* message) {
   return message_sender_->Send(message);
 }
 
 }  // namespace content