| Index: cc/layers/picture_layer_impl_unittest.cc
|
| diff --git a/cc/layers/picture_layer_impl_unittest.cc b/cc/layers/picture_layer_impl_unittest.cc
|
| index f6968c6ba08488fec42fe4ce939bb5ec6f9a0c4e..3e0d73492cce2d446122f55832524d463f0800e7 100644
|
| --- a/cc/layers/picture_layer_impl_unittest.cc
|
| +++ b/cc/layers/picture_layer_impl_unittest.cc
|
| @@ -4770,8 +4770,8 @@
|
| result = layer->CalculateTileSize(gfx::Size(10000, 10000));
|
| EXPECT_EQ(result.width(),
|
| MathUtil::UncheckedRoundUp(
|
| - 2000 + 2 * PictureLayerTiling::kBorderTexels, 64));
|
| - EXPECT_EQ(result.height(), 512); // 500 + 2, 64-byte aligned.
|
| + 2000 + 2 * PictureLayerTiling::kBorderTexels, 4));
|
| + EXPECT_EQ(result.height(), 504); // 500 + 2, 4-byte aligned.
|
|
|
| // Clamp and round-up, when smaller than viewport.
|
| // Tile-height doubles to 50% when width shrinks to <= 50%.
|
| @@ -4779,7 +4779,7 @@
|
| layer->set_gpu_raster_max_texture_size(host_impl()->device_viewport_size());
|
| result = layer->CalculateTileSize(gfx::Size(447, 10000));
|
| EXPECT_EQ(result.width(), 448);
|
| - EXPECT_EQ(result.height(), 512); // 500 + 2, 64-byte aliged.
|
| + EXPECT_EQ(result.height(), 504); // 500 + 2, 4-byte aliged.
|
|
|
| // Largest layer is 50% of viewport width (rounded up), and
|
| // 50% of viewport in height.
|
| @@ -4788,7 +4788,7 @@
|
| EXPECT_EQ(result.height(), 448);
|
| result = layer->CalculateTileSize(gfx::Size(500, 499));
|
| EXPECT_EQ(result.width(), 512);
|
| - EXPECT_EQ(result.height(), 512); // 500 + 2, 64-byte aligned.
|
| + EXPECT_EQ(result.height(), 504); // 500 + 2, 4-byte aligned.
|
| }
|
|
|
| TEST_F(NoLowResPictureLayerImplTest, LowResWasHighResCollision) {
|
|
|