Chromium Code Reviews| 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" |
| 11 #include "base/memory/weak_ptr.h" | 11 #include "base/memory/weak_ptr.h" |
| 12 #include "content/public/browser/android/compositor_client.h" | 12 #include "content/public/browser/android/compositor_client.h" |
| 13 #include "ui/gfx/native_widget_types.h" | 13 #include "ui/gfx/native_widget_types.h" |
| 14 | 14 |
| 15 namespace content { | 15 namespace content { |
| 16 class Compositor; | 16 class Compositor; |
| 17 | 17 |
| 18 class ContentViewRenderView : public CompositorClient { | 18 class ContentViewRenderView : public CompositorClient { |
| 19 public: | 19 public: |
| 20 // Registers the JNI methods for ContentViewRender. | 20 // Registers the JNI methods for ContentViewRender. |
| 21 static bool RegisterContentViewRenderView(JNIEnv* env); | 21 static bool RegisterContentViewRenderView(JNIEnv* env); |
| 22 | 22 |
| 23 ContentViewRenderView(JNIEnv* env, | 23 ContentViewRenderView(JNIEnv* env, |
| 24 jobject obj, | 24 jobject obj, |
| 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, | 29 virtual void SetCurrentContentView(JNIEnv* env, |
|
Yaron
2014/03/19 19:00:12
Crossing JNI+subclasses simultaneously seems risky
| |
| 30 jlong native_content_view); | 30 jobject obj, |
| 31 void SurfaceCreated(JNIEnv* env, jobject obj); | 31 jlong native_content_view); |
| 32 virtual void SurfaceCreated(JNIEnv* env, jobject obj); | |
| 32 void SurfaceDestroyed(JNIEnv* env, jobject obj); | 33 void SurfaceDestroyed(JNIEnv* env, jobject obj); |
| 33 void SurfaceChanged(JNIEnv* env, jobject obj, | 34 void SurfaceChanged(JNIEnv* env, jobject obj, |
| 34 jint format, jint width, jint height, jobject surface); | 35 jint format, jint width, jint height, jobject surface); |
| 35 jboolean Composite(JNIEnv* env, jobject obj); | 36 virtual jboolean Composite(JNIEnv* env, jobject obj); |
| 36 jboolean CompositeToBitmap(JNIEnv* env, jobject obj, jobject java_bitmap); | 37 jboolean CompositeToBitmap(JNIEnv* env, jobject obj, jobject java_bitmap); |
| 37 void SetOverlayVideoMode(JNIEnv* env, jobject obj, bool enabled); | 38 void SetOverlayVideoMode(JNIEnv* env, jobject obj, bool enabled); |
| 38 | 39 |
| 39 // CompositorClient --------------------------------------------------------- | 40 // CompositorClient --------------------------------------------------------- |
| 40 virtual void ScheduleComposite() OVERRIDE; | 41 virtual void ScheduleComposite() OVERRIDE; |
| 41 virtual void OnSwapBuffersPosted() OVERRIDE; | 42 virtual void OnSwapBuffersPosted() OVERRIDE; |
| 42 virtual void OnSwapBuffersCompleted() OVERRIDE; | 43 virtual void OnSwapBuffersCompleted() OVERRIDE; |
| 43 | 44 |
| 44 private: | 45 protected: |
| 46 scoped_ptr<content::Compositor> compositor_; | |
| 47 | |
| 48 void InitCompositor(); | |
| 45 virtual ~ContentViewRenderView(); | 49 virtual ~ContentViewRenderView(); |
| 46 | 50 |
| 47 void InitCompositor(); | 51 private: |
| 52 bool buffers_swapped_during_composite_; | |
| 48 | 53 |
| 49 bool buffers_swapped_during_composite_; | 54 gfx::NativeWindow root_window_; |
| 50 | 55 |
| 51 base::android::ScopedJavaGlobalRef<jobject> java_obj_; | 56 base::android::ScopedJavaGlobalRef<jobject> java_obj_; |
| 52 | 57 |
| 53 scoped_ptr<content::Compositor> compositor_; | |
| 54 | |
| 55 gfx::NativeWindow root_window_; | |
| 56 int current_surface_format_; | 58 int current_surface_format_; |
| 57 | 59 |
| 58 DISALLOW_COPY_AND_ASSIGN(ContentViewRenderView); | 60 DISALLOW_COPY_AND_ASSIGN(ContentViewRenderView); |
| 59 }; | 61 }; |
| 60 | 62 |
| 61 | |
| 62 | |
| 63 } | 63 } |
| 64 | 64 |
| 65 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_RENDER_VIEW_H_ | 65 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_RENDER_VIEW_H_ |
| OLD | NEW |