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

Unified Diff: cc/playback/picture_pile_impl_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/playback/picture_pile_impl_unittest.cc
diff --git a/cc/playback/picture_pile_impl_unittest.cc b/cc/playback/picture_pile_impl_unittest.cc
index 3931f8dd4239b6f80f73e79a41ee15282914714c..f0b95ef08f901f6e82765538d920d179894bf1ef 100644
--- a/cc/playback/picture_pile_impl_unittest.cc
+++ b/cc/playback/picture_pile_impl_unittest.cc
@@ -292,8 +292,8 @@ TEST(PicturePileImplTest, RasterFullContents) {
scoped_refptr<FakePicturePileImpl> pile =
FakePicturePileImpl::CreateFromPile(recording_source.get(), nullptr);
- gfx::Size content_bounds(
- gfx::ToCeiledSize(gfx::ScaleSize(layer_bounds, contents_scale)));
+ gfx::Size content_bounds =
+ gfx::ScaleToCeiledSize(layer_bounds, contents_scale);
// Simulate drawing into different tiles at different offsets.
int step_x = std::ceil(content_bounds.width() / raster_divisions);
@@ -351,8 +351,8 @@ TEST(PicturePileImpl, RasterContentsTransparent) {
scoped_refptr<FakePicturePileImpl> pile =
FakePicturePileImpl::CreateFromPile(recording_source.get(), nullptr);
- gfx::Size content_bounds(
- gfx::ToCeiledSize(gfx::ScaleSize(layer_bounds, contents_scale)));
+ gfx::Size content_bounds =
+ gfx::ScaleToCeiledSize(layer_bounds, contents_scale);
gfx::Rect canvas_rect(content_bounds);
canvas_rect.Inset(0, 0, -1, -1);
@@ -401,8 +401,8 @@ TEST_P(OverlapTest, NoOverlap) {
scoped_refptr<FakePicturePileImpl> pile =
FakePicturePileImpl::CreateFromPile(recording_source.get(), nullptr);
- gfx::Size content_bounds(
- gfx::ToCeiledSize(gfx::ScaleSize(layer_bounds, contents_scale)));
+ gfx::Size content_bounds =
+ gfx::ScaleToCeiledSize(layer_bounds, contents_scale);
SkBitmap bitmap;
bitmap.allocN32Pixels(content_bounds.width(), content_bounds.height());

Powered by Google App Engine
This is Rietveld 408576698