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_weak_ref.h" | 8 #include "base/android/jni_weak_ref.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 12 matching lines...) Expand all Loading... | |
| 23 class ContentViewRenderView : public CompositorClient { | 23 class ContentViewRenderView : public CompositorClient { |
| 24 public: | 24 public: |
| 25 // Registers the JNI methods for ContentViewRender. | 25 // Registers the JNI methods for ContentViewRender. |
| 26 static bool RegisterContentViewRenderView(JNIEnv* env); | 26 static bool RegisterContentViewRenderView(JNIEnv* env); |
| 27 | 27 |
| 28 ContentViewRenderView(JNIEnv* env, | 28 ContentViewRenderView(JNIEnv* env, |
| 29 jobject obj, | 29 jobject obj, |
| 30 gfx::NativeWindow root_window); | 30 gfx::NativeWindow root_window); |
| 31 | 31 |
| 32 // Methods called from Java via JNI ----------------------------------------- | 32 // Methods called from Java via JNI ----------------------------------------- |
| 33 void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj); | |
|
Ted C
2016/02/01 21:51:00
I would leave destroy. It is probably a bug in th
AKV
2016/02/02 06:02:01
Thanks. I will try to fix that as well in next pat
| |
| 34 void SetCurrentContentViewCore( | 33 void SetCurrentContentViewCore( |
| 35 JNIEnv* env, | 34 JNIEnv* env, |
| 36 const base::android::JavaParamRef<jobject>& obj, | 35 const base::android::JavaParamRef<jobject>& obj, |
| 37 jlong native_content_view_core); | 36 jlong native_content_view_core); |
| 38 void SurfaceCreated(JNIEnv* env, | 37 void SurfaceCreated(JNIEnv* env, |
| 39 const base::android::JavaParamRef<jobject>& obj); | 38 const base::android::JavaParamRef<jobject>& obj); |
| 40 void SurfaceDestroyed(JNIEnv* env, | 39 void SurfaceDestroyed(JNIEnv* env, |
| 41 const base::android::JavaParamRef<jobject>& obj); | 40 const base::android::JavaParamRef<jobject>& obj); |
| 42 void SurfaceChanged(JNIEnv* env, | 41 void SurfaceChanged(JNIEnv* env, |
| 43 const base::android::JavaParamRef<jobject>& obj, | 42 const base::android::JavaParamRef<jobject>& obj, |
| 44 jint format, | 43 jint format, |
| 45 jint width, | 44 jint width, |
| 46 jint height, | 45 jint height, |
| 47 const base::android::JavaParamRef<jobject>& surface); | 46 const base::android::JavaParamRef<jobject>& surface); |
| 48 void SetOverlayVideoMode(JNIEnv* env, | 47 void SetOverlayVideoMode(JNIEnv* env, |
| 49 const base::android::JavaParamRef<jobject>& obj, | 48 const base::android::JavaParamRef<jobject>& obj, |
| 50 bool enabled); | 49 bool enabled); |
| 51 void SetNeedsComposite(JNIEnv* env, | 50 void SetNeedsComposite(JNIEnv* env, |
| 52 const base::android::JavaParamRef<jobject>& obj); | 51 const base::android::JavaParamRef<jobject>& obj); |
| 53 | 52 |
| 54 // TODO(yusufo): Remove this once the compositor code is | |
| 55 // refactored to use a unified system. | |
| 56 jlong GetUIResourceProvider(JNIEnv* env, | |
| 57 const base::android::JavaParamRef<jobject>& obj); | |
| 58 | |
| 59 // CompositorClient implementation | 53 // CompositorClient implementation |
| 60 void UpdateLayerTreeHost() override; | 54 void UpdateLayerTreeHost() override; |
| 61 void OnSwapBuffersCompleted(int pending_swap_buffers) override; | 55 void OnSwapBuffersCompleted(int pending_swap_buffers) override; |
| 62 | 56 |
| 63 private: | 57 private: |
| 64 ~ContentViewRenderView() override; | 58 ~ContentViewRenderView() override; |
| 65 | 59 |
| 66 void InitCompositor(); | 60 void InitCompositor(); |
| 67 | 61 |
| 68 base::android::ScopedJavaGlobalRef<jobject> java_obj_; | 62 base::android::ScopedJavaGlobalRef<jobject> java_obj_; |
| 69 | 63 |
| 70 scoped_ptr<content::Compositor> compositor_; | 64 scoped_ptr<content::Compositor> compositor_; |
| 71 | 65 |
| 72 gfx::NativeWindow root_window_; | 66 gfx::NativeWindow root_window_; |
| 73 int current_surface_format_; | 67 int current_surface_format_; |
| 74 | 68 |
| 75 DISALLOW_COPY_AND_ASSIGN(ContentViewRenderView); | 69 DISALLOW_COPY_AND_ASSIGN(ContentViewRenderView); |
| 76 }; | 70 }; |
| 77 | 71 |
| 78 | 72 |
| 79 | 73 |
| 80 } | 74 } |
| 81 | 75 |
| 82 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_RENDER_VIEW_H_ | 76 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_RENDER_VIEW_H_ |
| OLD | NEW |