RendererCompositorFrameSink should handle local surface id allocation

ui/android/delegated_frame_host_android.cc

 // Copyright 2016 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 "ui/android/delegated_frame_host_android.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "cc/layers/solid_color_layer.h"
 #include "cc/layers/surface_layer.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/copy_output_result.h"
-#include "cc/surfaces/local_surface_id_allocator.h"
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_id.h"
 #include "cc/surfaces/surface_manager.h"
 #include "ui/android/view_android.h"
 #include "ui/android/window_android_compositor.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/geometry/dip_util.h"
 
 namespace ui {
@@ skipping 31 matching lines @@
     Client* client,
     const cc::FrameSinkId& frame_sink_id)
     : frame_sink_id_(frame_sink_id),
       view_(view),
       surface_manager_(surface_manager),
       client_(client),
       begin_frame_source_(this) {
   DCHECK(view_);
   DCHECK(client_);
 
-  local_surface_id_allocator_.reset(new cc::LocalSurfaceIdAllocator());
   surface_manager_->RegisterFrameSinkId(frame_sink_id_);
   CreateNewCompositorFrameSinkSupport();
 }
 
 DelegatedFrameHostAndroid::~DelegatedFrameHostAndroid() {
   DestroyDelegatedContent();
   DetachFromCompositor();
   support_.reset();
   surface_manager_->InvalidateFrameSinkId(frame_sink_id_);
 }
 
 DelegatedFrameHostAndroid::FrameData::FrameData() = default;
 
 DelegatedFrameHostAndroid::FrameData::~FrameData() = default;
 
 void DelegatedFrameHostAndroid::SubmitCompositorFrame(
+    cc::LocalSurfaceId local_surface_id,

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

const cc::LocalSurfaceId&

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

Done.

     cc::CompositorFrame frame) {
   cc::RenderPass* root_pass = frame.render_pass_list.back().get();
   gfx::Size surface_size = root_pass->output_rect.size();
 
   if (!current_frame_ || surface_size != current_frame_->surface_size ||

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

This can be simplified once you move the conditions to
RendererCompositorFrameSink...

If the local_surface_id has changed then 

1. DestroyDelegatedContent();
2. content_layer_ = CreateSurfaceLayer(...);
3. AddChild(content_layer_);

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

Done.

+      current_frame_->local_surface_id != local_surface_id ||
       current_frame_->top_controls_height !=
           frame.metadata.top_controls_height ||
       current_frame_->top_controls_shown_ratio !=
           frame.metadata.top_controls_shown_ratio ||
       current_frame_->bottom_controls_height !=
           frame.metadata.bottom_controls_height ||
       current_frame_->bottom_controls_shown_ratio !=
           frame.metadata.bottom_controls_shown_ratio ||
       current_frame_->viewport_selection != frame.metadata.selection ||
       current_frame_->has_transparent_background !=
           root_pass->has_transparent_background) {
     DestroyDelegatedContent();
     DCHECK(!content_layer_);
     DCHECK(!current_frame_);
 
     current_frame_ = base::MakeUnique<FrameData>();
-    current_frame_->local_surface_id =
-        local_surface_id_allocator_->GenerateId();
+    current_frame_->local_surface_id = local_surface_id;
     current_frame_->surface_size = surface_size;
     current_frame_->top_controls_height = frame.metadata.top_controls_height;
     current_frame_->top_controls_shown_ratio =
         frame.metadata.top_controls_shown_ratio;
     current_frame_->bottom_controls_height =
         frame.metadata.bottom_controls_height;
     current_frame_->bottom_controls_shown_ratio =
         frame.metadata.bottom_controls_shown_ratio;
     current_frame_->has_transparent_background =
         root_pass->has_transparent_background;
@@ skipping 109 matching lines @@
       this, surface_manager_, frame_sink_id_, false /* is_root */,
       false /* handles_frame_sink_id_invalidation */,
       true /* needs_sync_points */);
 }
 
 cc::SurfaceId DelegatedFrameHostAndroid::SurfaceId() const {
   return cc::SurfaceId(frame_sink_id_, current_frame_->local_surface_id);
 }
 
 }  // namespace ui