| Index: cc/trees/layer_tree_host_unittest_delegated.cc
|
| diff --git a/cc/trees/layer_tree_host_unittest_delegated.cc b/cc/trees/layer_tree_host_unittest_delegated.cc
|
| index 7ef3c1f81b85dd8741cce0f8e2b83d6c67b03944..d0249d329fcbb22e7b27e33a7797bf74e7d4693a 100644
|
| --- a/cc/trees/layer_tree_host_unittest_delegated.cc
|
| +++ b/cc/trees/layer_tree_host_unittest_delegated.cc
|
| @@ -489,8 +489,6 @@ class LayerTreeHostDelegatedTestLayerUsesFrameDamage
|
| break;
|
| case 3:
|
| // Should create a total amount of gfx::Rect(2, 2, 10, 6) damage.
|
| - // The frame size is 20x20 while the layer is 10x10, so this should
|
| - // produce a gfx::Rect(1, 1, 5, 3) damage rect.
|
| SetFrameData(
|
| CreateFrameData(gfx::Rect(0, 0, 20, 20), gfx::Rect(2, 2, 5, 5)));
|
| SetFrameData(
|
| @@ -537,9 +535,7 @@ class LayerTreeHostDelegatedTestLayerUsesFrameDamage
|
| gfx::Rect(4, 4, 1, 1)));
|
| break;
|
| case 13:
|
| - // Should create gfx::Rect(1, 1, 2, 2) of damage. The frame size is
|
| - // 5x5 and the display size is now set to 10x10, so this should result
|
| - // in a gfx::Rect(2, 2, 4, 4) damage rect.
|
| + // Should create gfx::Rect(1, 1, 2, 2) of damage.
|
| SetFrameData(
|
| CreateFrameData(gfx::Rect(0, 0, 5, 5), gfx::Rect(1, 1, 2, 2)));
|
| break;
|
| @@ -585,6 +581,7 @@ class LayerTreeHostDelegatedTestLayerUsesFrameDamage
|
| // ways.
|
| SetFrameData(
|
| CreateFrameData(gfx::Rect(0, 0, 10, 10), gfx::Rect(3, 3, 1, 1)));
|
| + break;
|
| }
|
| first_draw_for_source_frame_ = true;
|
| }
|
| @@ -618,7 +615,7 @@ class LayerTreeHostDelegatedTestLayerUsesFrameDamage
|
| EXPECT_EQ(gfx::Rect(10, 10).ToString(), damage_rect.ToString());
|
| break;
|
| case 3:
|
| - EXPECT_EQ(gfx::Rect(1, 1, 5, 3).ToString(), damage_rect.ToString());
|
| + EXPECT_EQ(gfx::Rect(2, 2, 8, 6).ToString(), damage_rect.ToString());
|
| break;
|
| case 4:
|
| EXPECT_EQ(gfx::Rect().ToString(), damage_rect.ToString());
|
| @@ -648,7 +645,7 @@ class LayerTreeHostDelegatedTestLayerUsesFrameDamage
|
| EXPECT_EQ(gfx::Rect().ToString(), damage_rect.ToString());
|
| break;
|
| case 13:
|
| - EXPECT_EQ(gfx::Rect(2, 2, 4, 4).ToString(), damage_rect.ToString());
|
| + EXPECT_EQ(gfx::Rect(1, 1, 2, 2).ToString(), damage_rect.ToString());
|
| break;
|
| case 14:
|
| EXPECT_EQ(gfx::Rect().ToString(), damage_rect.ToString());
|
|
|