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

Unified Diff: content/renderer/disambiguation_popup_helper_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: sizefconvert-gfx: . 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: content/renderer/disambiguation_popup_helper_unittest.cc
diff --git a/content/renderer/disambiguation_popup_helper_unittest.cc b/content/renderer/disambiguation_popup_helper_unittest.cc
index 5921e308200c51cdd8ed3281bd46728dde0a82f8..65976e23ca066c98e3acd5d2f323f13d048a3457 100644
--- a/content/renderer/disambiguation_popup_helper_unittest.cc
+++ b/content/renderer/disambiguation_popup_helper_unittest.cc
@@ -44,7 +44,7 @@ TEST_F(DisambiguationPopupHelperUnittest, ClipByViewport) {
EXPECT_TRUE(gfx::Rect(kVisibleContentSize_).Contains(zoom_rect));
EXPECT_LE(kDisambiguationPopupMinScale, scale);
- gfx::Size scaled_size = ToCeiledSize(ScaleSize(zoom_rect.size(), scale));
+ gfx::Size scaled_size = gfx::ScaleToCeiledSize(zoom_rect.size(), scale);
EXPECT_TRUE(gfx::Rect(kScreenSize_).Contains(gfx::Rect(scaled_size)));
}
@@ -62,7 +62,7 @@ TEST_F(DisambiguationPopupHelperUnittest, MiniTarget) {
EXPECT_EQ(kDisambiguationPopupMaxScale, scale);
EXPECT_TRUE(zoom_rect.Contains(target_rects[0]));
- gfx::Size scaled_size = ToCeiledSize(ScaleSize(zoom_rect.size(), scale));
+ gfx::Size scaled_size = gfx::ScaleToCeiledSize(zoom_rect.size(), scale);
EXPECT_TRUE(gfx::Rect(kScreenSize_).Contains(gfx::Rect(scaled_size)));
}
@@ -81,7 +81,7 @@ TEST_F(DisambiguationPopupHelperUnittest, LongLinks) {
EXPECT_EQ(kDisambiguationPopupMaxScale, scale);
EXPECT_TRUE(zoom_rect.Contains(tap_rect));
- gfx::Size scaled_size = ToCeiledSize(ScaleSize(zoom_rect.size(), scale));
+ gfx::Size scaled_size = gfx::ScaleToCeiledSize(zoom_rect.size(), scale);
EXPECT_TRUE(gfx::Rect(kScreenSize_).Contains(gfx::Rect(scaled_size)));
}
« no previous file with comments | « content/renderer/disambiguation_popup_helper.cc ('k') | content/renderer/media/android/webmediaplayer_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698