Snapshot of all changes to get jumbo in blink and content.

cc/raster/zero_copy_raster_buffer_provider.cc

Index: cc/raster/zero_copy_raster_buffer_provider.cc
diff --git a/cc/raster/zero_copy_raster_buffer_provider.cc b/cc/raster/zero_copy_raster_buffer_provider.cc
index fc432f38e0ed5ef3e5046e6ef273a2d70c89624c..9d933f2f5a106131bf11e0a8df6c31b93e3d7710 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 @@ class RasterBufferImpl : public RasterBuffer {
   LayerTreeResourceProvider::ScopedWriteLockGpuMemoryBuffer lock_;
   const Resource* resource_;
 
-  DISALLOW_COPY_AND_ASSIGN(RasterBufferImpl);
+  DISALLOW_COPY_AND_ASSIGN(ZeroCopyRasterBufferImpl);
 };
 
 }  // namespace
@@ -88,12 +88,13 @@ ZeroCopyRasterBufferProvider::AcquireBufferForRaster(
     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::ReleaseBufferForRaster(
     std::unique_ptr<RasterBuffer> buffer) {
-  // Nothing to do here. RasterBufferImpl destructor cleans up after itself.
+  // Nothing to do here. ZeroCopyRasterBufferImpl destructor cleans up
+  // after itself.
 }
 
 void ZeroCopyRasterBufferProvider::OrderingBarrier() {