Index: cc/test/fake_picture_layer_impl.h |
diff --git a/cc/test/fake_picture_layer_impl.h b/cc/test/fake_picture_layer_impl.h |
index 2ba976176e29a35e0cfa24a820cbbbaeef5711f6..b631635555b39f24bf8060f8325b2da8df887c7d 100644 |
--- a/cc/test/fake_picture_layer_impl.h |
+++ b/cc/test/fake_picture_layer_impl.h |
@@ -9,7 +9,7 @@ |
#include "base/memory/scoped_ptr.h" |
#include "cc/layers/picture_layer_impl.h" |
-#include "cc/playback/display_list_raster_source.h" |
+#include "cc/playback/raster_source.h" |
namespace cc { |
@@ -31,7 +31,7 @@ class FakePictureLayerImpl : public PictureLayerImpl { |
static scoped_ptr<FakePictureLayerImpl> CreateWithRasterSource( |
LayerTreeImpl* tree_impl, |
int id, |
- scoped_refptr<DisplayListRasterSource> raster_source) { |
+ scoped_refptr<RasterSource> raster_source) { |
bool is_mask = false; |
return make_scoped_ptr( |
new FakePictureLayerImpl(tree_impl, id, raster_source, is_mask)); |
@@ -41,7 +41,7 @@ class FakePictureLayerImpl : public PictureLayerImpl { |
static scoped_ptr<FakePictureLayerImpl> CreateWithPartialRasterSource( |
LayerTreeImpl* tree_impl, |
int id, |
- scoped_refptr<DisplayListRasterSource> raster_source, |
+ scoped_refptr<RasterSource> raster_source, |
const gfx::Size& layer_bounds) { |
bool is_mask = false; |
return make_scoped_ptr(new FakePictureLayerImpl( |
@@ -53,7 +53,7 @@ class FakePictureLayerImpl : public PictureLayerImpl { |
static scoped_ptr<FakePictureLayerImpl> CreateMaskWithRasterSource( |
LayerTreeImpl* tree_impl, |
int id, |
- scoped_refptr<DisplayListRasterSource> raster_source) { |
+ scoped_refptr<RasterSource> raster_source) { |
bool is_mask = true; |
return make_scoped_ptr( |
new FakePictureLayerImpl(tree_impl, id, raster_source, is_mask)); |
@@ -106,10 +106,9 @@ class FakePictureLayerImpl : public PictureLayerImpl { |
size_t num_tilings() const { return tilings_->num_tilings(); } |
PictureLayerTilingSet* tilings() { return tilings_.get(); } |
- DisplayListRasterSource* raster_source() { return raster_source_.get(); } |
- void SetRasterSourceOnPending( |
- scoped_refptr<DisplayListRasterSource> raster_source, |
- const Region& invalidation); |
+ RasterSource* raster_source() { return raster_source_.get(); } |
+ void SetRasterSourceOnPending(scoped_refptr<RasterSource> raster_source, |
+ const Region& invalidation); |
size_t append_quads_count() { return append_quads_count_; } |
const Region& invalidation() const { return invalidation_; } |
@@ -149,11 +148,11 @@ class FakePictureLayerImpl : public PictureLayerImpl { |
protected: |
FakePictureLayerImpl(LayerTreeImpl* tree_impl, |
int id, |
- scoped_refptr<DisplayListRasterSource> raster_source, |
+ scoped_refptr<RasterSource> raster_source, |
bool is_mask); |
FakePictureLayerImpl(LayerTreeImpl* tree_impl, |
int id, |
- scoped_refptr<DisplayListRasterSource> raster_source, |
+ scoped_refptr<RasterSource> raster_source, |
bool is_mask, |
const gfx::Size& layer_bounds); |
FakePictureLayerImpl(LayerTreeImpl* tree_impl, int id, bool is_mask); |