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

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

Issue 281003002: Make ui::Snapshot asynchronous on Android, remove 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 4a398859b1e66ae16a7b7a3affae264af53f3e25..3199be363b26c42adc16166faffb95a22b0ecd0c 100644
--- a/content/browser/android/content_view_render_view.cc
+++ b/content/browser/android/content_view_render_view.cc
@@ -55,7 +55,8 @@ ContentViewRenderView::ContentViewRenderView(JNIEnv* env,
gfx::NativeWindow root_window)
: layer_tree_build_helper_(new LayerTreeBuildHelperImpl()),
root_window_(root_window),
- current_surface_format_(0) {
+ current_surface_format_(0),
+ weak_ptr_factory_(this) {
java_obj_.Reset(env, obj);
}
@@ -117,15 +118,6 @@ void ContentViewRenderView::SurfaceChanged(JNIEnv* env, jobject obj,
compositor_->SetWindowBounds(gfx::Size(width, height));
}
-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