Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3399)

Unified Diff: cc/tiles/picture_layer_tiling_unittest.cc

Issue 1357423009: gfx: Make conversions from Size to SizeF be explicit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: cc/tiles/picture_layer_tiling_unittest.cc
diff --git a/cc/tiles/picture_layer_tiling_unittest.cc b/cc/tiles/picture_layer_tiling_unittest.cc
index 1c0d4d9623fa348aa9bebba342dc708f542756c1..51cdc33454d9f29517b9c4fa2bae44dcbb86bda2 100644
--- a/cc/tiles/picture_layer_tiling_unittest.cc
+++ b/cc/tiles/picture_layer_tiling_unittest.cc
@@ -31,9 +31,8 @@ static gfx::Rect ViewportInLayerSpace(
if (!transform.GetInverse(&inverse))
return gfx::Rect();
- gfx::RectF viewport_in_layer_space = MathUtil::ProjectClippedRect(
- inverse, gfx::RectF(gfx::Point(0, 0), device_viewport));
- return ToEnclosingRect(viewport_in_layer_space);
+ return MathUtil::ProjectEnclosingClippedRect(inverse,
+ gfx::Rect(device_viewport));
}
class TestablePictureLayerTiling : public PictureLayerTiling {
@@ -501,7 +500,7 @@ TEST_F(PictureLayerTilingIteratorTest, IteratorCoversLayerBoundsBothScale) {
float scale = 6.7f;
gfx::Size bounds(800, 600);
- gfx::Rect full_rect(gfx::ToCeiledSize(gfx::ScaleSize(bounds, scale)));
+ gfx::Rect full_rect(gfx::ScaleToCeiledSize(bounds, scale));
Initialize(gfx::Size(256, 512), 5.2f, bounds);
VerifyTilesExactlyCoverRect(scale, full_rect);
VerifyTilesExactlyCoverRect(scale, gfx::Rect(2014, 1579, 867, 1033));

Powered by Google App Engine
This is Rietveld 408576698