summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cc/debug/picture_record_benchmark.cc10
-rw-r--r--cc/debug/rasterize_and_record_benchmark.cc5
-rw-r--r--cc/layers/picture_layer_unittest.cc8
-rw-r--r--cc/resources/display_list_recording_source.cc5
-rw-r--r--cc/resources/display_list_recording_source.h2
-rw-r--r--cc/resources/picture.cc29
-rw-r--r--cc/resources/picture.h16
-rw-r--r--cc/resources/picture_pile.cc30
-rw-r--r--cc/resources/picture_pile.h7
-rw-r--r--cc/resources/picture_unittest.cc92
-rw-r--r--cc/resources/recording_source.h3
-rw-r--r--cc/test/fake_picture_pile_impl.cc4
-rw-r--r--cc/test/fake_picture_pile_impl.h2
13 files changed, 66 insertions, 147 deletions
diff --git a/cc/debug/picture_record_benchmark.cc b/cc/debug/picture_record_benchmark.cc
index ab50c7c..cc01448 100644
--- a/cc/debug/picture_record_benchmark.cc
+++ b/cc/debug/picture_record_benchmark.cc
@@ -13,7 +13,6 @@
#include "cc/resources/picture.h"
#include "cc/trees/layer_tree_host.h"
#include "cc/trees/layer_tree_host_common.h"
-#include "third_party/skia/include/core/SkBBHFactory.h"
#include "ui/gfx/geometry/rect.h"
namespace cc {
@@ -22,7 +21,6 @@ namespace {
const int kPositionIncrement = 100;
const int kTileGridSize = 512;
-const int kTileGridBorder = 1;
} // namespace
@@ -93,11 +91,7 @@ void PictureRecordBenchmark::RunOnLayer(PictureLayer* layer) {
ContentLayerClient* painter = layer->client();
gfx::Size content_bounds = layer->content_bounds();
- SkTileGridFactory::TileGridInfo tile_grid_info;
- tile_grid_info.fTileInterval.set(kTileGridSize - 2 * kTileGridBorder,
- kTileGridSize - 2 * kTileGridBorder);
- tile_grid_info.fMargin.set(kTileGridBorder, kTileGridBorder);
- tile_grid_info.fOffset.set(-kTileGridBorder, -kTileGridBorder);
+ gfx::Size tile_grid_size(kTileGridSize, kTileGridSize);
for (size_t i = 0; i < dimensions_.size(); ++i) {
std::pair<int, int> dimensions = dimensions_[i];
@@ -113,7 +107,7 @@ void PictureRecordBenchmark::RunOnLayer(PictureLayer* layer) {
base::TimeTicks start = base::TimeTicks::HighResNow();
scoped_refptr<Picture> picture = Picture::Create(
- rect, painter, tile_grid_info, false, Picture::RECORD_NORMALLY);
+ rect, painter, tile_grid_size, false, Picture::RECORD_NORMALLY);
base::TimeTicks end = base::TimeTicks::HighResNow();
base::TimeDelta duration = end - start;
diff --git a/cc/debug/rasterize_and_record_benchmark.cc b/cc/debug/rasterize_and_record_benchmark.cc
index 41d6210..51edc98 100644
--- a/cc/debug/rasterize_and_record_benchmark.cc
+++ b/cc/debug/rasterize_and_record_benchmark.cc
@@ -108,9 +108,6 @@ void RasterizeAndRecordBenchmark::RunOnLayer(PictureLayer* layer) {
DCHECK(host_);
gfx::Size tile_grid_size = host_->settings().default_tile_size;
- SkTileGridFactory::TileGridInfo tile_grid_info;
- PicturePile::ComputeTileGridInfo(tile_grid_size, &tile_grid_info);
-
gfx::Rect visible_content_rect = gfx::ScaleToEnclosingRect(
layer->visible_content_rect(), 1.f / layer->contents_scale_x());
if (visible_content_rect.IsEmpty())
@@ -136,7 +133,7 @@ void RasterizeAndRecordBenchmark::RunOnLayer(PictureLayer* layer) {
kTimeCheckInterval);
scoped_refptr<Picture> picture;
do {
- picture = Picture::Create(visible_content_rect, painter, tile_grid_info,
+ picture = Picture::Create(visible_content_rect, painter, tile_grid_size,
false, mode);
timer.NextLap();
} while (!timer.HasTimeLimitExpired());
diff --git a/cc/layers/picture_layer_unittest.cc b/cc/layers/picture_layer_unittest.cc
index ac20e4c..9327e13 100644
--- a/cc/layers/picture_layer_unittest.cc
+++ b/cc/layers/picture_layer_unittest.cc
@@ -106,10 +106,10 @@ TEST(PictureLayerTest, UseTileGridSize) {
host->SetRootLayer(layer);
// Tile-grid is set according to its setting.
- SkTileGridFactory::TileGridInfo info =
- layer->GetRecordingSourceForTesting()->GetTileGridInfoForTesting();
- EXPECT_EQ(info.fTileInterval.width(), 123 - 2 * info.fMargin.width());
- EXPECT_EQ(info.fTileInterval.height(), 123 - 2 * info.fMargin.height());
+ gfx::Size size =
+ layer->GetRecordingSourceForTesting()->GetTileGridSizeForTesting();
+ EXPECT_EQ(size.width(), 123);
+ EXPECT_EQ(size.height(), 123);
}
} // namespace
diff --git a/cc/resources/display_list_recording_source.cc b/cc/resources/display_list_recording_source.cc
index a3c3d47..7198b91 100644
--- a/cc/resources/display_list_recording_source.cc
+++ b/cc/resources/display_list_recording_source.cc
@@ -130,9 +130,8 @@ scoped_refptr<RasterSource> DisplayListRecordingSource::CreateRasterSource()
DisplayListRasterSource::CreateFromDisplayListRecordingSource(this));
}
-SkTileGridFactory::TileGridInfo
-DisplayListRecordingSource::GetTileGridInfoForTesting() const {
- return SkTileGridFactory::TileGridInfo();
+gfx::Size DisplayListRecordingSource::GetTileGridSizeForTesting() const {
+ return gfx::Size();
}
void DisplayListRecordingSource::DetermineIfSolidColor() {
diff --git a/cc/resources/display_list_recording_source.h b/cc/resources/display_list_recording_source.h
index 6bc8208..bc87c12 100644
--- a/cc/resources/display_list_recording_source.h
+++ b/cc/resources/display_list_recording_source.h
@@ -34,7 +34,7 @@ class CC_EXPORT DisplayListRecordingSource : public RecordingSource {
bool IsSuitableForGpuRasterization() const override;
void SetTileGridSize(const gfx::Size& tile_grid_size) override;
void SetUnsuitableForGpuRasterizationForTesting() override;
- SkTileGridFactory::TileGridInfo GetTileGridInfoForTesting() const override;
+ gfx::Size GetTileGridSizeForTesting() const override;
protected:
void Clear();
diff --git a/cc/resources/picture.cc b/cc/resources/picture.cc
index e0435dc..d878ce3 100644
--- a/cc/resources/picture.cc
+++ b/cc/resources/picture.cc
@@ -19,7 +19,6 @@
#include "cc/debug/traced_value.h"
#include "cc/layers/content_layer_client.h"
#include "skia/ext/pixel_ref_utils.h"
-#include "third_party/skia/include/core/SkBBHFactory.h"
#include "third_party/skia/include/core/SkCanvas.h"
#include "third_party/skia/include/core/SkDrawPictureCallback.h"
#include "third_party/skia/include/core/SkPaint.h"
@@ -54,17 +53,16 @@ bool DecodeBitmap(const void* buffer, size_t size, SkBitmap* bm) {
} // namespace
-scoped_refptr<Picture> Picture::Create(
- const gfx::Rect& layer_rect,
- ContentLayerClient* client,
- const SkTileGridFactory::TileGridInfo& tile_grid_info,
- bool gather_pixel_refs,
- RecordingMode recording_mode) {
+scoped_refptr<Picture> Picture::Create(const gfx::Rect& layer_rect,
+ ContentLayerClient* client,
+ const gfx::Size& tile_grid_size,
+ bool gather_pixel_refs,
+ RecordingMode recording_mode) {
scoped_refptr<Picture> picture = make_scoped_refptr(new Picture(layer_rect));
- picture->Record(client, tile_grid_info, recording_mode);
+ picture->Record(client, tile_grid_size, recording_mode);
if (gather_pixel_refs)
- picture->GatherPixelRefs(tile_grid_info);
+ picture->GatherPixelRefs(tile_grid_size);
return picture;
}
@@ -170,7 +168,7 @@ bool Picture::HasText() const {
}
void Picture::Record(ContentLayerClient* painter,
- const SkTileGridFactory::TileGridInfo& tile_grid_info,
+ const gfx::Size& tile_grid_size,
RecordingMode recording_mode) {
TRACE_EVENT2("cc",
"Picture::Record",
@@ -180,7 +178,7 @@ void Picture::Record(ContentLayerClient* painter,
recording_mode);
DCHECK(!picture_);
- DCHECK(!tile_grid_info.fTileInterval.isEmpty());
+ DCHECK(!tile_grid_size.IsEmpty());
// TODO(mtklein): If SkRTree sticks, clean up tile_grid_info. skbug.com/3085
SkRTreeFactory factory;
@@ -232,8 +230,7 @@ void Picture::Record(ContentLayerClient* painter,
EmitTraceSnapshot();
}
-void Picture::GatherPixelRefs(
- const SkTileGridFactory::TileGridInfo& tile_grid_info) {
+void Picture::GatherPixelRefs(const gfx::Size& tile_grid_size) {
TRACE_EVENT2("cc", "Picture::GatherPixelRefs",
"width", layer_rect_.width(),
"height", layer_rect_.height());
@@ -242,11 +239,7 @@ void Picture::GatherPixelRefs(
DCHECK(pixel_refs_.empty());
if (!WillPlayBackBitmaps())
return;
- cell_size_ = gfx::Size(
- tile_grid_info.fTileInterval.width() +
- 2 * tile_grid_info.fMargin.width(),
- tile_grid_info.fTileInterval.height() +
- 2 * tile_grid_info.fMargin.height());
+ cell_size_ = tile_grid_size;
DCHECK_GT(cell_size_.width(), 0);
DCHECK_GT(cell_size_.height(), 0);
diff --git a/cc/resources/picture.h b/cc/resources/picture.h
index a3d252a8..75f92f2 100644
--- a/cc/resources/picture.h
+++ b/cc/resources/picture.h
@@ -19,7 +19,6 @@
#include "cc/base/cc_export.h"
#include "cc/base/region.h"
#include "skia/ext/refptr.h"
-#include "third_party/skia/include/core/SkBBHFactory.h"
#include "third_party/skia/include/core/SkPicture.h"
#include "ui/gfx/geometry/rect.h"
@@ -52,12 +51,11 @@ class CC_EXPORT Picture
RECORDING_MODE_COUNT, // Must be the last entry.
};
- static scoped_refptr<Picture> Create(
- const gfx::Rect& layer_rect,
- ContentLayerClient* client,
- const SkTileGridFactory::TileGridInfo& tile_grid_info,
- bool gather_pixels_refs,
- RecordingMode recording_mode);
+ static scoped_refptr<Picture> Create(const gfx::Rect& layer_rect,
+ ContentLayerClient* client,
+ const gfx::Size& tile_grid_size,
+ bool gather_pixels_refs,
+ RecordingMode recording_mode);
static scoped_refptr<Picture> CreateFromValue(const base::Value* value);
static scoped_refptr<Picture> CreateFromSkpValue(const base::Value* value);
@@ -142,11 +140,11 @@ class CC_EXPORT Picture
// Record a paint operation. To be able to safely use this SkPicture for
// playback on a different thread this can only be called once.
void Record(ContentLayerClient* client,
- const SkTileGridFactory::TileGridInfo& tile_grid_info,
+ const gfx::Size& tile_grid_size,
RecordingMode recording_mode);
// Gather pixel refs from recording.
- void GatherPixelRefs(const SkTileGridFactory::TileGridInfo& tile_grid_info);
+ void GatherPixelRefs(const gfx::Size& tile_grid_info);
gfx::Rect layer_rect_;
skia::RefPtr<SkPicture> picture_;
diff --git a/cc/resources/picture_pile.cc b/cc/resources/picture_pile.cc
index 31bc2d3..1057d2d 100644
--- a/cc/resources/picture_pile.cc
+++ b/cc/resources/picture_pile.cc
@@ -25,7 +25,6 @@ const int kOpCountThatIsOkToAnalyze = 10;
// Dimensions of the tiles in this picture pile as well as the dimensions of
// the base picture in each tile.
const int kBasePictureSize = 512;
-const int kTileGridBorderPixels = 1;
// Invalidation frequency settings. kInvalidationFrequencyThreshold is a value
// between 0 and 1 meaning invalidation frequency between 0% and 100% that
@@ -167,9 +166,6 @@ PicturePile::PicturePile()
pixel_record_distance_(kPixelDistanceToRecord),
is_suitable_for_gpu_rasterization_(true) {
tiling_.SetMaxTextureSize(gfx::Size(kBasePictureSize, kBasePictureSize));
- tile_grid_info_.fTileInterval.setEmpty();
- tile_grid_info_.fMargin.setEmpty();
- tile_grid_info_.fOffset.setZero();
}
PicturePile::~PicturePile() {
@@ -548,7 +544,7 @@ void PicturePile::CreatePictures(ContentLayerClient* painter,
bool gather_pixel_refs = TileTaskWorkerPool::GetNumWorkerThreads() > 1;
for (int i = 0; i < repeat_count; i++) {
- picture = Picture::Create(padded_record_rect, painter, tile_grid_info_,
+ picture = Picture::Create(padded_record_rect, painter, tile_grid_size_,
gather_pixel_refs, recording_mode);
// Note the '&&' with previous is-suitable state.
// This means that once a picture-pile becomes unsuitable for gpu
@@ -628,31 +624,19 @@ bool PicturePile::IsSuitableForGpuRasterization() const {
return is_suitable_for_gpu_rasterization_;
}
-// static
-void PicturePile::ComputeTileGridInfo(const gfx::Size& tile_grid_size,
- SkTileGridFactory::TileGridInfo* info) {
- DCHECK(info);
- info->fTileInterval.set(tile_grid_size.width() - 2 * kTileGridBorderPixels,
- tile_grid_size.height() - 2 * kTileGridBorderPixels);
- DCHECK_GT(info->fTileInterval.width(), 0);
- DCHECK_GT(info->fTileInterval.height(), 0);
- info->fMargin.set(kTileGridBorderPixels, kTileGridBorderPixels);
- // Offset the tile grid coordinate space to take into account the fact
- // that the top-most and left-most tiles do not have top and left borders
- // respectively.
- info->fOffset.set(-kTileGridBorderPixels, -kTileGridBorderPixels);
-}
-
void PicturePile::SetTileGridSize(const gfx::Size& tile_grid_size) {
- ComputeTileGridInfo(tile_grid_size, &tile_grid_info_);
+ DCHECK_GT(tile_grid_size.width(), 0);
+ DCHECK_GT(tile_grid_size.height(), 0);
+
+ tile_grid_size_ = tile_grid_size;
}
void PicturePile::SetUnsuitableForGpuRasterizationForTesting() {
is_suitable_for_gpu_rasterization_ = false;
}
-SkTileGridFactory::TileGridInfo PicturePile::GetTileGridInfoForTesting() const {
- return tile_grid_info_;
+gfx::Size PicturePile::GetTileGridSizeForTesting() const {
+ return tile_grid_size_;
}
bool PicturePile::CanRasterSlowTileCheck(const gfx::Rect& layer_rect) const {
diff --git a/cc/resources/picture_pile.h b/cc/resources/picture_pile.h
index fd1c454..0a67c09 100644
--- a/cc/resources/picture_pile.h
+++ b/cc/resources/picture_pile.h
@@ -39,10 +39,7 @@ class CC_EXPORT PicturePile : public RecordingSource {
bool IsSuitableForGpuRasterization() const override;
void SetTileGridSize(const gfx::Size& tile_grid_size) override;
void SetUnsuitableForGpuRasterizationForTesting() override;
- SkTileGridFactory::TileGridInfo GetTileGridInfoForTesting() const override;
-
- static void ComputeTileGridInfo(const gfx::Size& tile_grid_size,
- SkTileGridFactory::TileGridInfo* info);
+ gfx::Size GetTileGridSizeForTesting() const override;
protected:
class CC_EXPORT PictureInfo {
@@ -94,7 +91,7 @@ class CC_EXPORT PicturePile : public RecordingSource {
// recorded.
gfx::Rect recorded_viewport_;
float min_contents_scale_;
- SkTileGridFactory::TileGridInfo tile_grid_info_;
+ gfx::Size tile_grid_size_;
int slow_down_raster_scale_factor_for_debug_;
bool can_use_lcd_text_;
// A hint about whether there are any recordings. This may be a false
diff --git a/cc/resources/picture_unittest.cc b/cc/resources/picture_unittest.cc
index 07faf0c..0c41215 100644
--- a/cc/resources/picture_unittest.cc
+++ b/cc/resources/picture_unittest.cc
@@ -10,7 +10,6 @@
#include "cc/test/fake_content_layer_client.h"
#include "cc/test/skia_common.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/skia/include/core/SkBBHFactory.h"
#include "third_party/skia/include/core/SkGraphics.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/skia_util.h"
@@ -23,10 +22,7 @@ TEST(PictureTest, AsBase64String) {
gfx::Rect layer_rect(100, 100);
- SkTileGridFactory::TileGridInfo tile_grid_info;
- tile_grid_info.fTileInterval = SkISize::Make(100, 100);
- tile_grid_info.fMargin.setEmpty();
- tile_grid_info.fOffset.setZero();
+ gfx::Size tile_grid_size(100, 100);
FakeContentLayerClient content_layer_client;
@@ -47,10 +43,7 @@ TEST(PictureTest, AsBase64String) {
content_layer_client.add_draw_rect(layer_rect, red_paint);
scoped_refptr<Picture> one_rect_picture =
- Picture::Create(layer_rect,
- &content_layer_client,
- tile_grid_info,
- false,
+ Picture::Create(layer_rect, &content_layer_client, tile_grid_size, false,
Picture::RECORD_NORMALLY);
scoped_ptr<base::Value> serialized_one_rect(one_rect_picture->AsValue());
@@ -72,10 +65,7 @@ TEST(PictureTest, AsBase64String) {
content_layer_client.add_draw_rect(gfx::Rect(25, 25, 50, 50), green_paint);
scoped_refptr<Picture> two_rect_picture =
- Picture::Create(layer_rect,
- &content_layer_client,
- tile_grid_info,
- false,
+ Picture::Create(layer_rect, &content_layer_client, tile_grid_size, false,
Picture::RECORD_NORMALLY);
scoped_ptr<base::Value> serialized_two_rect(two_rect_picture->AsValue());
@@ -98,10 +88,7 @@ TEST(PictureTest, AsBase64String) {
TEST(PictureTest, PixelRefIterator) {
gfx::Rect layer_rect(2048, 2048);
- SkTileGridFactory::TileGridInfo tile_grid_info;
- tile_grid_info.fTileInterval = SkISize::Make(512, 512);
- tile_grid_info.fMargin.setEmpty();
- tile_grid_info.fOffset.setZero();
+ gfx::Size tile_grid_size(512, 512);
FakeContentLayerClient content_layer_client;
@@ -129,11 +116,9 @@ TEST(PictureTest, PixelRefIterator) {
}
}
- scoped_refptr<Picture> picture = Picture::Create(layer_rect,
- &content_layer_client,
- tile_grid_info,
- true,
- Picture::RECORD_NORMALLY);
+ scoped_refptr<Picture> picture =
+ Picture::Create(layer_rect, &content_layer_client, tile_grid_size, true,
+ Picture::RECORD_NORMALLY);
// Default iterator does not have any pixel refs
{
@@ -198,10 +183,7 @@ TEST(PictureTest, PixelRefIterator) {
TEST(PictureTest, PixelRefIteratorNonZeroLayer) {
gfx::Rect layer_rect(1024, 0, 2048, 2048);
- SkTileGridFactory::TileGridInfo tile_grid_info;
- tile_grid_info.fTileInterval = SkISize::Make(512, 512);
- tile_grid_info.fMargin.setEmpty();
- tile_grid_info.fOffset.setZero();
+ gfx::Size tile_grid_size(512, 512);
FakeContentLayerClient content_layer_client;
@@ -229,11 +211,9 @@ TEST(PictureTest, PixelRefIteratorNonZeroLayer) {
}
}
- scoped_refptr<Picture> picture = Picture::Create(layer_rect,
- &content_layer_client,
- tile_grid_info,
- true,
- Picture::RECORD_NORMALLY);
+ scoped_refptr<Picture> picture =
+ Picture::Create(layer_rect, &content_layer_client, tile_grid_size, true,
+ Picture::RECORD_NORMALLY);
// Default iterator does not have any pixel refs
{
@@ -321,10 +301,7 @@ TEST(PictureTest, PixelRefIteratorNonZeroLayer) {
TEST(PictureTest, PixelRefIteratorOnePixelQuery) {
gfx::Rect layer_rect(2048, 2048);
- SkTileGridFactory::TileGridInfo tile_grid_info;
- tile_grid_info.fTileInterval = SkISize::Make(512, 512);
- tile_grid_info.fMargin.setEmpty();
- tile_grid_info.fOffset.setZero();
+ gfx::Size tile_grid_size(512, 512);
FakeContentLayerClient content_layer_client;
@@ -352,11 +329,9 @@ TEST(PictureTest, PixelRefIteratorOnePixelQuery) {
}
}
- scoped_refptr<Picture> picture = Picture::Create(layer_rect,
- &content_layer_client,
- tile_grid_info,
- true,
- Picture::RECORD_NORMALLY);
+ scoped_refptr<Picture> picture =
+ Picture::Create(layer_rect, &content_layer_client, tile_grid_size, true,
+ Picture::RECORD_NORMALLY);
for (int y = 0; y < 4; ++y) {
for (int x = 0; x < 4; ++x) {
@@ -378,10 +353,7 @@ TEST(PictureTest, CreateFromSkpValue) {
gfx::Rect layer_rect(100, 200);
- SkTileGridFactory::TileGridInfo tile_grid_info;
- tile_grid_info.fTileInterval = SkISize::Make(100, 200);
- tile_grid_info.fMargin.setEmpty();
- tile_grid_info.fOffset.setZero();
+ gfx::Size tile_grid_size(100, 200);
FakeContentLayerClient content_layer_client;
@@ -401,10 +373,7 @@ TEST(PictureTest, CreateFromSkpValue) {
// Single full-size rect picture.
content_layer_client.add_draw_rect(layer_rect, red_paint);
scoped_refptr<Picture> one_rect_picture =
- Picture::Create(layer_rect,
- &content_layer_client,
- tile_grid_info,
- false,
+ Picture::Create(layer_rect, &content_layer_client, tile_grid_size, false,
Picture::RECORD_NORMALLY);
scoped_ptr<base::Value> serialized_one_rect(
one_rect_picture->AsValue());
@@ -430,39 +399,28 @@ TEST(PictureTest, RecordingModes) {
gfx::Rect layer_rect(100, 200);
- SkTileGridFactory::TileGridInfo tile_grid_info;
- tile_grid_info.fTileInterval = SkISize::Make(100, 200);
- tile_grid_info.fMargin.setEmpty();
- tile_grid_info.fOffset.setZero();
+ gfx::Size tile_grid_size(100, 200);
FakeContentLayerClient content_layer_client;
EXPECT_EQ(NULL, content_layer_client.last_canvas());
- scoped_refptr<Picture> picture = Picture::Create(layer_rect,
- &content_layer_client,
- tile_grid_info,
- false,
- Picture::RECORD_NORMALLY);
+ scoped_refptr<Picture> picture =
+ Picture::Create(layer_rect, &content_layer_client, tile_grid_size, false,
+ Picture::RECORD_NORMALLY);
EXPECT_TRUE(content_layer_client.last_canvas() != NULL);
EXPECT_EQ(ContentLayerClient::GRAPHICS_CONTEXT_ENABLED,
content_layer_client.last_context_status());
EXPECT_TRUE(picture.get());
- picture = Picture::Create(layer_rect,
- &content_layer_client,
- tile_grid_info,
- false,
- Picture::RECORD_WITH_SK_NULL_CANVAS);
+ picture = Picture::Create(layer_rect, &content_layer_client, tile_grid_size,
+ false, Picture::RECORD_WITH_SK_NULL_CANVAS);
EXPECT_TRUE(content_layer_client.last_canvas() != NULL);
EXPECT_EQ(ContentLayerClient::GRAPHICS_CONTEXT_ENABLED,
content_layer_client.last_context_status());
EXPECT_TRUE(picture.get());
- picture = Picture::Create(layer_rect,
- &content_layer_client,
- tile_grid_info,
- false,
- Picture::RECORD_WITH_PAINTING_DISABLED);
+ picture = Picture::Create(layer_rect, &content_layer_client, tile_grid_size,
+ false, Picture::RECORD_WITH_PAINTING_DISABLED);
EXPECT_TRUE(content_layer_client.last_canvas() != NULL);
EXPECT_EQ(ContentLayerClient::GRAPHICS_CONTEXT_DISABLED,
content_layer_client.last_context_status());
diff --git a/cc/resources/recording_source.h b/cc/resources/recording_source.h
index 173e1a0..7af2255 100644
--- a/cc/resources/recording_source.h
+++ b/cc/resources/recording_source.h
@@ -7,7 +7,6 @@
#include "cc/base/cc_export.h"
#include "cc/resources/picture.h"
-#include "third_party/skia/include/core/SkBBHFactory.h"
#include "third_party/skia/include/core/SkColor.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/geometry/size.h"
@@ -47,7 +46,7 @@ class CC_EXPORT RecordingSource {
// TODO(hendrikw): Figure out how to remove this.
virtual void SetUnsuitableForGpuRasterizationForTesting() = 0;
- virtual SkTileGridFactory::TileGridInfo GetTileGridInfoForTesting() const = 0;
+ virtual gfx::Size GetTileGridSizeForTesting() const = 0;
};
} // namespace cc
diff --git a/cc/test/fake_picture_pile_impl.cc b/cc/test/fake_picture_pile_impl.cc
index 8b6cb8d..c400298 100644
--- a/cc/test/fake_picture_pile_impl.cc
+++ b/cc/test/fake_picture_pile_impl.cc
@@ -24,7 +24,7 @@ FakePicturePileImpl::FakePicturePileImpl(
base::WaitableEvent* playback_allowed_event)
: PicturePileImpl(other),
playback_allowed_event_(playback_allowed_event),
- tile_grid_info_(other->GetTileGridInfoForTesting()) {
+ tile_grid_size_(other->GetTileGridSizeForTesting()) {
}
FakePicturePileImpl::~FakePicturePileImpl() {}
@@ -118,7 +118,7 @@ void FakePicturePileImpl::AddRecordingAt(int x, int y) {
bounds.Inset(-buffer_pixels(), -buffer_pixels());
scoped_refptr<Picture> picture(Picture::Create(
- bounds, &client_, tile_grid_info_, true, Picture::RECORD_NORMALLY));
+ bounds, &client_, tile_grid_size_, true, Picture::RECORD_NORMALLY));
picture_map_[std::pair<int, int>(x, y)].SetPicture(picture);
EXPECT_TRUE(HasRecordingAt(x, y));
diff --git a/cc/test/fake_picture_pile_impl.h b/cc/test/fake_picture_pile_impl.h
index 4f7b5af..3a43702 100644
--- a/cc/test/fake_picture_pile_impl.h
+++ b/cc/test/fake_picture_pile_impl.h
@@ -102,7 +102,7 @@ class FakePicturePileImpl : public PicturePileImpl {
FakeContentLayerClient client_;
SkPaint default_paint_;
base::WaitableEvent* playback_allowed_event_;
- SkTileGridFactory::TileGridInfo tile_grid_info_;
+ gfx::Size tile_grid_size_;
};
} // namespace cc
generated by cgit v1.1 at 2024-09-21 02:52:36 +0000