content/browser/media/capture/web_contents_video_capture_device.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.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/frame_host/render_widget_host_view_child_frame.cc ('k') | content/browser/media/capture/web_contents_video_capture_device_unittest.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.cc

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

index 41fa280b04c69bb173de6ed5479bb298c7a39112..64312d9a7c92fd296700e79464d0ecb1d8d004f6 100644

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

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

@@ -690,8 +690,8 @@ gfx::Size WebContentsCaptureMachine::ComputeOptimalViewSize() const {

const gfx::NativeView view = rwhv->GetNativeView();

const float scale = ui::GetScaleFactorForNativeView(view);

if (scale > 1.0f) {

- const gfx::Size shrunk_size(

- gfx::ToFlooredSize(gfx::ScaleSize(optimal_size, 1.0f / scale)));

+ const gfx::Size shrunk_size =

+ gfx::ScaleToFlooredSize(optimal_size, 1.0f / scale);

if (shrunk_size.width() > 0 && shrunk_size.height() > 0)

optimal_size = shrunk_size;

}