cc: Remove PicturePile and PicturePileImpl.

cc/raster/tile_task_worker_pool_unittest.cc

 // Copyright 2013 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.
 
 #include "cc/raster/tile_task_worker_pool.h"
 
 #include <limits>
 #include <vector>
 
 #include "base/cancelable_callback.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "cc/base/unique_notifier.h"
-#include "cc/playback/picture_pile.h"
-#include "cc/playback/picture_pile_impl.h"
 #include "cc/raster/bitmap_tile_task_worker_pool.h"
 #include "cc/raster/gpu_rasterizer.h"
 #include "cc/raster/gpu_tile_task_worker_pool.h"
 #include "cc/raster/one_copy_tile_task_worker_pool.h"
 #include "cc/raster/raster_buffer.h"
 #include "cc/raster/tile_task_runner.h"
 #include "cc/raster/zero_copy_tile_task_worker_pool.h"
 #include "cc/resources/resource_pool.h"
 #include "cc/resources/resource_provider.h"
 #include "cc/resources/scoped_resource.h"
+#include "cc/test/fake_display_list_raster_source.h"
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/fake_output_surface_client.h"
-#include "cc/test/fake_picture_pile_impl.h"
 #include "cc/test/fake_resource_provider.h"
 #include "cc/test/test_gpu_memory_buffer_manager.h"
 #include "cc/test/test_shared_bitmap_manager.h"
 #include "cc/test/test_task_graph_runner.h"
 #include "cc/test/test_web_graphics_context_3d.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {
 namespace {
@@ skipping 12 matching lines @@
  public:
   typedef base::Callback<void(const RasterSource::SolidColorAnalysis& analysis,
                               bool was_canceled)> Reply;
 
   TestRasterTaskImpl(const Resource* resource,
                      const Reply& reply,
                      ImageDecodeTask::Vector* dependencies)
       : RasterTask(dependencies),
         resource_(resource),
         reply_(reply),
-        picture_pile_(FakePicturePileImpl::CreateEmptyPile(gfx::Size(1, 1),
-                                                           gfx::Size(1, 1))) {}
+        picture_raster_source_(
+            FakeDisplayListRasterSource::CreateFilled(gfx::Size(1, 1))) {}
 
   // Overridden from Task:
   void RunOnWorkerThread() override {
     uint64_t new_content_id = 0;
-    raster_buffer_->Playback(picture_pile_.get(), gfx::Rect(1, 1),
+    raster_buffer_->Playback(picture_raster_source_.get(), gfx::Rect(1, 1),
                              gfx::Rect(1, 1), new_content_id, 1.f, true);
   }
 
   // Overridden from TileTask:
   void ScheduleOnOriginThread(TileTaskClient* client) override {
     // The raster buffer has no tile ids associated with it for partial update,
     // so doesn't need to provide a valid dirty rect.
     raster_buffer_ = client->AcquireBufferForRaster(resource_, 0, 0);
   }
   void CompleteOnOriginThread(TileTaskClient* client) override {
     client->ReleaseBufferForRaster(raster_buffer_.Pass());
     reply_.Run(RasterSource::SolidColorAnalysis(), !HasFinishedRunning());
   }
 
  protected:
   ~TestRasterTaskImpl() override {}
 
  private:
   const Resource* resource_;
   const Reply reply_;
   scoped_ptr<RasterBuffer> raster_buffer_;
-  scoped_refptr<PicturePileImpl> picture_pile_;
+  scoped_refptr<RasterSource> picture_raster_source_;

[danakj, 2015/09/22 21:52:15]

nit: just raster_source_?

[vmpstr, 2015/09/22 22:57:49]

Done.

 
   DISALLOW_COPY_AND_ASSIGN(TestRasterTaskImpl);
 };
 
 class BlockingTestRasterTaskImpl : public TestRasterTaskImpl {
  public:
   BlockingTestRasterTaskImpl(const Resource* resource,
                              const Reply& reply,
                              base::Lock* lock,
                              ImageDecodeTask::Vector* dependencies)
@@ skipping 305 matching lines @@
 
 INSTANTIATE_TEST_CASE_P(TileTaskWorkerPoolTests,
                         TileTaskWorkerPoolTest,
                         ::testing::Values(TILE_TASK_WORKER_POOL_TYPE_ZERO_COPY,
                                           TILE_TASK_WORKER_POOL_TYPE_ONE_COPY,
                                           TILE_TASK_WORKER_POOL_TYPE_GPU,
                                           TILE_TASK_WORKER_POOL_TYPE_BITMAP));
 
 }  // namespace
 }  // namespace cc