Index: cc/resources/picture_pile_impl_unittest.cc |
diff --git a/cc/resources/picture_pile_impl_unittest.cc b/cc/resources/picture_pile_impl_unittest.cc |
index 0ced279777d9433d8a7ab5509018151694d4bd13..d96c5d9e030367ce717ca9e31df46041d6df81fa 100644 |
--- a/cc/resources/picture_pile_impl_unittest.cc |
+++ b/cc/resources/picture_pile_impl_unittest.cc |
@@ -39,7 +39,7 @@ TEST(PicturePileImplTest, AnalyzeIsSolidUnscaled) { |
for (int x = 0; x <= 300; x += 100) { |
PicturePileImpl::Analysis analysis; |
gfx::Rect rect(x, y, 100, 100); |
- pile->AnalyzeInRect(rect, 1.0, &analysis); |
+ pile->AnalyzeInRect(rect, 1.0, &analysis, nullptr); |
EXPECT_TRUE(analysis.is_solid_color) << rect.ToString(); |
EXPECT_EQ(analysis.solid_color, solid_color) << rect.ToString(); |
} |
@@ -50,26 +50,26 @@ TEST(PicturePileImplTest, AnalyzeIsSolidUnscaled) { |
pile->RerecordPile(); |
PicturePileImpl::Analysis analysis; |
- pile->AnalyzeInRect(gfx::Rect(0, 0, 100, 100), 1.0, &analysis); |
+ pile->AnalyzeInRect(gfx::Rect(0, 0, 100, 100), 1.0, &analysis, nullptr); |
EXPECT_FALSE(analysis.is_solid_color); |
- pile->AnalyzeInRect(gfx::Rect(100, 0, 100, 100), 1.0, &analysis); |
+ pile->AnalyzeInRect(gfx::Rect(100, 0, 100, 100), 1.0, &analysis, nullptr); |
EXPECT_TRUE(analysis.is_solid_color); |
EXPECT_EQ(analysis.solid_color, solid_color); |
// Boundaries should be clipped |
analysis.is_solid_color = false; |
- pile->AnalyzeInRect(gfx::Rect(350, 0, 100, 100), 1.0, &analysis); |
+ pile->AnalyzeInRect(gfx::Rect(350, 0, 100, 100), 1.0, &analysis, nullptr); |
EXPECT_TRUE(analysis.is_solid_color); |
EXPECT_EQ(analysis.solid_color, solid_color); |
analysis.is_solid_color = false; |
- pile->AnalyzeInRect(gfx::Rect(0, 350, 100, 100), 1.0, &analysis); |
+ pile->AnalyzeInRect(gfx::Rect(0, 350, 100, 100), 1.0, &analysis, nullptr); |
EXPECT_TRUE(analysis.is_solid_color); |
EXPECT_EQ(analysis.solid_color, solid_color); |
analysis.is_solid_color = false; |
- pile->AnalyzeInRect(gfx::Rect(350, 350, 100, 100), 1.0, &analysis); |
+ pile->AnalyzeInRect(gfx::Rect(350, 350, 100, 100), 1.0, &analysis, nullptr); |
EXPECT_TRUE(analysis.is_solid_color); |
EXPECT_EQ(analysis.solid_color, solid_color); |
} |
@@ -97,7 +97,7 @@ TEST(PicturePileImplTest, AnalyzeIsSolidScaled) { |
for (int x = 0; x <= 30; x += 10) { |
PicturePileImpl::Analysis analysis; |
gfx::Rect rect(x, y, 10, 10); |
- pile->AnalyzeInRect(rect, 0.1f, &analysis); |
+ pile->AnalyzeInRect(rect, 0.1f, &analysis, nullptr); |
EXPECT_TRUE(analysis.is_solid_color) << rect.ToString(); |
EXPECT_EQ(analysis.solid_color, solid_color) << rect.ToString(); |
} |
@@ -108,26 +108,26 @@ TEST(PicturePileImplTest, AnalyzeIsSolidScaled) { |
pile->RerecordPile(); |
PicturePileImpl::Analysis analysis; |
- pile->AnalyzeInRect(gfx::Rect(0, 0, 10, 10), 0.1f, &analysis); |
+ pile->AnalyzeInRect(gfx::Rect(0, 0, 10, 10), 0.1f, &analysis, nullptr); |
EXPECT_FALSE(analysis.is_solid_color); |
- pile->AnalyzeInRect(gfx::Rect(10, 0, 10, 10), 0.1f, &analysis); |
+ pile->AnalyzeInRect(gfx::Rect(10, 0, 10, 10), 0.1f, &analysis, nullptr); |
EXPECT_TRUE(analysis.is_solid_color); |
EXPECT_EQ(analysis.solid_color, solid_color); |
// Boundaries should be clipped |
analysis.is_solid_color = false; |
- pile->AnalyzeInRect(gfx::Rect(35, 0, 10, 10), 0.1f, &analysis); |
+ pile->AnalyzeInRect(gfx::Rect(35, 0, 10, 10), 0.1f, &analysis, nullptr); |
EXPECT_TRUE(analysis.is_solid_color); |
EXPECT_EQ(analysis.solid_color, solid_color); |
analysis.is_solid_color = false; |
- pile->AnalyzeInRect(gfx::Rect(0, 35, 10, 10), 0.1f, &analysis); |
+ pile->AnalyzeInRect(gfx::Rect(0, 35, 10, 10), 0.1f, &analysis, nullptr); |
EXPECT_TRUE(analysis.is_solid_color); |
EXPECT_EQ(analysis.solid_color, solid_color); |
analysis.is_solid_color = false; |
- pile->AnalyzeInRect(gfx::Rect(35, 35, 10, 10), 0.1f, &analysis); |
+ pile->AnalyzeInRect(gfx::Rect(35, 35, 10, 10), 0.1f, &analysis, nullptr); |
EXPECT_TRUE(analysis.is_solid_color); |
EXPECT_EQ(analysis.solid_color, solid_color); |
} |
@@ -141,7 +141,7 @@ TEST(PicturePileImplTest, AnalyzeIsSolidEmpty) { |
PicturePileImpl::Analysis analysis; |
EXPECT_FALSE(analysis.is_solid_color); |
- pile->AnalyzeInRect(gfx::Rect(0, 0, 400, 400), 1.f, &analysis); |
+ pile->AnalyzeInRect(gfx::Rect(0, 0, 400, 400), 1.f, &analysis, nullptr); |
EXPECT_TRUE(analysis.is_solid_color); |
EXPECT_EQ(analysis.solid_color, SkColorSetARGB(0, 0, 0, 0)); |