Introduce cc::LocalFrameId and use in SurfaceFactory

android_webview/browser/surfaces_instance.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 "android_webview/browser/surfaces_instance.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "android_webview/browser/aw_gl_surface.h"
@@ skipping 32 matching lines @@
   cc::RendererSettings settings;
 
   // Should be kept in sync with compositor_impl_android.cc.
   settings.allow_antialiasing = false;
   settings.highp_threshold_min = 2048;
 
   // Webview does not own the surface so should not clear it.
   settings.should_clear_root_render_pass = false;
 
   surface_manager_.reset(new cc::SurfaceManager);
-  surface_id_allocator_.reset(new cc::SurfaceIdAllocator(frame_sink_id_));
+  surface_id_allocator_.reset(new cc::SurfaceIdAllocator());
   surface_manager_->RegisterFrameSinkId(frame_sink_id_);
 
   std::unique_ptr<cc::BeginFrameSource> begin_frame_source(
       new cc::StubBeginFrameSource);
   std::unique_ptr<cc::TextureMailboxDeleter> texture_mailbox_deleter(
       new cc::TextureMailboxDeleter(nullptr));
   std::unique_ptr<ParentOutputSurface> output_surface_holder(
       new ParentOutputSurface(AwRenderThreadContextProvider::Create(
           make_scoped_refptr(new AwGLSurface),
           DeferredGpuCommandService::GetInstance())));
@@ skipping 65 matching lines @@
   std::unique_ptr<cc::DelegatedFrameData> delegated_frame(
       new cc::DelegatedFrameData);
   delegated_frame->render_pass_list.push_back(std::move(render_pass));
   cc::CompositorFrame frame;
   frame.delegated_frame_data = std::move(delegated_frame);
   frame.metadata.referenced_surfaces = child_ids_;
 
   if (root_id_.is_null()) {
     root_id_ = surface_id_allocator_->GenerateId();
     surface_factory_->Create(root_id_);
-    display_->SetSurfaceId(root_id_, 1.f);
+    display_->SetSurfaceId(cc::SurfaceId(frame_sink_id_, root_id_), 1.f);
   }
   surface_factory_->SubmitCompositorFrame(root_id_, std::move(frame),
                                           cc::SurfaceFactory::DrawCallback());
 
   display_->Resize(viewport);
   display_->DrawAndSwap();
 }
 
 void SurfacesInstance::AddChildId(const cc::SurfaceId& child_id) {
   DCHECK(std::find(child_ids_.begin(), child_ids_.end(), child_id) ==
@@ skipping 26 matching lines @@
   CHECK(resources.empty());
 }
 
 void SurfacesInstance::SetBeginFrameSource(
     cc::BeginFrameSource* begin_frame_source) {
   // Parent compsitor calls DrawAndSwap directly and doesn't use
   // BeginFrameSource.
 }
 
 }  // namespace android_webview