Re-land: cc: Cleanup internal::WorkerPoolTaskClient interface.

cc/resources/resource_provider.h

 // Copyright 2012 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_RESOURCES_RESOURCE_PROVIDER_H_
 #define CC_RESOURCES_RESOURCE_PROVIDER_H_
 
 #include <deque>
 #include <set>
 #include <string>
@@ skipping 313 matching lines @@
   void UnmapDirectRasterBuffer(ResourceId id);
 
   // Returns a canvas backed by an image buffer.
   // Rasterizing to the canvas writes the content into the image buffer,
   // which is internally bound to the underlying resource when read.
   // Call Unmap before the resource can be read or used for compositing.
   // It is used by ImageRasterWorkerPool.
   SkCanvas* MapImageRasterBuffer(ResourceId id);
   void UnmapImageRasterBuffer(ResourceId id);
 
-  // Returns a canvas backed by pixel buffer.
+  // Returns a canvas backed by pixel buffer. UnmapPixelRasterBuffer
+  // returns true if canvas was written to while mapped.
   // The pixel buffer needs to be uploaded to the underlying resource
   // using BeginSetPixels before the resouce can be used for compositing.
   // It is used by PixelRasterWorkerPool.
   void AcquirePixelRasterBuffer(ResourceId id);
   void ReleasePixelRasterBuffer(ResourceId id);
   SkCanvas* MapPixelRasterBuffer(ResourceId id);
-  void UnmapPixelRasterBuffer(ResourceId id);
+  bool UnmapPixelRasterBuffer(ResourceId id);
 
   // Asynchronously update pixels from acquired pixel buffer.
   void BeginSetPixels(ResourceId id);
   void ForceSetPixelsToComplete(ResourceId id);
   bool DidSetPixelsComplete(ResourceId id);
 
   // For tests only! This prevents detecting uninitialized reads.
   // Use SetPixels or LockForWrite to allocate implicitly.
   void AllocateForTesting(ResourceId id);
 
@@ skipping 91 matching lines @@
     linked_ptr<ImageRasterBuffer> image_raster_buffer;
     linked_ptr<PixelRasterBuffer> pixel_raster_buffer;
   };
   typedef base::hash_map<ResourceId, Resource> ResourceMap;
 
   class RasterBuffer {
    public:
     virtual ~RasterBuffer();
 
     SkCanvas* LockForWrite();
-    void UnlockForWrite();
+    // Returns true if canvas was written to while locked.
+    bool UnlockForWrite();
 
    protected:
     RasterBuffer(const Resource* resource, ResourceProvider* resource_provider);
     const Resource* resource() const { return resource_; }
     ResourceProvider* resource_provider() const { return resource_provider_; }
 
     virtual SkCanvas* DoLockForWrite() = 0;
-    virtual void DoUnlockForWrite() = 0;
+    virtual bool DoUnlockForWrite() = 0;
 
    private:
     const Resource* resource_;
     ResourceProvider* resource_provider_;
     SkCanvas* locked_canvas_;
     int canvas_save_count_;
   };
 
   class DirectRasterBuffer : public RasterBuffer {
    public:
     DirectRasterBuffer(const Resource* resource,
                        ResourceProvider* resource_provider);
     virtual ~DirectRasterBuffer();
 
    protected:
     virtual SkCanvas* DoLockForWrite() OVERRIDE;
-    virtual void DoUnlockForWrite() OVERRIDE;
+    virtual bool DoUnlockForWrite() OVERRIDE;
     skia::RefPtr<SkSurface> CreateSurface();
 
    private:
     skia::RefPtr<SkSurface> surface_;
+    uint32_t surface_generation_id_;
+
     DISALLOW_COPY_AND_ASSIGN(DirectRasterBuffer);
   };
 
   class BitmapRasterBuffer : public RasterBuffer {
    public:
     virtual ~BitmapRasterBuffer();
 
    protected:
     BitmapRasterBuffer(const Resource* resource,
                        ResourceProvider* resource_provider);
 
     virtual SkCanvas* DoLockForWrite() OVERRIDE;
-    virtual void DoUnlockForWrite() OVERRIDE;
+    virtual bool DoUnlockForWrite() OVERRIDE;
 
     virtual uint8_t* MapBuffer(int* stride) = 0;
     virtual void UnmapBuffer() = 0;
 
    private:
     uint8_t* mapped_buffer_;
     SkBitmap raster_bitmap_;
+    uint32_t raster_bitmap_generation_id_;
     skia::RefPtr<SkCanvas> raster_canvas_;
   };
 
   class ImageRasterBuffer : public BitmapRasterBuffer {
    public:
     ImageRasterBuffer(const Resource* resource,
                       ResourceProvider* resource_provider);
     virtual ~ImageRasterBuffer();
 
    protected:
@@ skipping 172 matching lines @@
   return format_gl_data_format[format];
 }
 
 inline GLenum GLInternalFormat(ResourceFormat format) {
   return GLDataFormat(format);
 }
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_RESOURCE_PROVIDER_H_