| 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 <memory> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "base/android/jni_weak_ref.h" | 10 #include "base/android/jni_weak_ref.h" |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 public: | 25 public: |
| 26 // Registers the JNI methods for ContentViewRender. | 26 // Registers the JNI methods for ContentViewRender. |
| 27 static bool RegisterContentViewRenderView(JNIEnv* env); | 27 static bool RegisterContentViewRenderView(JNIEnv* env); |
| 28 | 28 |
| 29 ContentViewRenderView(JNIEnv* env, | 29 ContentViewRenderView(JNIEnv* env, |
| 30 jobject obj, | 30 jobject obj, |
| 31 gfx::NativeWindow root_window); | 31 gfx::NativeWindow root_window); |
| 32 | 32 |
| 33 // Methods called from Java via JNI ----------------------------------------- | 33 // Methods called from Java via JNI ----------------------------------------- |
| 34 void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj); | 34 void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj); |
| 35 void SetCurrentContentViewCore( | 35 void SetCurrentWebContents( |
| 36 JNIEnv* env, | 36 JNIEnv* env, |
| 37 const base::android::JavaParamRef<jobject>& obj, | 37 const base::android::JavaParamRef<jobject>& obj, |
| 38 jlong native_content_view_core); | 38 const base::android::JavaParamRef<jobject>& jweb_contents); |
| 39 void SurfaceCreated(JNIEnv* env, | 39 void SurfaceCreated(JNIEnv* env, |
| 40 const base::android::JavaParamRef<jobject>& obj); | 40 const base::android::JavaParamRef<jobject>& obj); |
| 41 void SurfaceDestroyed(JNIEnv* env, | 41 void SurfaceDestroyed(JNIEnv* env, |
| 42 const base::android::JavaParamRef<jobject>& obj); | 42 const base::android::JavaParamRef<jobject>& obj); |
| 43 void SurfaceChanged(JNIEnv* env, | 43 void SurfaceChanged(JNIEnv* env, |
| 44 const base::android::JavaParamRef<jobject>& obj, | 44 const base::android::JavaParamRef<jobject>& obj, |
| 45 jint format, | 45 jint format, |
| 46 jint width, | 46 jint width, |
| 47 jint height, | 47 jint height, |
| 48 const base::android::JavaParamRef<jobject>& surface); | 48 const base::android::JavaParamRef<jobject>& surface); |
| (...skipping 18 matching lines...) Expand all Loading... |
| 67 int current_surface_format_; | 67 int current_surface_format_; |
| 68 | 68 |
| 69 DISALLOW_COPY_AND_ASSIGN(ContentViewRenderView); | 69 DISALLOW_COPY_AND_ASSIGN(ContentViewRenderView); |
| 70 }; | 70 }; |
| 71 | 71 |
| 72 | 72 |
| 73 | 73 |
| 74 } | 74 } |
| 75 | 75 |
| 76 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_RENDER_VIEW_H_ | 76 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_RENDER_VIEW_H_ |
| OLD | NEW |