Centralize FrameSinkId allocation in one place

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 10 matching lines @@
 #include "cc/surfaces/display_scheduler.h"
 #include "cc/surfaces/surface_id_allocator.h"
 #include "cc/surfaces/surface_manager.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/transform.h"
 
 namespace android_webview {
 
 namespace {
+// The client_id used here should not conflict with the client_id generated
+// from RenderWidgetHostImpl.
+constexpr uint32_t kDefaultClientId = 0u;
 SurfacesInstance* g_surfaces_instance = nullptr;
 }  // namespace
 
 // static
 scoped_refptr<SurfacesInstance> SurfacesInstance::GetOrCreateInstance() {
   if (g_surfaces_instance)
     return make_scoped_refptr(g_surfaces_instance);
   return make_scoped_refptr(new SurfacesInstance);
 }
 
 SurfacesInstance::SurfacesInstance()
-    : next_client_id_(1u), frame_sink_id_(AllocateFrameSinkId()) {
+    : frame_sink_id_allocator_(kDefaultClientId),
+      frame_sink_id_(AllocateFrameSinkId()) {
   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);
@@ skipping 33 matching lines @@
   g_surfaces_instance = nullptr;
   DCHECK(child_ids_.empty());
 }
 
 void SurfacesInstance::DisplayOutputSurfaceLost() {
   // Android WebView does not handle context loss.
   LOG(FATAL) << "Render thread context loss";
 }
 
 cc::FrameSinkId SurfacesInstance::AllocateFrameSinkId() {
-  return cc::FrameSinkId(next_client_id_++, 0 /* sink_id */);
+  return frame_sink_id_allocator_.NextFrameSinkId();
 }
 
 cc::SurfaceManager* SurfacesInstance::GetSurfaceManager() {
   return surface_manager_.get();
 }
 
 void SurfacesInstance::DrawAndSwap(const gfx::Size& viewport,
                                    const gfx::Rect& clip,
                                    const gfx::Transform& transform,
                                    const gfx::Size& frame_size,
@@ skipping 66 matching lines @@
     const cc::LocalSurfaceId& local_surface_id,
     const gfx::Rect& damage_rect) {}
 
 void SurfacesInstance::ReclaimResources(
     const cc::ReturnedResourceArray& resources) {
   // Root surface should have no resources to return.
   CHECK(resources.empty());
 }
 
 }  // namespace android_webview