diff options
| author | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-24 01:02:25 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-24 01:02:25 +0000 |
| commit | de14c2cabf18b1ffa957ef054f63b25a188cafb4 (patch) | |
| tree | 474c793e445ef4206d40aa169b122090e44f2201 /cc/debug | |
| parent | 40815c8f23b107d2033ab13c0f9fbe326efd6e20 (diff) | |
| download | chromium_src-de14c2cabf18b1ffa957ef054f63b25a188cafb4.zip chromium_src-de14c2cabf18b1ffa957ef054f63b25a188cafb4.tar.gz chromium_src-de14c2cabf18b1ffa957ef054f63b25a188cafb4.tar.bz2 | |
Update Chromium to new Skia headers & beginRecording signature
As of Skia r14295 the SkPictureRecorder class resides in
its own header (SkPictureRecorder.h) and beginRecording
takes an additional (factory) parameter. Temporarily the
new signature doesn't allow default parameters so as to
avoid compiler confusion with the deprecated signature.
The SkTileGridPicture has been replaced by the
SkTileGridFactory which is now passed into beginRecording.
Note: this cannot be landed until Skia r14295 is rolled
into Chromium (presumably this morning).
enne : cc
fmalita: skia
Review URL: https://codereview.chromium.org/246753009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@265803 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/debug')
| -rw-r--r-- | cc/debug/picture_record_benchmark.cc | 2 | ||||
| -rw-r--r-- | cc/debug/rasterize_and_record_benchmark.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cc/debug/picture_record_benchmark.cc b/cc/debug/picture_record_benchmark.cc index 3b372d2..a1528c3 100644 --- a/cc/debug/picture_record_benchmark.cc +++ b/cc/debug/picture_record_benchmark.cc @@ -91,7 +91,7 @@ void PictureRecordBenchmark::RunOnLayer(PictureLayer* layer) { ContentLayerClient* painter = layer->client(); gfx::Size content_bounds = layer->content_bounds(); - SkTileGridPicture::TileGridInfo tile_grid_info; + SkTileGridFactory::TileGridInfo tile_grid_info; tile_grid_info.fTileInterval.set(kTileGridSize - 2 * kTileGridBorder, kTileGridSize - 2 * kTileGridBorder); tile_grid_info.fMargin.set(kTileGridBorder, kTileGridBorder); diff --git a/cc/debug/rasterize_and_record_benchmark.cc b/cc/debug/rasterize_and_record_benchmark.cc index e41c968..e098190 100644 --- a/cc/debug/rasterize_and_record_benchmark.cc +++ b/cc/debug/rasterize_and_record_benchmark.cc @@ -108,7 +108,7 @@ void RasterizeAndRecordBenchmark::RunOnLayer(PictureLayer* layer) { DCHECK(host_); gfx::Size tile_grid_size = host_->settings().default_tile_size; - SkTileGridPicture::TileGridInfo tile_grid_info; + SkTileGridFactory::TileGridInfo tile_grid_info; PicturePileBase::ComputeTileGridInfo(tile_grid_size, &tile_grid_info); gfx::Rect visible_content_rect = gfx::ScaleToEnclosingRect( |