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

Side by Side Diff: content/browser/android/content_view_render_view.h

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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « cc/output/copy_output_result.cc ('k') | content/browser/android/content_view_render_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_BROWSER_ANDROID_CONTENT_VIEW_RENDER_VIEW_H_ 5 #ifndef CONTENT_BROWSER_ANDROID_CONTENT_VIEW_RENDER_VIEW_H_
6 #define CONTENT_BROWSER_ANDROID_CONTENT_VIEW_RENDER_VIEW_H_ 6 #define CONTENT_BROWSER_ANDROID_CONTENT_VIEW_RENDER_VIEW_H_
7 7
8 #include "base/android/jni_weak_ref.h" 8 #include "base/android/jni_weak_ref.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 22 matching lines...) Expand all
33 void Destroy(JNIEnv* env, jobject obj); 33 void Destroy(JNIEnv* env, jobject obj);
34 void SetCurrentContentViewCore(JNIEnv* env, jobject obj, 34 void SetCurrentContentViewCore(JNIEnv* env, jobject obj,
35 jlong native_content_view_core); 35 jlong native_content_view_core);
36 void SetLayerTreeBuildHelper( 36 void SetLayerTreeBuildHelper(
37 JNIEnv* env, jobject obj, jlong native_build_helper); 37 JNIEnv* env, jobject obj, jlong native_build_helper);
38 void SurfaceCreated(JNIEnv* env, jobject obj); 38 void SurfaceCreated(JNIEnv* env, jobject obj);
39 void SurfaceDestroyed(JNIEnv* env, jobject obj); 39 void SurfaceDestroyed(JNIEnv* env, jobject obj);
40 void SurfaceChanged(JNIEnv* env, jobject obj, 40 void SurfaceChanged(JNIEnv* env, jobject obj,
41 jint format, jint width, jint height, jobject surface); 41 jint format, jint width, jint height, jobject surface);
42 jboolean Composite(JNIEnv* env, jobject obj); 42 jboolean Composite(JNIEnv* env, jobject obj);
43 jboolean CompositeToBitmap(JNIEnv* env, jobject obj, jobject java_bitmap);
44 void SetOverlayVideoMode(JNIEnv* env, jobject obj, bool enabled); 43 void SetOverlayVideoMode(JNIEnv* env, jobject obj, bool enabled);
45 44
46 // CompositorClient implementation 45 // CompositorClient implementation
47 virtual void Layout() OVERRIDE; 46 virtual void Layout() OVERRIDE;
48 virtual void OnSwapBuffersCompleted(int pending_swap_buffers) OVERRIDE; 47 virtual void OnSwapBuffersCompleted(int pending_swap_buffers) OVERRIDE;
49 48
50 private: 49 private:
51 virtual ~ContentViewRenderView(); 50 virtual ~ContentViewRenderView();
52 51
53 void InitCompositor(); 52 void InitCompositor();
54 53
55 base::android::ScopedJavaGlobalRef<jobject> java_obj_; 54 base::android::ScopedJavaGlobalRef<jobject> java_obj_;
56 scoped_ptr<LayerTreeBuildHelper> layer_tree_build_helper_; 55 scoped_ptr<LayerTreeBuildHelper> layer_tree_build_helper_;
57 56
58 scoped_ptr<content::Compositor> compositor_; 57 scoped_ptr<content::Compositor> compositor_;
59 58
60 gfx::NativeWindow root_window_; 59 gfx::NativeWindow root_window_;
61 int current_surface_format_; 60 int current_surface_format_;
62 61
63 DISALLOW_COPY_AND_ASSIGN(ContentViewRenderView); 62 DISALLOW_COPY_AND_ASSIGN(ContentViewRenderView);
64 }; 63 };
65 64
66 65
67 66
68 } 67 }
69 68
70 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_RENDER_VIEW_H_ 69 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_RENDER_VIEW_H_
OLDNEW
« no previous file with comments | « cc/output/copy_output_result.cc ('k') | content/browser/android/content_view_render_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698