| 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 f0bf7622c75516e085f56a296db0dd6275d0d179..54479ef30e253403c03c5a3c3a346857f2f1f9b9 100644
|
| --- a/cc/test/fake_picture_layer_impl.h
|
| +++ b/cc/test/fake_picture_layer_impl.h
|
| @@ -22,14 +22,27 @@ class FakePictureLayerImpl : public PictureLayerImpl {
|
| static std::unique_ptr<FakePictureLayerImpl> Create(LayerTreeImpl* tree_impl,
|
| int id) {
|
| bool is_mask = false;
|
| - return base::WrapUnique(new FakePictureLayerImpl(tree_impl, id, is_mask));
|
| + bool is_single_texture_mask = false;
|
| + return base::WrapUnique(new FakePictureLayerImpl(tree_impl, id, is_mask,
|
| + is_single_texture_mask));
|
| }
|
|
|
| static std::unique_ptr<FakePictureLayerImpl> CreateMask(
|
| LayerTreeImpl* tree_impl,
|
| int id) {
|
| bool is_mask = true;
|
| - return base::WrapUnique(new FakePictureLayerImpl(tree_impl, id, is_mask));
|
| + bool is_single_texture_mask = false;
|
| + return base::WrapUnique(new FakePictureLayerImpl(tree_impl, id, is_mask,
|
| + is_single_texture_mask));
|
| + }
|
| +
|
| + static std::unique_ptr<FakePictureLayerImpl> CreateSingleTextureMask(
|
| + LayerTreeImpl* tree_impl,
|
| + int id) {
|
| + bool is_mask = true;
|
| + bool is_single_texture_mask = true;
|
| + return base::WrapUnique(new FakePictureLayerImpl(tree_impl, id, is_mask,
|
| + is_single_texture_mask));
|
| }
|
|
|
| // Create layer from a raster source that covers the entire layer.
|
| @@ -38,8 +51,9 @@ class FakePictureLayerImpl : public PictureLayerImpl {
|
| int id,
|
| scoped_refptr<RasterSource> raster_source) {
|
| bool is_mask = false;
|
| - return base::WrapUnique(
|
| - new FakePictureLayerImpl(tree_impl, id, raster_source, is_mask));
|
| + bool is_single_texture_mask = false;
|
| + return base::WrapUnique(new FakePictureLayerImpl(
|
| + tree_impl, id, raster_source, is_mask, is_single_texture_mask));
|
| }
|
|
|
| // Create layer from a raster source that only covers part of the layer.
|
| @@ -49,8 +63,10 @@ class FakePictureLayerImpl : public PictureLayerImpl {
|
| scoped_refptr<RasterSource> raster_source,
|
| const gfx::Size& layer_bounds) {
|
| bool is_mask = false;
|
| - return base::WrapUnique(new FakePictureLayerImpl(
|
| - tree_impl, id, raster_source, is_mask, layer_bounds));
|
| + bool is_single_texture_mask = false;
|
| + return base::WrapUnique(
|
| + new FakePictureLayerImpl(tree_impl, id, raster_source, is_mask,
|
| + is_single_texture_mask, layer_bounds));
|
| }
|
|
|
| // Create layer from a raster source that covers the entire layer and is a
|
| @@ -60,8 +76,20 @@ class FakePictureLayerImpl : public PictureLayerImpl {
|
| int id,
|
| scoped_refptr<RasterSource> raster_source) {
|
| bool is_mask = true;
|
| - return base::WrapUnique(
|
| - new FakePictureLayerImpl(tree_impl, id, raster_source, is_mask));
|
| + bool is_single_texture_mask = false;
|
| + return base::WrapUnique(new FakePictureLayerImpl(
|
| + tree_impl, id, raster_source, is_mask, is_single_texture_mask));
|
| + }
|
| +
|
| + static std::unique_ptr<FakePictureLayerImpl>
|
| + CreateSingleTextureMaskWithRasterSource(
|
| + LayerTreeImpl* tree_impl,
|
| + int id,
|
| + scoped_refptr<RasterSource> raster_source) {
|
| + bool is_mask = true;
|
| + bool is_single_texture_mask = true;
|
| + return base::WrapUnique(new FakePictureLayerImpl(
|
| + tree_impl, id, raster_source, is_mask, is_single_texture_mask));
|
| }
|
|
|
| std::unique_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) override;
|
| @@ -155,13 +183,18 @@ class FakePictureLayerImpl : public PictureLayerImpl {
|
| FakePictureLayerImpl(LayerTreeImpl* tree_impl,
|
| int id,
|
| scoped_refptr<RasterSource> raster_source,
|
| - bool is_mask);
|
| + bool is_mask,
|
| + bool is_single_texture_mask);
|
| FakePictureLayerImpl(LayerTreeImpl* tree_impl,
|
| int id,
|
| scoped_refptr<RasterSource> raster_source,
|
| bool is_mask,
|
| + bool is_single_texture_mask,
|
| const gfx::Size& layer_bounds);
|
| - FakePictureLayerImpl(LayerTreeImpl* tree_impl, int id, bool is_mask);
|
| + FakePictureLayerImpl(LayerTreeImpl* tree_impl,
|
| + int id,
|
| + bool is_mask,
|
| + bool is_single_texture_mask);
|
|
|
| private:
|
| gfx::Size fixed_tile_size_;
|
|
|