| 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 | 13 |
| 14 namespace ui { |
| 15 class WindowAndroid; |
| 16 } |
| 17 |
| 14 namespace content { | 18 namespace content { |
| 15 class Compositor; | 19 class Compositor; |
| 16 | 20 |
| 17 class ContentViewRenderView : public CompositorClient { | 21 class ContentViewRenderView : public CompositorClient { |
| 18 public: | 22 public: |
| 19 // Registers the JNI methods for ContentViewRender. | 23 // Registers the JNI methods for ContentViewRender. |
| 20 static bool RegisterContentViewRenderView(JNIEnv* env); | 24 static bool RegisterContentViewRenderView(JNIEnv* env); |
| 21 | 25 |
| 22 ContentViewRenderView(JNIEnv* env, jobject obj); | 26 ContentViewRenderView(JNIEnv* env, |
| 27 jobject obj, |
| 28 ui::WindowAndroid* window_android); |
| 23 | 29 |
| 24 // Methods called from Java via JNI ----------------------------------------- | 30 // Methods called from Java via JNI ----------------------------------------- |
| 25 void Destroy(JNIEnv* env, jobject obj); | 31 void Destroy(JNIEnv* env, jobject obj); |
| 26 void SetCurrentContentView(JNIEnv* env, jobject obj, int native_content_view); | 32 void SetCurrentContentView(JNIEnv* env, jobject obj, int native_content_view); |
| 27 void SurfaceCreated(JNIEnv* env, jobject obj, jobject jsurface); | 33 void SurfaceCreated(JNIEnv* env, jobject obj, jobject jsurface); |
| 28 void SurfaceDestroyed(JNIEnv* env, jobject obj); | 34 void SurfaceDestroyed(JNIEnv* env, jobject obj); |
| 29 void SurfaceSetSize(JNIEnv* env, jobject obj, jint width, jint height); | 35 void SurfaceSetSize(JNIEnv* env, jobject obj, jint width, jint height); |
| 30 jboolean Composite(JNIEnv* env, jobject obj); | 36 jboolean Composite(JNIEnv* env, jobject obj); |
| 31 jboolean CompositeToBitmap(JNIEnv* env, jobject obj, jobject java_bitmap); | 37 jboolean CompositeToBitmap(JNIEnv* env, jobject obj, jobject java_bitmap); |
| 32 | 38 |
| 33 // CompositorClient --------------------------------------------------------- | 39 // CompositorClient --------------------------------------------------------- |
| 34 virtual void ScheduleComposite() OVERRIDE; | 40 virtual void ScheduleComposite() OVERRIDE; |
| 35 virtual void OnSwapBuffersPosted() OVERRIDE; | 41 virtual void OnSwapBuffersPosted() OVERRIDE; |
| 36 virtual void OnSwapBuffersCompleted() OVERRIDE; | 42 virtual void OnSwapBuffersCompleted() OVERRIDE; |
| 37 | 43 |
| 38 private: | 44 private: |
| 39 virtual ~ContentViewRenderView(); | 45 virtual ~ContentViewRenderView(); |
| 40 | 46 |
| 41 void InitCompositor(); | 47 void InitCompositor(); |
| 42 | 48 |
| 43 bool buffers_swapped_during_composite_; | 49 bool buffers_swapped_during_composite_; |
| 44 | 50 |
| 45 base::android::ScopedJavaGlobalRef<jobject> java_obj_; | 51 base::android::ScopedJavaGlobalRef<jobject> java_obj_; |
| 46 | 52 |
| 47 scoped_ptr<content::Compositor> compositor_; | 53 scoped_ptr<content::Compositor> compositor_; |
| 48 | 54 |
| 55 ui::WindowAndroid* window_android_; |
| 56 |
| 49 DISALLOW_COPY_AND_ASSIGN(ContentViewRenderView); | 57 DISALLOW_COPY_AND_ASSIGN(ContentViewRenderView); |
| 50 }; | 58 }; |
| 51 | 59 |
| 52 | 60 |
| 53 | 61 |
| 54 } | 62 } |
| 55 | 63 |
| 56 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_RENDER_VIEW_H_ | 64 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_RENDER_VIEW_H_ |
| OLD | NEW |