summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsievers <sievers@chromium.org>2014-09-11 14:22:33 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-11 21:44:43 +0000
commit60b057443e8f3b655b129dd3003c54cb5c451a16 (patch)
tree2cd00ef505466d021e56a18f1d675caef2549e63
parent6d269edd075d8b9b0f64c6438313c1f8ff2248dd (diff)
downloadchromium_src-60b057443e8f3b655b129dd3003c54cb5c451a16.zip
chromium_src-60b057443e8f3b655b129dd3003c54cb5c451a16.tar.gz
chromium_src-60b057443e8f3b655b129dd3003c54cb5c451a16.tar.bz2
android: Pass sync point to CopyOutputResult's release callback
BUG=411755 Review URL: https://codereview.chromium.org/565583006 Cr-Commit-Position: refs/heads/master@{#294469}
-rw-r--r--content/browser/renderer_host/render_widget_host_view_android.cc9
1 files changed, 8 insertions, 1 deletions
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 310da19..e7a0cb2 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.cc
+++ b/content/browser/renderer_host/render_widget_host_view_android.cc
@@ -108,7 +108,14 @@ void CopyFromCompositingSurfaceFinished(
TRACE_EVENT0(
"cc", "RenderWidgetHostViewAndroid::CopyFromCompositingSurfaceFinished");
bitmap_pixels_lock.reset();
- release_callback->Run(0, false);
+ uint32 sync_point = 0;
+ if (result) {
+ GLHelper* gl_helper =
+ ImageTransportFactoryAndroid::GetInstance()->GetGLHelper();
+ sync_point = gl_helper->InsertSyncPoint();
+ }
+ bool lost_resource = sync_point == 0;
+ release_callback->Run(sync_point, lost_resource);
UMA_HISTOGRAM_TIMES(kAsyncReadBackString,
base::TimeTicks::Now() - start_time);
callback.Run(result, *bitmap);