content/browser/renderer_host/render_widget_host_view_android.cc - Issue 571413002: Declare a new name for CompositingSurface completion callback.

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

Issue 571413002: Declare a new name for CompositingSurface completion callback. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed build issue. 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/renderer_host/render_widget_host_view_android.h ('k') | content/browser/renderer_host/render_widget_host_view_aura.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/render_widget_host_view_android.cc

diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc

index 48070031aa230d87a4f199e77145ee5cc5b1aee1..af53727f9ad92906c7aa9d76bcb876e4a0012e51 100644

--- a/content/browser/renderer_host/render_widget_host_view_android.cc

+++ b/content/browser/renderer_host/render_widget_host_view_android.cc

@@ -389,7 +389,7 @@ void RenderWidgetHostViewAndroid::GetScaledContentBitmap(

float scale,

SkColorType color_type,

gfx::Rect src_subrect,

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

+ CopyFromCompositingSurfaceCallback& result_callback) {

if (!host_ || host_->is_hidden()) {

result_callback.Run(false, SkBitmap());

return;

@@ -851,7 +851,7 @@ void RenderWidgetHostViewAndroid::SetBackgroundOpaque(bool opaque) {

void RenderWidgetHostViewAndroid::CopyFromCompositingSurface(

const gfx::Rect& src_subrect,

const gfx::Size& dst_size,

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

+ CopyFromCompositingSurfaceCallback& callback,

const SkColorType color_type) {

TRACE_EVENT0("cc", "RenderWidgetHostViewAndroid::CopyFromCompositingSurface");

if ((!host_ || host_->is_hidden()) ||