cc: Remove the base RasterSource

We only have one raster source now, we can remove the base class.

Also, the helper is no longer needed because we only have one
implementation now.

Change-Id: I97c63f37a039ea31fa8eaa7b0c3e4f0e8bb6f8bf

BUG=536104
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel

Review URL: https://codereview.chromium.org/1405883002

Cr-Commit-Position: refs/heads/master@{#354915}

3 files changed, 31 insertions, 29 deletions

diff --git a/cc/quads/draw_quad_unittest.cc b/cc/quads/draw_quad_unittest.cc
index 2fd7a80c..838cfe0 100644
--- a/cc/quads/draw_quad_unittest.cc
+++ b/cc/quads/draw_quad_unittest.cc
@@ -666,7 +666,7 @@ TEST(DrawQuadTest, CopyPictureDrawQuad) {
   ResourceFormat texture_format = RGBA_8888;
   gfx::Rect content_rect(30, 40, 20, 30);
   float contents_scale = 3.141592f;
-  scoped_refptr<RasterSource> raster_source =
+  scoped_refptr<DisplayListRasterSource> raster_source =
       FakeDisplayListRasterSource::CreateEmpty(gfx::Size(100, 100));
   CREATE_SHARED_STATE();
 
@@ -904,7 +904,7 @@ TEST_F(DrawQuadIteratorTest, DISABLED_PictureDrawQuad) {
   ResourceFormat texture_format = RGBA_8888;
   gfx::Rect content_rect(30, 40, 20, 30);
   float contents_scale = 3.141592f;
-  scoped_refptr<RasterSource> raster_source =
+  scoped_refptr<DisplayListRasterSource> raster_source =
       FakeDisplayListRasterSource::CreateEmpty(gfx::Size(100, 100));
 
   CREATE_SHARED_STATE();
diff --git a/cc/quads/picture_draw_quad.cc b/cc/quads/picture_draw_quad.cc
index b98fa90..a1cf96a 100644
--- a/cc/quads/picture_draw_quad.cc
+++ b/cc/quads/picture_draw_quad.cc
@@ -17,17 +17,18 @@ PictureDrawQuad::PictureDrawQuad() {
 PictureDrawQuad::~PictureDrawQuad() {
 }
 
-void PictureDrawQuad::SetNew(const SharedQuadState* shared_quad_state,
-                             const gfx::Rect& rect,
-                             const gfx::Rect& opaque_rect,
-                             const gfx::Rect& visible_rect,
-                             const gfx::RectF& tex_coord_rect,
-                             const gfx::Size& texture_size,
-                             bool nearest_neighbor,
-                             ResourceFormat texture_format,
-                             const gfx::Rect& content_rect,
-                             float contents_scale,
-                             scoped_refptr<RasterSource> raster_source) {
+void PictureDrawQuad::SetNew(
+    const SharedQuadState* shared_quad_state,
+    const gfx::Rect& rect,
+    const gfx::Rect& opaque_rect,
+    const gfx::Rect& visible_rect,
+    const gfx::RectF& tex_coord_rect,
+    const gfx::Size& texture_size,
+    bool nearest_neighbor,
+    ResourceFormat texture_format,
+    const gfx::Rect& content_rect,
+    float contents_scale,
+    scoped_refptr<DisplayListRasterSource> raster_source) {
   ContentDrawQuadBase::SetNew(
       shared_quad_state,
       DrawQuad::PICTURE_CONTENT,
@@ -44,18 +45,19 @@ void PictureDrawQuad::SetNew(const SharedQuadState* shared_quad_state,
   this->texture_format = texture_format;
 }
 
-void PictureDrawQuad::SetAll(const SharedQuadState* shared_quad_state,
-                             const gfx::Rect& rect,
-                             const gfx::Rect& opaque_rect,
-                             const gfx::Rect& visible_rect,
-                             bool needs_blending,
-                             const gfx::RectF& tex_coord_rect,
-                             const gfx::Size& texture_size,
-                             bool nearest_neighbor,
-                             ResourceFormat texture_format,
-                             const gfx::Rect& content_rect,
-                             float contents_scale,
-                             scoped_refptr<RasterSource> raster_source) {
+void PictureDrawQuad::SetAll(
+    const SharedQuadState* shared_quad_state,
+    const gfx::Rect& rect,
+    const gfx::Rect& opaque_rect,
+    const gfx::Rect& visible_rect,
+    bool needs_blending,
+    const gfx::RectF& tex_coord_rect,
+    const gfx::Size& texture_size,
+    bool nearest_neighbor,
+    ResourceFormat texture_format,
+    const gfx::Rect& content_rect,
+    float contents_scale,
+    scoped_refptr<DisplayListRasterSource> raster_source) {
   ContentDrawQuadBase::SetAll(shared_quad_state,
                               DrawQuad::PICTURE_CONTENT,
                               rect,
diff --git a/cc/quads/picture_draw_quad.h b/cc/quads/picture_draw_quad.h
index 9a01a9b..93140eb 100644
--- a/cc/quads/picture_draw_quad.h
+++ b/cc/quads/picture_draw_quad.h
@@ -8,7 +8,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
-#include "cc/playback/raster_source.h"
+#include "cc/playback/display_list_raster_source.h"
 #include "cc/quads/content_draw_quad_base.h"
 #include "cc/resources/resource_provider.h"
 #include "ui/gfx/geometry/rect.h"
@@ -33,7 +33,7 @@ class CC_EXPORT PictureDrawQuad : public ContentDrawQuadBase {
               ResourceFormat texture_format,
               const gfx::Rect& content_rect,
               float contents_scale,
-              scoped_refptr<RasterSource> raster_source);
+              scoped_refptr<DisplayListRasterSource> raster_source);
 
   void SetAll(const SharedQuadState* shared_quad_state,
               const gfx::Rect& rect,
@@ -46,11 +46,11 @@ class CC_EXPORT PictureDrawQuad : public ContentDrawQuadBase {
               ResourceFormat texture_format,
               const gfx::Rect& content_rect,
               float contents_scale,
-              scoped_refptr<RasterSource> raster_source);
+              scoped_refptr<DisplayListRasterSource> raster_source);
 
   gfx::Rect content_rect;
   float contents_scale;
-  scoped_refptr<RasterSource> raster_source;
+  scoped_refptr<DisplayListRasterSource> raster_source;
   ResourceFormat texture_format;
 
   static const PictureDrawQuad* MaterialCast(const DrawQuad* quad);