Rename SurfaceIdAllocator to LocalSurfaceIdAllocator

cc/surfaces/direct_compositor_frame_sink.h

 // Copyright 2014 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.
 
 #ifndef CC_SURFACES_DIRECT_COMPOSITOR_FRAME_SINK_H_
 #define CC_SURFACES_DIRECT_COMPOSITOR_FRAME_SINK_H_
 
 #include "base/macros.h"
 #include "base/threading/thread_checker.h"
 #include "cc/output/compositor_frame_sink.h"
 #include "cc/scheduler/begin_frame_source.h"
 #include "cc/surfaces/compositor_frame_sink_support.h"
 #include "cc/surfaces/compositor_frame_sink_support_client.h"
 #include "cc/surfaces/display_client.h"
+#include "cc/surfaces/local_surface_id_allocator.h"
 #include "cc/surfaces/surface_factory.h"
 #include "cc/surfaces/surface_factory_client.h"
-#include "cc/surfaces/surface_id_allocator.h"
 #include "cc/surfaces/surfaces_export.h"
 
 namespace cc {
 class Display;
-class SurfaceIdAllocator;
+class LocalSurfaceIdAllocator;
 class SurfaceManager;
 
 // This class submits compositor frames to an in-process Display, with the
 // client's frame being the root surface of the Display.
 class CC_SURFACES_EXPORT DirectCompositorFrameSink
     : public CompositorFrameSink,
       public NON_EXPORTED_BASE(CompositorFrameSinkSupportClient),
       public ExternalBeginFrameSourceClient,
       public NON_EXPORTED_BASE(DisplayClient) {
  public:
-  // The underlying Display, SurfaceManager, and SurfaceIdAllocator must outlive
+  // The underlying Display, SurfaceManager, and LocalSurfaceIdAllocator must
+  // outlive
   // this class.

[Fady Samuel, 2017/02/22 12:42:57]

nit: move this to the previous line.

[xing.xu, 2017/02/22 13:33:28]

Acknowledged.

   DirectCompositorFrameSink(
       const FrameSinkId& frame_sink_id,
       SurfaceManager* surface_manager,
       Display* display,
       scoped_refptr<ContextProvider> context_provider,
       scoped_refptr<ContextProvider> worker_context_provider,
       gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
       SharedBitmapManager* shared_bitmap_manager);
   DirectCompositorFrameSink(
       const FrameSinkId& frame_sink_id,
@@ skipping 24 matching lines @@
 
   // ExternalBeginFrameSourceClient implementation:
   void OnNeedsBeginFrames(bool needs_begin_frame) override;
 
   // This class is only meant to be used on a single thread.
   base::ThreadChecker thread_checker_;
 
   const FrameSinkId frame_sink_id_;
   LocalSurfaceId delegated_local_surface_id_;
   SurfaceManager* surface_manager_;
-  SurfaceIdAllocator surface_id_allocator_;
+  LocalSurfaceIdAllocator local_surface_id_allocator_;
   Display* display_;
   gfx::Size last_swap_frame_size_;
   bool is_lost_ = false;
   std::unique_ptr<CompositorFrameSinkSupport> support_;
   std::unique_ptr<ExternalBeginFrameSource> begin_frame_source_;
 
   DISALLOW_COPY_AND_ASSIGN(DirectCompositorFrameSink);
 };
 
 }  // namespace cc
 
 #endif  // CC_SURFACES_DIRECT_COMPOSITOR_FRAME_SINK_H_