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

Unified Diff: cc/layers/picture_layer_impl.h

Issue 676953003: cc: Always keep the PictureLayerImpl::twin_layer_ pointer valid. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: twins: add-test-case 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
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..8ba9b15c6a6198a0edba27dccb42e12e2ffacabb 100644
--- a/cc/layers/picture_layer_impl.h
+++ b/cc/layers/picture_layer_impl.h
@@ -122,7 +122,7 @@ class CC_EXPORT PictureLayerImpl
PicturePileImpl* GetPile() override;
gfx::Size CalculateTileSize(const gfx::Size& content_bounds) const override;
const Region* GetInvalidation() override;
- const PictureLayerTiling* GetTwinTiling(
+ 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_)

Powered by Google App Engine
This is Rietveld 408576698