content/browser/media/capture/web_contents_video_capture_device_unittest.cc - Issue 593503003: Support error handling for Surface readbacks

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 593503003: Support error handling for Surface readbacks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Removed unnecessary headers. Created 6 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/render_widget_host_impl.h » ('j') | content/common/readback_types.h » ('J')
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 1f9f281f5ca52b4cb28647396566dd04bc259dd3..02acaa111e6dd82d54639d6ada06882258b8eeb6 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

@@ -251,7 +251,7 @@ class CaptureTestRenderViewHost : public TestRenderViewHost {

virtual void CopyFromBackingStore(

const gfx::Rect& src_rect,

const gfx::Size& accelerated_dst_size,

- const base::Callback<void(bool, const SkBitmap&)>& callback,

+ CopyFromCompositingSurfaceCallback& callback,

const SkColorType color_type) OVERRIDE {

gfx::Size size = controller_->GetCopyResultSize();

SkColor color = controller_->GetSolidColor();

@@ -264,7 +264,7 @@ class CaptureTestRenderViewHost : public TestRenderViewHost {

SkAutoLockPixels locker(output.GetBitmap());

output.GetBitmap().eraseColor(color);

}

- callback.Run(true, output.GetBitmap());

+ callback.Run(true, output.GetBitmap(), content::READBACK_SUCCESS);

controller_->SignalCopy();

}