Revert of cc: Cleanup internal::WorkerPoolTaskClient interface.

cc/resources/resource_provider.cc

Index: cc/resources/resource_provider.cc
diff --git a/cc/resources/resource_provider.cc b/cc/resources/resource_provider.cc
index e58ed0b73b7c33c01b62ae654d8ec3bdf1664704..a134fec378627c567950f10bf417910e29812caf 100644
--- a/cc/resources/resource_provider.cc
+++ b/cc/resources/resource_provider.cc
@@ -389,34 +389,28 @@
   return locked_canvas_;
 }
 
-bool ResourceProvider::RasterBuffer::UnlockForWrite() {
+void ResourceProvider::RasterBuffer::UnlockForWrite() {
   if (locked_canvas_) {
     locked_canvas_->restoreToCount(canvas_save_count_);
     locked_canvas_ = NULL;
   }
-  return DoUnlockForWrite();
+  DoUnlockForWrite();
 }
 
 ResourceProvider::DirectRasterBuffer::DirectRasterBuffer(
     const Resource* resource,
     ResourceProvider* resource_provider)
-    : RasterBuffer(resource, resource_provider), surface_generation_id_(0u) {}
+    : RasterBuffer(resource, resource_provider) {}
 
 ResourceProvider::DirectRasterBuffer::~DirectRasterBuffer() {}
 
 SkCanvas* ResourceProvider::DirectRasterBuffer::DoLockForWrite() {
   if (!surface_)
     surface_ = CreateSurface();
-  surface_generation_id_ = surface_ ? surface_->generationID() : 0u;
   return surface_ ? surface_->getCanvas() : NULL;
 }
 
-bool ResourceProvider::DirectRasterBuffer::DoUnlockForWrite() {
-  // generationID returns a non-zero, unique value corresponding to the content
-  // of surface. Hence, a change since DoLockForWrite was called means the
-  // surface has changed.
-  return surface_ ? surface_generation_id_ != surface_->generationID() : false;
-}
+void ResourceProvider::DirectRasterBuffer::DoUnlockForWrite() {}
 
 skia::RefPtr<SkSurface> ResourceProvider::DirectRasterBuffer::CreateSurface() {
   skia::RefPtr<SkSurface> surface;
@@ -459,9 +453,7 @@
 ResourceProvider::BitmapRasterBuffer::BitmapRasterBuffer(
     const Resource* resource,
     ResourceProvider* resource_provider)
-    : RasterBuffer(resource, resource_provider),
-      mapped_buffer_(NULL),
-      raster_bitmap_generation_id_(0u) {}
+    : RasterBuffer(resource, resource_provider), mapped_buffer_(NULL) {}
 
 ResourceProvider::BitmapRasterBuffer::~BitmapRasterBuffer() {}
 
@@ -500,29 +492,19 @@
   skia::RefPtr<SkBitmapDevice> device =
       skia::AdoptRef(new SkBitmapDevice(raster_bitmap_));
   raster_canvas_ = skia::AdoptRef(new SkCanvas(device.get()));
-  raster_bitmap_generation_id_ = raster_bitmap_.getGenerationID();
   return raster_canvas_.get();
 }
 
-bool ResourceProvider::BitmapRasterBuffer::DoUnlockForWrite() {
+void ResourceProvider::BitmapRasterBuffer::DoUnlockForWrite() {
   raster_canvas_.clear();
 
-  // getGenerationID returns a non-zero, unique value corresponding to the
-  // pixels in bitmap. Hence, a change since DoLockForWrite was called means the
-  // bitmap has changed.
-  bool raster_bitmap_changed =
-      raster_bitmap_generation_id_ != raster_bitmap_.getGenerationID();
-
-  if (raster_bitmap_changed) {
-    SkBitmap::Config buffer_config = SkBitmapConfig(resource()->format);
-    if (mapped_buffer_ && (buffer_config != raster_bitmap_.config()))
-      CopyBitmap(raster_bitmap_, mapped_buffer_, buffer_config);
-  }
+  SkBitmap::Config buffer_config = SkBitmapConfig(resource()->format);
+  if (mapped_buffer_ && (buffer_config != raster_bitmap_.config()))
+    CopyBitmap(raster_bitmap_, mapped_buffer_, buffer_config);
   raster_bitmap_.reset();
 
   UnmapBuffer();
   mapped_buffer_ = NULL;
-  return raster_bitmap_changed;
 }
 
 ResourceProvider::ImageRasterBuffer::ImageRasterBuffer(
@@ -1758,10 +1740,10 @@
   return resource->pixel_raster_buffer->LockForWrite();
 }
 
-bool ResourceProvider::UnmapPixelRasterBuffer(ResourceId id) {
+void ResourceProvider::UnmapPixelRasterBuffer(ResourceId id) {
   Resource* resource = GetResource(id);
   DCHECK(resource->pixel_raster_buffer.get());
-  return resource->pixel_raster_buffer->UnlockForWrite();
+  resource->pixel_raster_buffer->UnlockForWrite();
 }
 
 void ResourceProvider::AcquirePixelBuffer(Resource* resource) {