| Index: cc/tiled_layer_unittest.cc
|
| diff --git a/cc/tiled_layer_unittest.cc b/cc/tiled_layer_unittest.cc
|
| index 6bdadf1a4fc12d0d0afd369fa27b8d6d77464ff6..377e607445d01bedb3d257213e2d09bfcf9fd405 100644
|
| --- a/cc/tiled_layer_unittest.cc
|
| +++ b/cc/tiled_layer_unittest.cc
|
| @@ -1271,7 +1271,7 @@ TEST_F(TiledLayerTest, visibleContentOpaqueRegion)
|
| updateTextures();
|
| opaqueContents = layer->visibleContentOpaqueRegion();
|
| EXPECT_RECT_EQ(gfx::IntersectRects(opaquePaintRect, visibleBounds), opaqueContents.bounds());
|
| - EXPECT_EQ(1u, opaqueContents.rects().size());
|
| + EXPECT_EQ(1u, Region::Iterator(opaqueContents).size());
|
|
|
| EXPECT_NEAR(occluded.overdrawMetrics().pixelsPainted(), 20000 * 2, 1);
|
| EXPECT_NEAR(occluded.overdrawMetrics().pixelsUploadedOpaque(), 17100, 1);
|
| @@ -1284,7 +1284,7 @@ TEST_F(TiledLayerTest, visibleContentOpaqueRegion)
|
| updateTextures();
|
| opaqueContents = layer->visibleContentOpaqueRegion();
|
| EXPECT_RECT_EQ(gfx::IntersectRects(opaquePaintRect, visibleBounds), opaqueContents.bounds());
|
| - EXPECT_EQ(1u, opaqueContents.rects().size());
|
| + EXPECT_EQ(1u, Region::Iterator(opaqueContents).size());
|
|
|
| EXPECT_NEAR(occluded.overdrawMetrics().pixelsPainted(), 20000 * 2, 1);
|
| EXPECT_NEAR(occluded.overdrawMetrics().pixelsUploadedOpaque(), 17100, 1);
|
| @@ -1299,7 +1299,7 @@ TEST_F(TiledLayerTest, visibleContentOpaqueRegion)
|
| updateTextures();
|
| opaqueContents = layer->visibleContentOpaqueRegion();
|
| EXPECT_RECT_EQ(gfx::IntersectRects(opaquePaintRect, visibleBounds), opaqueContents.bounds());
|
| - EXPECT_EQ(1u, opaqueContents.rects().size());
|
| + EXPECT_EQ(1u, Region::Iterator(opaqueContents).size());
|
|
|
| EXPECT_NEAR(occluded.overdrawMetrics().pixelsPainted(), 20000 * 2 + 1, 1);
|
| EXPECT_NEAR(occluded.overdrawMetrics().pixelsUploadedOpaque(), 17100, 1);
|
| @@ -1314,7 +1314,7 @@ TEST_F(TiledLayerTest, visibleContentOpaqueRegion)
|
| updateTextures();
|
| opaqueContents = layer->visibleContentOpaqueRegion();
|
| EXPECT_RECT_EQ(gfx::IntersectRects(gfx::Rect(10, 100, 90, 100), visibleBounds), opaqueContents.bounds());
|
| - EXPECT_EQ(1u, opaqueContents.rects().size());
|
| + EXPECT_EQ(1u, Region::Iterator(opaqueContents).size());
|
|
|
| EXPECT_NEAR(occluded.overdrawMetrics().pixelsPainted(), 20000 * 2 + 1 + 1, 1);
|
| EXPECT_NEAR(occluded.overdrawMetrics().pixelsUploadedOpaque(), 17100, 1);
|
|
|