diff options
| author | pdr <pdr@chromium.org> | 2014-10-25 17:12:07 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-26 00:12:25 +0000 |
| commit | 3b9478b2e834e05242772cf054730cff2491e84f (patch) | |
| tree | f36829ceb17b5e2621d4507b3f9363c3b2616735 /cc/test/fake_picture_layer_tiling_client.h | |
| parent | 4f2e5f49c05805761065b3ce7f97e9258ffbd4c9 (diff) | |
| download | chromium_src-3b9478b2e834e05242772cf054730cff2491e84f.zip chromium_src-3b9478b2e834e05242772cf054730cff2491e84f.tar.gz chromium_src-3b9478b2e834e05242772cf054730cff2491e84f.tar.bz2 | |
Revert two cc patches due to crashes on canary.
This is a revert of two cc patches:
1) cc: Always use invalidation on the pending tree when deciding to share
https://crrev.com/82e46120237bc023559ac7ebddb29e21b6530170
2) cc: Always keep the PictureLayerImpl::twin_layer_ pointer valid
https://crrev.com/11f13546fd3ee3d53921c23861bf970bd2bb6428
These are being reverted together because (1) depends on (2). Landing
through the CQ to prevent too much chaos muppet.
Reason for revert:
I suspect these patches are causing canary crashers (see http://crbug.com/427215)
TBR=enne@chromium.org,vmpstr@chromium.org,danakj@chromium.org
BUG=407418,387116,427215
Review URL: https://codereview.chromium.org/680793002
Cr-Commit-Position: refs/heads/master@{#301299}
Diffstat (limited to 'cc/test/fake_picture_layer_tiling_client.h')
| -rw-r--r-- | cc/test/fake_picture_layer_tiling_client.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cc/test/fake_picture_layer_tiling_client.h b/cc/test/fake_picture_layer_tiling_client.h index c128990..0e2f645 100644 --- a/cc/test/fake_picture_layer_tiling_client.h +++ b/cc/test/fake_picture_layer_tiling_client.h @@ -33,8 +33,8 @@ class FakePictureLayerTilingClient : public PictureLayerTilingClient { void SetTileSize(const gfx::Size& tile_size); gfx::Size TileSize() const { return tile_size_; } - const Region* GetPendingInvalidation() override; - const PictureLayerTiling* GetPendingOrActiveTwinTiling( + const Region* GetInvalidation() override; + const PictureLayerTiling* GetTwinTiling( const PictureLayerTiling* tiling) const override; PictureLayerTiling* GetRecycledTwinTiling( const PictureLayerTiling* tiling) override; |