Introduce cc::LocalFrameId and use in SurfaceFactory

android_webview/browser/surfaces_instance.cc

Index: android_webview/browser/surfaces_instance.cc
diff --git a/android_webview/browser/surfaces_instance.cc b/android_webview/browser/surfaces_instance.cc
index 594d468b0379c245ce1dbe124cd6c8f05601610e..e506d1fb26f908555bf139da6a4cece9efc2226a 100644
--- a/android_webview/browser/surfaces_instance.cc
+++ b/android_webview/browser/surfaces_instance.cc
@@ -50,7 +50,7 @@ SurfacesInstance::SurfacesInstance()
   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(
@@ -136,7 +136,7 @@ void SurfacesInstance::DrawAndSwap(const gfx::Size& viewport,
   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());