cc: Gather and lock/unlock SkDiscardablePixelRefs instead of skia::LazyPixelRefs.

cc/resources/raster_worker_pool.cc

Index: cc/resources/raster_worker_pool.cc
diff --git a/cc/resources/raster_worker_pool.cc b/cc/resources/raster_worker_pool.cc
index 06fd18e62e0ec2bdc9d440ee0ae6eb925c867ef4..fb3e5ea518f6c9f35e39650ff5a2f510cfc37ab0 100644
--- a/cc/resources/raster_worker_pool.cc
+++ b/cc/resources/raster_worker_pool.cc
@@ -10,7 +10,6 @@
 #include "cc/debug/devtools_instrumentation.h"
 #include "cc/debug/traced_value.h"
 #include "cc/resources/picture_pile_impl.h"
-#include "skia/ext/lazy_pixel_ref.h"

[vmpstr, 2013/12/20 17:41:06]

include third_party/skia/include/core/SkPixelRef.h instead please (it's not
clear what include is bringing that in right now)

[reveman, 2013/12/20 18:22:19]

Done. And required now that I removed the include from picture.h.

 #include "skia/ext/paint_simplifier.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
@@ -253,7 +252,7 @@ class RasterWorkerPoolTaskImpl : public internal::RasterWorkerPoolTask {
 
 class ImageDecodeWorkerPoolTaskImpl : public internal::WorkerPoolTask {
  public:
-  ImageDecodeWorkerPoolTaskImpl(skia::LazyPixelRef* pixel_ref,
+  ImageDecodeWorkerPoolTaskImpl(SkPixelRef* pixel_ref,
                                 int layer_id,
                                 RenderingStatsInstrumentation* rendering_stats,
                                 const RasterWorkerPool::Task::Reply& reply)
@@ -267,7 +266,9 @@ class ImageDecodeWorkerPoolTaskImpl : public internal::WorkerPoolTask {
     TRACE_EVENT0("cc", "ImageDecodeWorkerPoolTaskImpl::RunOnWorkerThread");
     devtools_instrumentation::ScopedImageDecodeTask image_decode_task(
         pixel_ref_.get());
-    pixel_ref_->Decode();
+    // This will cause the image referred to by pixel ref to be decoded.
+    pixel_ref_->lockPixels();

[vmpstr, 2013/12/20 17:41:06]

This will still keep it in some sort of a cache, right? That is, unlockPixels
doesn't _force_ the pixel ref to go away from the cache right?

[reveman, 2013/12/20 18:22:19]

This is exactly the same thing that LazyPixelRef::Decode() does. unlockPixels
doesn't force it out of the cache. It just allows it to be purged if necessary.

+    pixel_ref_->unlockPixels();
   }
   virtual void CompleteOnOriginThread() OVERRIDE {
     reply_.Run(!HasFinishedRunning());
@@ -277,7 +278,7 @@ class ImageDecodeWorkerPoolTaskImpl : public internal::WorkerPoolTask {
   virtual ~ImageDecodeWorkerPoolTaskImpl() {}
 
  private:
-  skia::RefPtr<skia::LazyPixelRef> pixel_ref_;
+  skia::RefPtr<SkPixelRef> pixel_ref_;
   int layer_id_;
   RenderingStatsInstrumentation* rendering_stats_;
   const RasterWorkerPool::Task::Reply reply_;
@@ -451,7 +452,7 @@ RasterWorkerPool::RasterTask RasterWorkerPool::CreateRasterTask(
 
 // static
 RasterWorkerPool::Task RasterWorkerPool::CreateImageDecodeTask(
-    skia::LazyPixelRef* pixel_ref,
+    SkPixelRef* pixel_ref,
     int layer_id,
     RenderingStatsInstrumentation* stats_instrumentation,
     const Task::Reply& reply) {