Let DelegateFrameHost in Mac and Android use correct FrameSinkId during creation

content/browser/renderer_host/context_provider_factory_impl_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 "content/browser/renderer_host/context_provider_factory_impl_android.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/memory/ptr_util.h"
@@ skipping 48 matching lines @@
 // static
 ContextProviderFactoryImpl* ContextProviderFactoryImpl::GetInstance() {
   return instance;
 }
 
 ContextProviderFactoryImpl::ContextProviderFactoryImpl(
     gpu::GpuChannelEstablishFactory* gpu_channel_factory)
     : gpu_channel_factory_(gpu_channel_factory),
       in_handle_pending_requests_(false),
       in_shutdown_(false),
-      next_client_id_(1u),
+      next_sink_id_(1u),
       weak_factory_(this) {
   DCHECK(gpu_channel_factory_);
 }
 
 ContextProviderFactoryImpl::~ContextProviderFactoryImpl() {
   in_shutdown_ = true;
   if (!gpu_channel_requests_.empty())
     HandlePendingRequests(nullptr,
                           GpuChannelHostResult::FAILURE_FACTORY_SHUTDOWN);
 }
@@ skipping 49 matching lines @@
 }
 
 cc::SurfaceManager* ContextProviderFactoryImpl::GetSurfaceManager() {
   if (!surface_manager_)
     surface_manager_ = base::WrapUnique(new cc::SurfaceManager);
 
   return surface_manager_.get();
 }
 
 cc::FrameSinkId ContextProviderFactoryImpl::AllocateFrameSinkId() {
-  return cc::FrameSinkId(++next_client_id_, 0 /* sink_id */);
+  // The FrameSinkId generated here must be unique with
+  // RenderWidgetHostViewAndroid's
+  // FrameSinkId allocation.
+  // TODO(crbug.com/685777): Centralize allocation in one place for easier
+  // maintenance.
+  return cc::FrameSinkId(0 /* client_id */, next_sink_id_++);
 }
 
 gpu::GpuMemoryBufferManager*
 ContextProviderFactoryImpl::GetGpuMemoryBufferManager() {
   return BrowserGpuMemoryBufferManager::current();
 }
 
 scoped_refptr<cc::ContextProvider>
 ContextProviderFactoryImpl::CreateContextProviderInternal(
     ui::command_buffer_metrics::ContextType context_type,
@@ skipping 83 matching lines @@
         nullptr,
         GpuChannelHostResult::FAILURE_GPU_PROCESS_INITIALIZATION_FAILED);
   }
 }
 
 void ContextProviderFactoryImpl::OnGpuChannelTimeout() {
   LOG(FATAL) << "Timed out waiting for GPU channel.";
 }
 
 }  // namespace content