Introduce cc::LocalFrameId and use in SurfaceFactory

content/browser/renderer_host/offscreen_canvas_surface_impl.cc

Index: content/browser/renderer_host/offscreen_canvas_surface_impl.cc
diff --git a/content/browser/renderer_host/offscreen_canvas_surface_impl.cc b/content/browser/renderer_host/offscreen_canvas_surface_impl.cc
index fb9b87562c566684addcea4f68a9df7950b5b075..bac06970c2382f730a49d63858dfaa89953644e6 100644
--- a/content/browser/renderer_host/offscreen_canvas_surface_impl.cc
+++ b/content/browser/renderer_host/offscreen_canvas_surface_impl.cc
@@ -14,7 +14,7 @@
 namespace content {
 
 OffscreenCanvasSurfaceImpl::OffscreenCanvasSurfaceImpl()
-    : id_allocator_(new cc::SurfaceIdAllocator(AllocateFrameSinkId())) {}
+    : id_allocator_(new cc::SurfaceIdAllocator()) {}
 
 OffscreenCanvasSurfaceImpl::~OffscreenCanvasSurfaceImpl() {}
 
@@ -29,7 +29,8 @@ void OffscreenCanvasSurfaceImpl::GetSurfaceId(
     const GetSurfaceIdCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
-  surface_id_ = id_allocator_->GenerateId();
+  cc::LocalFrameId local_frame_id = id_allocator_->GenerateId();
+  surface_id_ = cc::SurfaceId(AllocateFrameSinkId(), local_frame_id);
 
   callback.Run(surface_id_);
 }