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

Unified Diff: content/browser/renderer_host/render_widget_host_view_browsertest.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/browser/renderer_host/render_widget_host_view_browsertest.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_browsertest.cc b/content/browser/renderer_host/render_widget_host_view_browsertest.cc
index f3f9d71c1e0bfd2d7e3a656479e2cb81004bbf6a..b523a044b5d408ad63ab17486e6bd39467c8ac84 100644
--- a/content/browser/renderer_host/render_widget_host_view_browsertest.cc
+++ b/content/browser/renderer_host/render_widget_host_view_browsertest.cc
@@ -844,8 +844,7 @@ IN_PROC_BROWSER_TEST_P(
gfx::Size html_rect_size(200, 150);
gfx::Rect copy_rect(200, 150);
// Scale the output size so that, internally, scaling is not occurring.
- gfx::Size output_size =
- gfx::ToRoundedSize(gfx::ScaleSize(copy_rect.size(), scale()));
+ gfx::Size output_size = gfx::ScaleToRoundedSize(copy_rect.size(), scale());
bool video_frame = false;
PerformTestWithLeftRightRects(html_rect_size,
copy_rect,
@@ -862,8 +861,7 @@ IN_PROC_BROWSER_TEST_P(
gfx::Rect(gfx::Rect(html_rect_size).CenterPoint() - gfx::Vector2d(45, 30),
gfx::Size(90, 60));
// Scale the output size so that, internally, scaling is not occurring.
- gfx::Size output_size =
- gfx::ToRoundedSize(gfx::ScaleSize(copy_rect.size(), scale()));
+ gfx::Size output_size = gfx::ScaleToRoundedSize(copy_rect.size(), scale());
bool video_frame = false;
PerformTestWithLeftRightRects(html_rect_size,
copy_rect,
@@ -891,8 +889,7 @@ IN_PROC_BROWSER_TEST_P(
gfx::Size html_rect_size(200, 150);
gfx::Rect copy_rect(200, 150);
// Scale the output size so that, internally, scaling is not occurring.
- gfx::Size output_size =
- gfx::ToRoundedSize(gfx::ScaleSize(copy_rect.size(), scale()));
+ gfx::Size output_size = gfx::ScaleToRoundedSize(copy_rect.size(), scale());
bool video_frame = true;
PerformTestWithLeftRightRects(html_rect_size,
copy_rect,
@@ -909,8 +906,7 @@ IN_PROC_BROWSER_TEST_P(
gfx::Rect(gfx::Rect(html_rect_size).CenterPoint() - gfx::Vector2d(45, 30),
gfx::Size(90, 60));
// Scale the output size so that, internally, scaling is not occurring.
- gfx::Size output_size =
- gfx::ToRoundedSize(gfx::ScaleSize(copy_rect.size(), scale()));
+ gfx::Size output_size = gfx::ScaleToRoundedSize(copy_rect.size(), scale());
bool video_frame = true;
PerformTestWithLeftRightRects(html_rect_size,
copy_rect,
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_base.cc ('k') | content/common/cursors/webcursor_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698