content/browser/media/capture/web_contents_video_capture_device_unittest.cc - Issue 1357423009: gfx: Make conversions from Size to SizeF be explicit.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/media/capture/web_contents_video_capture_device_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

« no previous file with comments | « content/browser/media/capture/web_contents_video_capture_device.cc ('k') | content/browser/renderer_host/input/touch_emulator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/media/capture/web_contents_video_capture_device_unittest.cc

diff --git a/content/browser/media/capture/web_contents_video_capture_device_unittest.cc b/content/browser/media/capture/web_contents_video_capture_device_unittest.cc

index d0c7a8859b48c260d65e60594013822826f50013..e3e1efce6f4062b2fffaf062b642aec521f64cfd 100644

--- a/content/browser/media/capture/web_contents_video_capture_device_unittest.cc

+++ b/content/browser/media/capture/web_contents_video_capture_device_unittest.cc

@@ -1063,10 +1063,10 @@ TEST_F(MAYBE_WebContentsVideoCaptureDeviceTest,

// the |oddball_size| is always the expected size; whereas for the

// variable-resolution cases, the |standard_size| is the expected size.

// Also, adjust to account for the device scale factor.

- gfx::Size capture_preferred_size = gfx::ToFlooredSize(gfx::ScaleSize(

- policy == media::RESOLUTION_POLICY_FIXED_RESOLUTION ?

- oddball_size : standard_size,

- 1.0f / GetDeviceScaleFactor()));

+ gfx::Size capture_preferred_size = gfx::ScaleToFlooredSize(

+ policy == media::RESOLUTION_POLICY_FIXED_RESOLUTION ? oddball_size

+ : standard_size,

+ 1.0f / GetDeviceScaleFactor());

ASSERT_NE(capture_preferred_size, web_contents()->GetPreferredSize());

// Start the WebContentsVideoCaptureDevice.