Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(140)

Unified Diff: content/browser/android/content_view_render_view.cc

Issue 286513002: Revert of Make ContentViewRenderView::CompositeToBitmap not CompositeAndReadback. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
Index: content/browser/android/content_view_render_view.cc
diff --git a/content/browser/android/content_view_render_view.cc b/content/browser/android/content_view_render_view.cc
index efda29d7640121d264285afc0c8ae3d20288e59f..9f5ed314178425320c4e6c8516cdaa882ee75d2b 100644
--- a/content/browser/android/content_view_render_view.cc
+++ b/content/browser/android/content_view_render_view.cc
@@ -127,6 +127,15 @@
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);

Powered by Google App Engine
This is Rietveld 408576698