content/browser/renderer_host/compositor_impl_android.cc - Issue 281003002: Make ui::Snapshot asynchronous on Android, remove CompositeAndReadback.

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

Issue 281003002: Make ui::Snapshot asynchronous on Android, remove CompositeAndReadback. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: pixeltests: syntax Created 6 years, 7 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/compositor_impl_android.h ('k') | content/public/android/java/src/org/chromium/content/browser/ContentViewRenderView.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/compositor_impl_android.cc

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

index fcd0a7b3bdd8568029e12ab39c2e8e32659dfc97..15aac8b5f9ffd3b8ef1f169fc965b3f64c0a78ca 100644

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

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

@@ -439,10 +439,7 @@ void CompositorImpl::SetHasTransparentBackground(bool flag) {

}

bool CompositorImpl::CompositeAndReadback(void *pixels, const gfx::Rect& rect) {

- if (host_)

- return host_->CompositeAndReadback(pixels, rect);

- else

- return false;

+ return false;

}

void CompositorImpl::SetNeedsComposite() {

@@ -623,6 +620,11 @@ void CompositorImpl::AttachLayerForReadback(scoped_refptr<cc::Layer> layer) {

root_layer_->AddChild(layer);

}

+void CompositorImpl::RequestCopyOfOutputOnRootLayer(

+ scoped_ptr<cc::CopyOutputRequest> request) {

+ root_layer_->RequestCopyOfOutput(request.Pass());

void CompositorImpl::OnVSync(base::TimeTicks frame_time,

base::TimeDelta vsync_period) {

vsync_period_ = vsync_period;