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