| OLD | NEW |
| 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_helper.h" | 8 #include "base/android/jni_helper.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 14 matching lines...) Expand all Loading... |
| 25 gfx::NativeWindow root_window); | 25 gfx::NativeWindow root_window); |
| 26 | 26 |
| 27 // Methods called from Java via JNI ----------------------------------------- | 27 // Methods called from Java via JNI ----------------------------------------- |
| 28 void Destroy(JNIEnv* env, jobject obj); | 28 void Destroy(JNIEnv* env, jobject obj); |
| 29 void SetCurrentContentView(JNIEnv* env, jobject obj, int native_content_view); | 29 void SetCurrentContentView(JNIEnv* env, jobject obj, int native_content_view); |
| 30 void SurfaceCreated(JNIEnv* env, jobject obj, jobject jsurface); | 30 void SurfaceCreated(JNIEnv* env, jobject obj, jobject jsurface); |
| 31 void SurfaceDestroyed(JNIEnv* env, jobject obj); | 31 void SurfaceDestroyed(JNIEnv* env, jobject obj); |
| 32 void SurfaceSetSize(JNIEnv* env, jobject obj, jint width, jint height); | 32 void SurfaceSetSize(JNIEnv* env, jobject obj, jint width, jint height); |
| 33 jboolean Composite(JNIEnv* env, jobject obj); | 33 jboolean Composite(JNIEnv* env, jobject obj); |
| 34 jboolean CompositeToBitmap(JNIEnv* env, jobject obj, jobject java_bitmap); | 34 jboolean CompositeToBitmap(JNIEnv* env, jobject obj, jobject java_bitmap); |
| 35 void SetOverlayVideoMode(JNIEnv* env, jobject obj, bool enabled); |
| 35 | 36 |
| 36 // CompositorClient --------------------------------------------------------- | 37 // CompositorClient --------------------------------------------------------- |
| 37 virtual void ScheduleComposite() OVERRIDE; | 38 virtual void ScheduleComposite() OVERRIDE; |
| 38 virtual void OnSwapBuffersPosted() OVERRIDE; | 39 virtual void OnSwapBuffersPosted() OVERRIDE; |
| 39 virtual void OnSwapBuffersCompleted() OVERRIDE; | 40 virtual void OnSwapBuffersCompleted() OVERRIDE; |
| 40 | 41 |
| 41 private: | 42 private: |
| 42 virtual ~ContentViewRenderView(); | 43 virtual ~ContentViewRenderView(); |
| 43 | 44 |
| 44 void InitCompositor(); | 45 void InitCompositor(); |
| 45 | 46 |
| 46 bool buffers_swapped_during_composite_; | 47 bool buffers_swapped_during_composite_; |
| 47 | 48 |
| 48 base::android::ScopedJavaGlobalRef<jobject> java_obj_; | 49 base::android::ScopedJavaGlobalRef<jobject> java_obj_; |
| 49 | 50 |
| 50 scoped_ptr<content::Compositor> compositor_; | 51 scoped_ptr<content::Compositor> compositor_; |
| 51 | 52 |
| 52 gfx::NativeWindow root_window_; | 53 gfx::NativeWindow root_window_; |
| 53 | 54 |
| 54 DISALLOW_COPY_AND_ASSIGN(ContentViewRenderView); | 55 DISALLOW_COPY_AND_ASSIGN(ContentViewRenderView); |
| 55 }; | 56 }; |
| 56 | 57 |
| 57 | 58 |
| 58 | 59 |
| 59 } | 60 } |
| 60 | 61 |
| 61 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_RENDER_VIEW_H_ | 62 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_RENDER_VIEW_H_ |
| OLD | NEW |