| 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_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 29 matching lines...) Expand all Loading... |
| 40 jint format, jint width, jint height, jobject surface); | 40 jint format, jint width, jint height, jobject surface); |
| 41 jboolean Composite(JNIEnv* env, jobject obj); | 41 jboolean Composite(JNIEnv* env, jobject obj); |
| 42 void SetOverlayVideoMode(JNIEnv* env, jobject obj, bool enabled); | 42 void SetOverlayVideoMode(JNIEnv* env, jobject obj, bool enabled); |
| 43 void SetNeedsComposite(JNIEnv* env, jobject obj); | 43 void SetNeedsComposite(JNIEnv* env, jobject obj); |
| 44 | 44 |
| 45 // TODO(yusufo): Remove this once the compositor code is | 45 // TODO(yusufo): Remove this once the compositor code is |
| 46 // refactored to use a unified system. | 46 // refactored to use a unified system. |
| 47 jlong GetUIResourceProvider(JNIEnv* env, jobject obj); | 47 jlong GetUIResourceProvider(JNIEnv* env, jobject obj); |
| 48 | 48 |
| 49 // CompositorClient implementation | 49 // CompositorClient implementation |
| 50 virtual void Layout() override; | 50 void Layout() override; |
| 51 virtual void OnSwapBuffersCompleted(int pending_swap_buffers) override; | 51 void OnSwapBuffersCompleted(int pending_swap_buffers) override; |
| 52 | 52 |
| 53 private: | 53 private: |
| 54 virtual ~ContentViewRenderView(); | 54 ~ContentViewRenderView() override; |
| 55 | 55 |
| 56 void InitCompositor(); | 56 void InitCompositor(); |
| 57 | 57 |
| 58 base::android::ScopedJavaGlobalRef<jobject> java_obj_; | 58 base::android::ScopedJavaGlobalRef<jobject> java_obj_; |
| 59 | 59 |
| 60 scoped_ptr<content::Compositor> compositor_; | 60 scoped_ptr<content::Compositor> compositor_; |
| 61 | 61 |
| 62 gfx::NativeWindow root_window_; | 62 gfx::NativeWindow root_window_; |
| 63 int current_surface_format_; | 63 int current_surface_format_; |
| 64 | 64 |
| 65 DISALLOW_COPY_AND_ASSIGN(ContentViewRenderView); | 65 DISALLOW_COPY_AND_ASSIGN(ContentViewRenderView); |
| 66 }; | 66 }; |
| 67 | 67 |
| 68 | 68 |
| 69 | 69 |
| 70 } | 70 } |
| 71 | 71 |
| 72 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_RENDER_VIEW_H_ | 72 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_RENDER_VIEW_H_ |
| OLD | NEW |