Index: cc/layers/picture_layer_impl.h |
diff --git a/cc/layers/picture_layer_impl.h b/cc/layers/picture_layer_impl.h |
index 1ac106a7c1bce10fe0bddfbc3b5c46d1ae6a1684..c5aab859da58016fcd0e9e2e19909e52ceaaea7b 100644 |
--- a/cc/layers/picture_layer_impl.h |
+++ b/cc/layers/picture_layer_impl.h |
@@ -119,10 +119,10 @@ class CC_EXPORT PictureLayerImpl |
// PictureLayerTilingClient overrides. |
scoped_refptr<Tile> CreateTile(PictureLayerTiling* tiling, |
const gfx::Rect& content_rect) override; |
- PicturePileImpl* GetPile() override; |
+ RasterSource* GetRasterSource() override; |
gfx::Size CalculateTileSize(const gfx::Size& content_bounds) const override; |
- const Region* GetInvalidation() override; |
- const PictureLayerTiling* GetTwinTiling( |
+ const Region* GetPendingInvalidation() override; |
+ const PictureLayerTiling* GetPendingOrActiveTwinTiling( |
const PictureLayerTiling* tiling) const override; |
PictureLayerTiling* GetRecycledTwinTiling( |
const PictureLayerTiling* tiling) override; |
@@ -144,7 +144,7 @@ class CC_EXPORT PictureLayerImpl |
void RunMicroBenchmark(MicroBenchmarkImpl* benchmark) override; |
// Functions used by tile manager. |
- PictureLayerImpl* GetTwinLayer() { return twin_layer_; } |
+ PictureLayerImpl* GetPendingOrActiveTwinLayer() const; |
bool IsOnActiveOrPendingTree() const; |
// Virtual for testing. |
virtual bool HasValidTilePriorities() const; |
@@ -168,7 +168,7 @@ class CC_EXPORT PictureLayerImpl |
float SnappedContentsScale(float new_contents_scale); |
void ResetRasterScale(); |
gfx::Rect GetViewportForTilePriorityInContentSpace() const; |
- PictureLayerImpl* GetRecycledTwinLayer(); |
+ PictureLayerImpl* GetRecycledTwinLayer() const; |
void DoPostCommitInitializationIfNeeded() { |
if (needs_post_commit_initialization_) |