Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3226)

Unified Diff: cc/resources/tile.cc

Issue 669813003: Update from chromium https://crrev.com/301725/ (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/resources/tile.h ('k') | cc/resources/tile_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resources/tile.cc
diff --git a/cc/resources/tile.cc b/cc/resources/tile.cc
index e994a5ec94d41e1c89b04c0fd9f7c99989ba4185..d6bd3c4b58338aa125b97992869c9286fa272ec1 100644
--- a/cc/resources/tile.cc
+++ b/cc/resources/tile.cc
@@ -17,7 +17,7 @@ namespace cc {
Tile::Id Tile::s_next_id_ = 0;
Tile::Tile(TileManager* tile_manager,
- PicturePileImpl* picture_pile,
+ RasterSource* raster_source,
const gfx::Size& tile_size,
const gfx::Rect& content_rect,
float contents_scale,
@@ -37,7 +37,7 @@ Tile::Tile(TileManager* tile_manager,
tiling_j_index_(-1),
required_for_activation_(false),
id_(s_next_id_++) {
- set_picture_pile(picture_pile);
+ set_raster_source(raster_source);
for (int i = 0; i < NUM_TREES; i++)
is_occluded_[i] = false;
}
@@ -51,7 +51,7 @@ Tile::~Tile() {
void Tile::AsValueInto(base::debug::TracedValue* res) const {
TracedValue::MakeDictIntoImplicitSnapshotWithCategory(
TRACE_DISABLED_BY_DEFAULT("cc.debug"), res, "cc::Tile", this);
- TracedValue::SetIDRef(picture_pile_.get(), res, "picture_pile");
+ TracedValue::SetIDRef(raster_source_.get(), res, "picture_pile");
res->SetDouble("contents_scale", contents_scale_);
res->BeginArray("content_rect");
« no previous file with comments | « cc/resources/tile.h ('k') | cc/resources/tile_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698