content/browser/media/capture/desktop_capture_device_aura.cc - Issue 462173002: Fix set_area sizes for RequestCopyOfOutput, and related tests.

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/desktop_capture_device_aura.cc

Issue 462173002: Fix set_area sizes for RequestCopyOfOutput, and related tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: RWHVBrowserTest changes, per danakj's comments. Disabled tests on Windows. Created 6 years, 4 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:

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

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

index c99ad01e2bcf96074448b9fd0d77fb9a6ff42c75..3efbb6a12b3047ab3f4e7e454366a87739d07e79 100644

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

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

@@ -271,10 +271,8 @@ void DesktopVideoCaptureMachine::Capture(bool dirty) {

cc::CopyOutputRequest::CreateRequest(

base::Bind(&DesktopVideoCaptureMachine::DidCopyOutput,

AsWeakPtr(), frame, start_time, capture_frame_cb));

- gfx::Rect window_rect =

- ui::ConvertRectToPixel(desktop_window_->layer(),

- gfx::Rect(desktop_window_->bounds().width(),

- desktop_window_->bounds().height()));

+ gfx::Rect window_rect = gfx::Rect(desktop_window_->bounds().width(),

+ desktop_window_->bounds().height());

request->set_area(window_rect);

desktop_window_->layer()->RequestCopyOfOutput(request.Pass());

}