content/browser/renderer_host/media/web_contents_video_capture_device.cc - Issue 12881005: Allow CopyFromBackingStore to fallback to copying from the renderer side if the accelerated surface…

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/renderer_host/media/web_contents_video_capture_device.cc

Issue 12881005: Allow CopyFromBackingStore to fallback to copying from the renderer side if the accelerated surface… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: more deletes Created 7 years, 9 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

« chrome/browser/extensions/api/tabs/tabs_api.cc ('K') | « chrome/renderer/chrome_render_view_observer.cc ('k') | content/browser/renderer_host/render_widget_host_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/media/web_contents_video_capture_device.cc

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

index 66385265dae28634c4b804d87307e29e5eec0aa8..51739bc28bfb7c2fa4a3be275a6729c236629de4 100644

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

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

@@ -989,7 +989,16 @@ void BackingStoreCopier::StartCopy(

TRACE_EVENT_ASYNC_BEGIN1("mirroring", "Capture", this,

"frame_number", frame_number);

- if (view && view->CanCopyToVideoFrame()) {

+ if (!view->IsSurfaceAvailableForCopy()) {

+ // Fallback to the more expensive renderer-side copy if the surface and

+ // backing store are not accessible.

+ rwh->GetSnapshotFromRenderer(

+ gfx::Rect(),

+ fitted_size,

+ base::Bind(&BackingStoreCopier::DidCopyFromBackingStore,

+ base::Unretained(this), frame_number,

+ base::Time::Now(), callback));

+ } else if (view && view->CanCopyToVideoFrame()) {

gfx::Size view_size = view->GetViewBounds().size();

view->CopyFromCompositingSurfaceToVideoFrame(