| Index: cc/test/layer_test_common.cc
|
| diff --git a/cc/test/layer_test_common.cc b/cc/test/layer_test_common.cc
|
| index 1a41eec210e8c4c46237f6d78aa82cbce9a6a136..de7eb4f460ab890614bc8a4e6df0537cefb09297 100644
|
| --- a/cc/test/layer_test_common.cc
|
| +++ b/cc/test/layer_test_common.cc
|
| @@ -15,16 +15,16 @@ namespace LayerTestCommon {
|
| const char* quadString = " Quad: ";
|
|
|
| void verifyQuadsExactlyCoverRect(const cc::QuadList& quads,
|
| - const cc::IntRect& rect) {
|
| - cc::Region remaining(rect);
|
| + const gfx::Rect& rect) {
|
| + cc::Region remaining = cc::IntRect(rect);
|
|
|
| for (size_t i = 0; i < quads.size(); ++i) {
|
| cc::DrawQuad* quad = quads[i];
|
| - cc::IntRect quadRect = cc::IntRect(quad->quadRect());
|
| + gfx::Rect quadRect = quad->quadRect();
|
|
|
| - EXPECT_TRUE(rect.contains(quadRect)) << quadString << i;
|
| - EXPECT_TRUE(remaining.contains(quadRect)) << quadString << i;
|
| - remaining.subtract(cc::Region(quadRect));
|
| + EXPECT_TRUE(rect.Contains(quadRect)) << quadString << i;
|
| + EXPECT_TRUE(remaining.contains(cc::IntRect(quadRect))) << quadString << i;
|
| + remaining.subtract(cc::IntRect(quadRect));
|
| }
|
|
|
| EXPECT_TRUE(remaining.isEmpty());
|
|
|