Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(137)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/android/content_view_core_impl.h

Issue 1489453003: jni: Pass method parameters as JavaParamRef in content. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/android/content_video_view.cc ('k') | content/browser/android/content_view_core_impl.cc » ('j') | content/browser/android/content_view_core_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/android/content_view_core_impl.h
diff --git a/content/browser/android/content_view_core_impl.h b/content/browser/android/content_view_core_impl.h
index 55157a15e752a7ca3ad73a3c73118ca9ed2d769a..c3acf0bd466f208017b448e6960bd5cd8e48c1f1 100644
--- a/content/browser/android/content_view_core_impl.h
+++ b/content/browser/android/content_view_core_impl.h
@@ -71,56 +71,66 @@ class ContentViewCoreImpl : public ContentViewCore,
// Methods called from Java via JNI
// --------------------------------------------------------------------------
- base::android::ScopedJavaLocalRef<jobject> GetWebContentsAndroid(JNIEnv* env,
- jobject obj);
- base::android::ScopedJavaLocalRef<jobject> GetJavaWindowAndroid(JNIEnv* env,
- jobject obj);
+ base::android::ScopedJavaLocalRef<jobject> GetWebContentsAndroid(
+ JNIEnv* env,
+ const base::android::JavaParamRef<jobject>& obj);
+ base::android::ScopedJavaLocalRef<jobject> GetJavaWindowAndroid(
+ JNIEnv* env,
+ const base::android::JavaParamRef<jobject>& obj);
- void OnJavaContentViewCoreDestroyed(JNIEnv* env, jobject obj);
+ void OnJavaContentViewCoreDestroyed(
+ JNIEnv* env,
+ const base::android::JavaParamRef<jobject>& obj);
// Notifies the ContentViewCore that items were selected in the currently
// showing select popup.
- void SelectPopupMenuItems(JNIEnv* env, jobject obj,
- jlong selectPopupSourceFrame,
- jintArray indices);
-
- void SendOrientationChangeEvent(JNIEnv* env, jobject obj, jint orientation);
- jboolean OnTouchEvent(JNIEnv* env,
- jobject obj,
- jobject motion_event,
- jlong time_ms,
- jint android_action,
- jint pointer_count,
- jint history_size,
- jint action_index,
- jfloat pos_x_0,
- jfloat pos_y_0,
- jfloat pos_x_1,
- jfloat pos_y_1,
- jint pointer_id_0,
- jint pointer_id_1,
- jfloat touch_major_0,
- jfloat touch_major_1,
- jfloat touch_minor_0,
- jfloat touch_minor_1,
- jfloat orientation_0,
- jfloat orientation_1,
- jfloat tilt_0,
- jfloat tilt_1,
- jfloat raw_pos_x,
- jfloat raw_pos_y,
- jint android_tool_type_0,
- jint android_tool_type_1,
- jint android_button_state,
- jint android_meta_state,
- jboolean is_touch_handle_event);
+ void SelectPopupMenuItems(
+ JNIEnv* env,
+ const base::android::JavaParamRef<jobject>& obj,
+ jlong selectPopupSourceFrame,
+ const base::android::JavaParamRef<jintArray>& indices);
+
+ void SendOrientationChangeEvent(
+ JNIEnv* env,
+ const base::android::JavaParamRef<jobject>& obj,
+ jint orientation);
+ jboolean OnTouchEvent(
+ JNIEnv* env,
+ const base::android::JavaParamRef<jobject>& obj,
+ const base::android::JavaParamRef<jobject>& motion_event,
+ jlong time_ms,
+ jint android_action,
+ jint pointer_count,
+ jint history_size,
+ jint action_index,
+ jfloat pos_x_0,
+ jfloat pos_y_0,
+ jfloat pos_x_1,
+ jfloat pos_y_1,
+ jint pointer_id_0,
+ jint pointer_id_1,
+ jfloat touch_major_0,
+ jfloat touch_major_1,
+ jfloat touch_minor_0,
+ jfloat touch_minor_1,
+ jfloat orientation_0,
+ jfloat orientation_1,
+ jfloat tilt_0,
+ jfloat tilt_1,
+ jfloat raw_pos_x,
+ jfloat raw_pos_y,
+ jint android_tool_type_0,
+ jint android_tool_type_1,
+ jint android_button_state,
+ jint android_meta_state,
+ jboolean is_touch_handle_event);
jboolean SendMouseMoveEvent(JNIEnv* env,
- jobject obj,
+ const base::android::JavaParamRef<jobject>& obj,
jlong time_ms,
jfloat x,
jfloat y);
jboolean SendMouseWheelEvent(JNIEnv* env,
- jobject obj,
+ const base::android::JavaParamRef<jobject>& obj,
jlong time_ms,
jfloat x,
jfloat y,
@@ -128,89 +138,145 @@ class ContentViewCoreImpl : public ContentViewCore,
jfloat ticks_y,
jfloat pixels_per_tick);
void ScrollBegin(JNIEnv* env,
- jobject obj,
+ const base::android::JavaParamRef<jobject>& obj,
jlong time_ms,
jfloat x,
jfloat y,
jfloat hintx,
jfloat hinty,
jboolean target_viewport);
- void ScrollEnd(JNIEnv* env, jobject obj, jlong time_ms);
- void ScrollBy(JNIEnv* env, jobject obj, jlong time_ms,
- jfloat x, jfloat y, jfloat dx, jfloat dy);
+ void ScrollEnd(JNIEnv* env,
+ const base::android::JavaParamRef<jobject>& obj,
+ jlong time_ms);
+ void ScrollBy(JNIEnv* env,
+ const base::android::JavaParamRef<jobject>& obj,
+ jlong time_ms,
+ jfloat x,
+ jfloat y,
+ jfloat dx,
+ jfloat dy);
void FlingStart(JNIEnv* env,
- jobject obj,
+ const base::android::JavaParamRef<jobject>& obj,
jlong time_ms,
jfloat x,
jfloat y,
jfloat vx,
jfloat vy,
jboolean target_viewport);
- void FlingCancel(JNIEnv* env, jobject obj, jlong time_ms);
- void SingleTap(JNIEnv* env, jobject obj, jlong time_ms,
- jfloat x, jfloat y);
- void DoubleTap(JNIEnv* env, jobject obj, jlong time_ms,
- jfloat x, jfloat y);
- void LongPress(JNIEnv* env, jobject obj, jlong time_ms,
- jfloat x, jfloat y);
- void PinchBegin(JNIEnv* env, jobject obj, jlong time_ms, jfloat x, jfloat y);
- void PinchEnd(JNIEnv* env, jobject obj, jlong time_ms);
- void PinchBy(JNIEnv* env, jobject obj, jlong time_ms,
- jfloat x, jfloat y, jfloat delta);
- void SelectBetweenCoordinates(JNIEnv* env, jobject obj,
- jfloat x1, jfloat y1,
- jfloat x2, jfloat y2);
- void MoveCaret(JNIEnv* env, jobject obj, jfloat x, jfloat y);
- void DismissTextHandles(JNIEnv* env, jobject obj);
- void SetTextHandlesTemporarilyHidden(JNIEnv* env,
- jobject obj,
- jboolean hidden);
-
- void ResetGestureDetection(JNIEnv* env, jobject obj);
- void SetDoubleTapSupportEnabled(JNIEnv* env, jobject obj, jboolean enabled);
- void SetMultiTouchZoomSupportEnabled(JNIEnv* env,
- jobject obj,
- jboolean enabled);
-
- long GetNativeImeAdapter(JNIEnv* env, jobject obj);
- void SetFocus(JNIEnv* env, jobject obj, jboolean focused);
+ void FlingCancel(JNIEnv* env,
+ const base::android::JavaParamRef<jobject>& obj,
+ jlong time_ms);
+ void SingleTap(JNIEnv* env,
+ const base::android::JavaParamRef<jobject>& obj,
+ jlong time_ms,
+ jfloat x,
+ jfloat y);
+ void DoubleTap(JNIEnv* env,
+ const base::android::JavaParamRef<jobject>& obj,
+ jlong time_ms,
+ jfloat x,
+ jfloat y);
+ void LongPress(JNIEnv* env,
+ const base::android::JavaParamRef<jobject>& obj,
+ jlong time_ms,
+ jfloat x,
+ jfloat y);
+ void PinchBegin(JNIEnv* env,
+ const base::android::JavaParamRef<jobject>& obj,
+ jlong time_ms,
+ jfloat x,
+ jfloat y);
+ void PinchEnd(JNIEnv* env,
+ const base::android::JavaParamRef<jobject>& obj,
+ jlong time_ms);
+ void PinchBy(JNIEnv* env,
+ const base::android::JavaParamRef<jobject>& obj,
+ jlong time_ms,
+ jfloat x,
+ jfloat y,
+ jfloat delta);
+ void SelectBetweenCoordinates(JNIEnv* env,
+ const base::android::JavaParamRef<jobject>& obj,
+ jfloat x1,
+ jfloat y1,
+ jfloat x2,
+ jfloat y2);
+ void MoveCaret(JNIEnv* env,
+ const base::android::JavaParamRef<jobject>& obj,
+ jfloat x,
+ jfloat y);
+ void DismissTextHandles(JNIEnv* env,
+ const base::android::JavaParamRef<jobject>& obj);
+ void SetTextHandlesTemporarilyHidden(
+ JNIEnv* env,
+ const base::android::JavaParamRef<jobject>& obj,
+ jboolean hidden);
+
+ void ResetGestureDetection(JNIEnv* env,
+ const base::android::JavaParamRef<jobject>& obj);
+ void SetDoubleTapSupportEnabled(
+ JNIEnv* env,
+ const base::android::JavaParamRef<jobject>& obj,
+ jboolean enabled);
+ void SetMultiTouchZoomSupportEnabled(
+ JNIEnv* env,
+ const base::android::JavaParamRef<jobject>& obj,
+ jboolean enabled);
+
+ long GetNativeImeAdapter(JNIEnv* env,
+ const base::android::JavaParamRef<jobject>& obj);
+ void SetFocus(JNIEnv* env,
+ const base::android::JavaParamRef<jobject>& obj,
+ jboolean focused);
jint GetBackgroundColor(JNIEnv* env, jobject obj);
void SetBackgroundColor(JNIEnv* env, jobject obj, jint color);
- void SetAllowJavascriptInterfacesInspection(JNIEnv* env,
- jobject obj,
- jboolean allow);
- void AddJavascriptInterface(JNIEnv* env,
- jobject obj,
- jobject object,
- jstring name,
- jclass safe_annotation_clazz);
- void RemoveJavascriptInterface(JNIEnv* env, jobject obj, jstring name);
- void WasResized(JNIEnv* env, jobject obj);
-
- void SetAccessibilityEnabled(JNIEnv* env, jobject obj, bool enabled);
-
- void SetTextTrackSettings(JNIEnv* env,
- jobject obj,
- jboolean textTracksEnabled,
- jstring textTrackBackgroundColor,
- jstring textTrackFontFamily,
- jstring textTrackFontStyle,
- jstring textTrackFontVariant,
- jstring textTrackTextColor,
- jstring textTrackTextShadow,
- jstring textTrackTextSize);
+ void SetAllowJavascriptInterfacesInspection(
+ JNIEnv* env,
+ const base::android::JavaParamRef<jobject>& obj,
+ jboolean allow);
+ void AddJavascriptInterface(
+ JNIEnv* env,
+ const base::android::JavaParamRef<jobject>& obj,
+ const base::android::JavaParamRef<jobject>& object,
+ const base::android::JavaParamRef<jstring>& name,
+ const base::android::JavaParamRef<jclass>& safe_annotation_clazz);
+ void RemoveJavascriptInterface(
+ JNIEnv* env,
+ const base::android::JavaParamRef<jobject>& obj,
+ const base::android::JavaParamRef<jstring>& name);
+ void WasResized(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj);
+
+ void SetAccessibilityEnabled(JNIEnv* env,
+ const base::android::JavaParamRef<jobject>& obj,
+ bool enabled);
+
+ void SetTextTrackSettings(
+ JNIEnv* env,
+ const base::android::JavaParamRef<jobject>& obj,
+ jboolean textTracksEnabled,
+ const base::android::JavaParamRef<jstring>& textTrackBackgroundColor,
+ const base::android::JavaParamRef<jstring>& textTrackFontFamily,
+ const base::android::JavaParamRef<jstring>& textTrackFontStyle,
+ const base::android::JavaParamRef<jstring>& textTrackFontVariant,
+ const base::android::JavaParamRef<jstring>& textTrackTextColor,
+ const base::android::JavaParamRef<jstring>& textTrackTextShadow,
+ const base::android::JavaParamRef<jstring>& textTrackTextSize);
void ExtractSmartClipData(JNIEnv* env,
- jobject obj,
+ const base::android::JavaParamRef<jobject>& obj,
jint x,
jint y,
jint width,
jint height);
- void SetBackgroundOpaque(JNIEnv* env, jobject jobj, jboolean opaque);
+ void SetBackgroundOpaque(JNIEnv* env,
+ const base::android::JavaParamRef<jobject>& jobj,
+ jboolean opaque);
- jint GetCurrentRenderProcessId(JNIEnv* env, jobject obj);
+ jint GetCurrentRenderProcessId(
+ JNIEnv* env,
+ const base::android::JavaParamRef<jobject>& obj);
// --------------------------------------------------------------------------
// Public methods that call to Java via JNI
« no previous file with comments | « content/browser/android/content_video_view.cc ('k') | content/browser/android/content_view_core_impl.cc » ('j') | content/browser/android/content_view_core_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698