diff options
| author | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-12 23:47:00 +0000 |
|---|---|---|
| committer | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-12 23:47:00 +0000 |
| commit | cc25dd0cd7c0a18d6abe7f0dcf0f4b31e45cd3fb (patch) | |
| tree | 1c7d7074394d5a8eb8f6a9b121e2937374bcd4a9 /cc | |
| parent | 728324d1b0db65109077f64ac582d2022bf0cb52 (diff) | |
| download | chromium_src-cc25dd0cd7c0a18d6abe7f0dcf0f4b31e45cd3fb.zip chromium_src-cc25dd0cd7c0a18d6abe7f0dcf0f4b31e45cd3fb.tar.gz chromium_src-cc25dd0cd7c0a18d6abe7f0dcf0f4b31e45cd3fb.tar.bz2 | |
Revert of cc: Disable "activate to low res" optimization (https://codereview.chromium.org/150403007/)
Reason for revert:
Reverting temporary patch merged to m33.
Original issue's description:
> cc: Disable "activate to low res" optimization
>
> This optimization is broken on m33 and causes flashing to tabs. Turning
> off the optimization fixes the problem. This is an intentionally small
> patch meant for merging to m33 and then immediately reverting on trunk.
>
> BUG=335289
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=250332
TBR=danakj@chromium.org
BUG=335289
Review URL: https://codereview.chromium.org/161023002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250848 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/layers/picture_layer_impl.cc | 4 | ||||
| -rw-r--r-- | cc/layers/picture_layer_impl_unittest.cc | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc index 859be87..d03abb5 100644 --- a/cc/layers/picture_layer_impl.cc +++ b/cc/layers/picture_layer_impl.cc @@ -762,10 +762,6 @@ void PictureLayerImpl::MarkVisibleResourcesAsRequired() const { twin_low_res = NULL; } - // TODO(enne): temporarily disable this optimization: http://crbug.com/335289 - twin_high_res = NULL; - twin_low_res = NULL; - // As a second pass, mark as required any visible high res tiles not filled in // by acceptable non-ideal tiles from the first pass. if (MarkVisibleTilesAsRequired( diff --git a/cc/layers/picture_layer_impl_unittest.cc b/cc/layers/picture_layer_impl_unittest.cc index d3a6921..c71fe5b 100644 --- a/cc/layers/picture_layer_impl_unittest.cc +++ b/cc/layers/picture_layer_impl_unittest.cc @@ -1298,8 +1298,7 @@ TEST_F(PictureLayerImplTest, HighResRequiredWhenMissingHighResFlagOn) { AssertNoTilesRequired(pending_layer_->LowResTiling()); } -// TODO(enne): temporarily disabled: http://crbug.com/335289 -TEST_F(PictureLayerImplTest, DISABLED_NothingRequiredIfAllHighResTilesShared) { +TEST_F(PictureLayerImplTest, NothingRequiredIfAllHighResTilesShared) { gfx::Size layer_bounds(400, 400); gfx::Size tile_size(100, 100); SetupDefaultTreesWithFixedTileSize(layer_bounds, tile_size); @@ -1317,8 +1316,7 @@ TEST_F(PictureLayerImplTest, DISABLED_NothingRequiredIfAllHighResTilesShared) { AssertNoTilesRequired(pending_layer_->LowResTiling()); } -// TODO(enne): temporarily disabled: http://crbug.com/335289 -TEST_F(PictureLayerImplTest, DISABLED_NothingRequiredIfActiveMissingTiles) { +TEST_F(PictureLayerImplTest, NothingRequiredIfActiveMissingTiles) { gfx::Size layer_bounds(400, 400); gfx::Size tile_size(100, 100); scoped_refptr<FakePicturePileImpl> pending_pile = |