diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-12 22:20:23 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-12 22:20:23 +0000 |
| commit | 8c858fd55a5e7fc6f8d1e10386fb1d4ec7f4d243 (patch) | |
| tree | 940c95669dae96f7e11cacf06cf8706e090b48d3 /content/browser/android | |
| parent | 08d67e4794cbcf4c313adc8fe86b6e1b88a6e970 (diff) | |
| download | chromium_src-8c858fd55a5e7fc6f8d1e10386fb1d4ec7f4d243.zip chromium_src-8c858fd55a5e7fc6f8d1e10386fb1d4ec7f4d243.tar.gz chromium_src-8c858fd55a5e7fc6f8d1e10386fb1d4ec7f4d243.tar.bz2 | |
Revert of Make ContentViewRenderView::CompositeToBitmap not CompositeAndReadback. (https://codereview.chromium.org/270933002/)
Reason for revert:
This is possibly breaking android telemetry pixel tests as per https://code.google.com/p/chromium/issues/detail?id=372562
Original issue's description:
> Make ContentViewRenderView::CompositeToBitmap not CompositeAndReadback.
>
> The CompositeAndReadback is going away, and this method is thought to
> be unused. Make the method just fail and return false.
>
> R=aelias, tedchoc@chromium.org
> BUG=371592
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=269448
TBR=aelias@chromium.org,tedchoc@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=371592
Review URL: https://codereview.chromium.org/286513002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269894 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/android')
| -rw-r--r-- | content/browser/android/content_view_render_view.cc | 9 | ||||
| -rw-r--r-- | content/browser/android/content_view_render_view.h | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/content/browser/android/content_view_render_view.cc b/content/browser/android/content_view_render_view.cc index efda29d..9f5ed31 100644 --- a/content/browser/android/content_view_render_view.cc +++ b/content/browser/android/content_view_render_view.cc @@ -127,6 +127,15 @@ jboolean ContentViewRenderView::Composite(JNIEnv* env, jobject obj) { return buffers_swapped_during_composite_; } +jboolean ContentViewRenderView::CompositeToBitmap(JNIEnv* env, jobject obj, + jobject java_bitmap) { + gfx::JavaBitmap bitmap(java_bitmap); + if (!compositor_ || bitmap.format() != ANDROID_BITMAP_FORMAT_RGBA_8888) + return false; + return compositor_->CompositeAndReadback(bitmap.pixels(), + gfx::Rect(bitmap.size())); +} + void ContentViewRenderView::SetOverlayVideoMode( JNIEnv* env, jobject obj, bool enabled) { compositor_->SetHasTransparentBackground(enabled); diff --git a/content/browser/android/content_view_render_view.h b/content/browser/android/content_view_render_view.h index 21e79ea..8f14456 100644 --- a/content/browser/android/content_view_render_view.h +++ b/content/browser/android/content_view_render_view.h @@ -40,6 +40,7 @@ class ContentViewRenderView : public CompositorClient { void SurfaceChanged(JNIEnv* env, jobject obj, jint format, jint width, jint height, jobject surface); jboolean Composite(JNIEnv* env, jobject obj); + jboolean CompositeToBitmap(JNIEnv* env, jobject obj, jobject java_bitmap); void SetOverlayVideoMode(JNIEnv* env, jobject obj, bool enabled); // CompositorClient --------------------------------------------------------- |