[go: nahoru, domu]

Rename two RasterBufferImpl to make the names more unique

In jumbo builds (use_jumbo_build=true), cc files are merged so local
symbols, such as these RasterBufferImpl, will end up in the same
translation unit and prevent the code from compiling.

Having unique names have other benefits as well in debugging and
documentation so this CL renames them ZeroCopyRasterBufferImpl
and BitmapRasterBufferImpl.

Bug: 786926
Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.android:android_optional_gpu_tests_rel
Change-Id: I0b0af89cc1c0b3581a18a685742ad3e8c6e6b429
Reviewed-on: https://chromium-review.googlesource.com/779119
Reviewed-by: enne <enne@chromium.org>
Commit-Queue: Daniel Bratell <bratell@opera.com>
Cr-Commit-Position: refs/heads/master@{#518210}
diff --git a/cc/raster/zero_copy_raster_buffer_provider.cc b/cc/raster/zero_copy_raster_buffer_provider.cc
index 04bf0faf..194ce14 100644
--- a/cc/raster/zero_copy_raster_buffer_provider.cc
+++ b/cc/raster/zero_copy_raster_buffer_provider.cc
@@ -22,10 +22,10 @@
 namespace cc {
 namespace {
 
-class RasterBufferImpl : public RasterBuffer {
+class ZeroCopyRasterBufferImpl : public RasterBuffer {
  public:
-  RasterBufferImpl(LayerTreeResourceProvider* resource_provider,
-                   const Resource* resource)
+  ZeroCopyRasterBufferImpl(LayerTreeResourceProvider* resource_provider,
+                           const Resource* resource)
       : lock_(resource_provider, resource->id()), resource_(resource) {}
 
   // Overridden from RasterBuffer:
@@ -60,7 +60,7 @@
   LayerTreeResourceProvider::ScopedWriteLockGpuMemoryBuffer lock_;
   const Resource* resource_;
 
-  DISALLOW_COPY_AND_ASSIGN(RasterBufferImpl);
+  DISALLOW_COPY_AND_ASSIGN(ZeroCopyRasterBufferImpl);
 };
 
 }  // namespace
@@ -88,7 +88,7 @@
     uint64_t resource_content_id,
     uint64_t previous_content_id) {
   return base::WrapUnique<RasterBuffer>(
-      new RasterBufferImpl(resource_provider_, resource));
+      new ZeroCopyRasterBufferImpl(resource_provider_, resource));
 }
 
 void ZeroCopyRasterBufferProvider::OrderingBarrier() {