diff options
| author | torne <torne@chromium.org> | 2015-12-17 08:22:11 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-17 16:23:12 +0000 |
| commit | 270402789b8e60ccbeb19229e681ae9bb02aebf5 (patch) | |
| tree | 82db99816a88aff1e9ccefa974e1d0eb7653df5d /blimp/client/session | |
| parent | d501894251559fe547bda9381bdeb98d229f6e7c (diff) | |
| download | chromium_src-270402789b8e60ccbeb19229e681ae9bb02aebf5.zip chromium_src-270402789b8e60ccbeb19229e681ae9bb02aebf5.tar.gz chromium_src-270402789b8e60ccbeb19229e681ae9bb02aebf5.tar.bz2 | |
Pass method parameters as JavaParamRef in remaining cases.
Pass all object parameters to JNI methods in JavaParamRef<> wrappers.
BUG=506850
Review URL: https://codereview.chromium.org/1525743003
Cr-Commit-Position: refs/heads/master@{#365835}
Diffstat (limited to 'blimp/client/session')
4 files changed, 18 insertions, 14 deletions
diff --git a/blimp/client/session/blimp_client_session_android.cc b/blimp/client/session/blimp_client_session_android.cc index a877877..a33e54a 100644 --- a/blimp/client/session/blimp_client_session_android.cc +++ b/blimp/client/session/blimp_client_session_android.cc @@ -34,7 +34,8 @@ BlimpClientSessionAndroid::BlimpClientSessionAndroid( BlimpClientSessionAndroid::~BlimpClientSessionAndroid() {} -void BlimpClientSessionAndroid::Destroy(JNIEnv* env, jobject jobj) { +void BlimpClientSessionAndroid::Destroy(JNIEnv* env, + const JavaParamRef<jobject>& jobj) { delete this; } diff --git a/blimp/client/session/blimp_client_session_android.h b/blimp/client/session/blimp_client_session_android.h index fe552bf..e752f0b 100644 --- a/blimp/client/session/blimp_client_session_android.h +++ b/blimp/client/session/blimp_client_session_android.h @@ -20,7 +20,7 @@ class BlimpClientSessionAndroid : public BlimpClientSession { const base::android::JavaParamRef<jobject>& jobj); // Methods called from Java via JNI. - void Destroy(JNIEnv* env, jobject jobj); + void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& jobj); private: ~BlimpClientSessionAndroid() override; diff --git a/blimp/client/session/tab_control_feature_android.cc b/blimp/client/session/tab_control_feature_android.cc index 20da386..6eb4937 100644 --- a/blimp/client/session/tab_control_feature_android.cc +++ b/blimp/client/session/tab_control_feature_android.cc @@ -39,15 +39,17 @@ TabControlFeatureAndroid::TabControlFeatureAndroid( TabControlFeatureAndroid::~TabControlFeatureAndroid() {} -void TabControlFeatureAndroid::Destroy(JNIEnv* env, jobject jobj) { +void TabControlFeatureAndroid::Destroy(JNIEnv* env, + const JavaParamRef<jobject>& jobj) { delete this; } -void TabControlFeatureAndroid::OnContentAreaSizeChanged(JNIEnv* env, - jobject jobj, - jint width, - jint height, - jfloat dp_to_px) { +void TabControlFeatureAndroid::OnContentAreaSizeChanged( + JNIEnv* env, + const JavaParamRef<jobject>& jobj, + jint width, + jint height, + jfloat dp_to_px) { tab_control_feature_->SetSizeAndScale(gfx::Size(width, height), dp_to_px); } diff --git a/blimp/client/session/tab_control_feature_android.h b/blimp/client/session/tab_control_feature_android.h index 81aa6c5..a7f4b5a 100644 --- a/blimp/client/session/tab_control_feature_android.h +++ b/blimp/client/session/tab_control_feature_android.h @@ -21,12 +21,13 @@ class TabControlFeatureAndroid { TabControlFeature* tab_control_feature); // Methods called from Java via JNI. - void Destroy(JNIEnv* env, jobject jobj); - void OnContentAreaSizeChanged(JNIEnv* env, - jobject jobj, - jint width, - jint height, - jfloat dp_to_px); + void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& jobj); + void OnContentAreaSizeChanged( + JNIEnv* env, + const base::android::JavaParamRef<jobject>& jobj, + jint width, + jint height, + jfloat dp_to_px); private: virtual ~TabControlFeatureAndroid(); |