Chromium Code Reviews| 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 3272712258474ed01847db86a5470563f746d461..533d82bf0ad43003ab4aa4fccb4b8257ca1506d6 100644 |
| --- a/cc/layers/picture_layer_impl_unittest.cc |
| +++ b/cc/layers/picture_layer_impl_unittest.cc |
| @@ -677,12 +677,12 @@ TEST_F(PictureLayerImplTest, DontAddLowResDuringAnimation) { |
| EXPECT_BOTH_EQ(num_tilings(), 2u); |
| // Page scale animation, new high res, but not new low res because animating. |
| - contents_scale = 4.f; |
| - page_scale = 4.f; |
| + contents_scale = 2.f; |
|
vmpstr
2013/08/05 18:41:27
This change is here since with the new low res con
|
| + page_scale = 2.f; |
| animating_transform = true; |
| SetContentsScaleOnBothLayers( |
| contents_scale, device_scale, page_scale, animating_transform); |
| - EXPECT_BOTH_EQ(HighResTiling()->contents_scale(), 4.f); |
| + EXPECT_BOTH_EQ(HighResTiling()->contents_scale(), 2.f); |
| EXPECT_BOTH_EQ(LowResTiling()->contents_scale(), low_res_factor); |
| EXPECT_BOTH_EQ(num_tilings(), 3u); |
| @@ -690,8 +690,8 @@ TEST_F(PictureLayerImplTest, DontAddLowResDuringAnimation) { |
| animating_transform = false; |
| SetContentsScaleOnBothLayers( |
| contents_scale, device_scale, page_scale, animating_transform); |
| - EXPECT_BOTH_EQ(HighResTiling()->contents_scale(), 4.f); |
| - EXPECT_BOTH_EQ(LowResTiling()->contents_scale(), 4.f * low_res_factor); |
| + EXPECT_BOTH_EQ(HighResTiling()->contents_scale(), 2.f); |
| + EXPECT_BOTH_EQ(LowResTiling()->contents_scale(), 2.f * low_res_factor); |
| EXPECT_BOTH_EQ(num_tilings(), 4u); |
| } |