diff options
| author | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-11 04:14:20 +0000 |
|---|---|---|
| committer | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-11 04:14:20 +0000 |
| commit | 2cafb0338961f864d221913239532bb81253bfb1 (patch) | |
| tree | cb803d5bc3defad2172042f44d877756a1dcd171 /cc | |
| parent | cc153ef90fb419aaeb862a982d6630e3f3aeba50 (diff) | |
| download | chromium_src-2cafb0338961f864d221913239532bb81253bfb1.zip chromium_src-2cafb0338961f864d221913239532bb81253bfb1.tar.gz chromium_src-2cafb0338961f864d221913239532bb81253bfb1.tar.bz2 | |
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
Review URL: https://codereview.chromium.org/150403007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250332 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, 8 insertions, 2 deletions
diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc index b5342df..a8641ce 100644 --- a/cc/layers/picture_layer_impl.cc +++ b/cc/layers/picture_layer_impl.cc @@ -763,6 +763,10 @@ 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 c71fe5b..d3a6921 100644 --- a/cc/layers/picture_layer_impl_unittest.cc +++ b/cc/layers/picture_layer_impl_unittest.cc @@ -1298,7 +1298,8 @@ TEST_F(PictureLayerImplTest, HighResRequiredWhenMissingHighResFlagOn) { AssertNoTilesRequired(pending_layer_->LowResTiling()); } -TEST_F(PictureLayerImplTest, NothingRequiredIfAllHighResTilesShared) { +// TODO(enne): temporarily disabled: http://crbug.com/335289 +TEST_F(PictureLayerImplTest, DISABLED_NothingRequiredIfAllHighResTilesShared) { gfx::Size layer_bounds(400, 400); gfx::Size tile_size(100, 100); SetupDefaultTreesWithFixedTileSize(layer_bounds, tile_size); @@ -1316,7 +1317,8 @@ TEST_F(PictureLayerImplTest, NothingRequiredIfAllHighResTilesShared) { AssertNoTilesRequired(pending_layer_->LowResTiling()); } -TEST_F(PictureLayerImplTest, NothingRequiredIfActiveMissingTiles) { +// TODO(enne): temporarily disabled: http://crbug.com/335289 +TEST_F(PictureLayerImplTest, DISABLED_NothingRequiredIfActiveMissingTiles) { gfx::Size layer_bounds(400, 400); gfx::Size tile_size(100, 100); scoped_refptr<FakePicturePileImpl> pending_pile = |