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