summaryrefslogtreecommitdiffstats
path: root/cc/test/layer_test_common.cc
diff options
context:
space:
mode:
authordanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-01 23:02:38 +0000
committerdanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-01 23:02:38 +0000
commitd0f98369e69763a2eeb7ea39097bf01ef234a39c (patch)
tree943e3e20a23e54d6de23d4007828a1d35c2bf6bf /cc/test/layer_test_common.cc
parent1140046f0868117776b6df7e7c99c5bf3dd23731 (diff)
downloadchromium_src-d0f98369e69763a2eeb7ea39097bf01ef234a39c.zip
chromium_src-d0f98369e69763a2eeb7ea39097bf01ef234a39c.tar.gz
chromium_src-d0f98369e69763a2eeb7ea39097bf01ef234a39c.tar.bz2
Remove most remaining references to IntRect and FloatRect.
The remaining uses are: - Dealing with the output of Region::rects() which gives a vector of WebCore::IntRects. - Using FloatRect::isExpressibleAsIntRect. Covered by existing tests; no new behaviour. BUG=147395 R=enne Review URL: https://codereview.chromium.org/11275113 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165542 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test/layer_test_common.cc')
-rw-r--r--cc/test/layer_test_common.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/cc/test/layer_test_common.cc b/cc/test/layer_test_common.cc
index 9e7dd33..7208377 100644
--- a/cc/test/layer_test_common.cc
+++ b/cc/test/layer_test_common.cc
@@ -6,6 +6,7 @@
#include "cc/test/layer_test_common.h"
+#include "FloatRect.h"
#include "Region.h"
#include "cc/draw_quad.h"
#include "cc/math_util.h"
@@ -37,7 +38,7 @@ bool canRectFBeSafelyRoundedToRect(const gfx::RectF& r)
void verifyQuadsExactlyCoverRect(const cc::QuadList& quads,
const gfx::Rect& rect) {
- cc::Region remaining = cc::IntRect(rect);
+ cc::Region remaining = rect;
for (size_t i = 0; i < quads.size(); ++i) {
cc::DrawQuad* quad = quads[i];
@@ -50,11 +51,11 @@ void verifyQuadsExactlyCoverRect(const cc::QuadList& quads,
gfx::Rect quadRect = gfx::ToEnclosingRect(quadRectF);
EXPECT_TRUE(rect.Contains(quadRect)) << quadString << i;
- EXPECT_TRUE(remaining.contains(cc::IntRect(quadRect))) << quadString << i;
- remaining.subtract(cc::IntRect(quadRect));
+ EXPECT_TRUE(remaining.Contains(quadRect)) << quadString << i;
+ remaining.Subtract(quadRect);
}
- EXPECT_TRUE(remaining.isEmpty());
+ EXPECT_TRUE(remaining.IsEmpty());
}
} // namespace LayerTestCommon