| Index: content/browser/android/popup_touch_handle_drawable.cc
|
| diff --git a/content/browser/android/popup_touch_handle_drawable.cc b/content/browser/android/popup_touch_handle_drawable.cc
|
| index 01113f3f2283c0cd76b94afddd1edb5bc90d1025..17cc54905b3a230c107beb3a8bef6875e0e51794 100644
|
| --- a/content/browser/android/popup_touch_handle_drawable.cc
|
| +++ b/content/browser/android/popup_touch_handle_drawable.cc
|
| @@ -22,7 +22,7 @@ std::unique_ptr<PopupTouchHandleDrawable> PopupTouchHandleDrawable::Create(
|
| return nullptr;
|
| JNIEnv* env = base::android::AttachCurrentThread();
|
| base::android::ScopedJavaLocalRef<jobject> drawable_obj(
|
| - Java_PopupTouchHandleDrawable_create(env, content_view_core_obj.obj()));
|
| + Java_PopupTouchHandleDrawable_create(env, content_view_core_obj));
|
| return std::unique_ptr<PopupTouchHandleDrawable>(
|
| new PopupTouchHandleDrawable(env, drawable_obj.obj(), dpi_scale));
|
| }
|
| @@ -40,7 +40,7 @@ PopupTouchHandleDrawable::~PopupTouchHandleDrawable() {
|
| JNIEnv* env = base::android::AttachCurrentThread();
|
| ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
|
| if (!obj.is_null())
|
| - Java_PopupTouchHandleDrawable_destroy(env, obj.obj());
|
| + Java_PopupTouchHandleDrawable_destroy(env, obj);
|
| }
|
|
|
| void PopupTouchHandleDrawable::SetEnabled(bool enabled) {
|
| @@ -49,9 +49,9 @@ void PopupTouchHandleDrawable::SetEnabled(bool enabled) {
|
| if (obj.is_null())
|
| return;
|
| if (enabled)
|
| - Java_PopupTouchHandleDrawable_show(env, obj.obj());
|
| + Java_PopupTouchHandleDrawable_show(env, obj);
|
| else
|
| - Java_PopupTouchHandleDrawable_hide(env, obj.obj());
|
| + Java_PopupTouchHandleDrawable_hide(env, obj);
|
| }
|
|
|
| void PopupTouchHandleDrawable::SetOrientation(
|
| @@ -62,7 +62,7 @@ void PopupTouchHandleDrawable::SetOrientation(
|
| ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
|
| if (!obj.is_null()) {
|
| Java_PopupTouchHandleDrawable_setOrientation(
|
| - env, obj.obj(), static_cast<int>(orientation), mirror_vertical,
|
| + env, obj, static_cast<int>(orientation), mirror_vertical,
|
| mirror_horizontal);
|
| }
|
| }
|
| @@ -72,7 +72,7 @@ void PopupTouchHandleDrawable::SetOrigin(const gfx::PointF& origin) {
|
| ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
|
| if (!obj.is_null()) {
|
| const gfx::PointF origin_pix = gfx::ScalePoint(origin, dpi_scale_);
|
| - Java_PopupTouchHandleDrawable_setOrigin(env, obj.obj(), origin_pix.x(),
|
| + Java_PopupTouchHandleDrawable_setOrigin(env, obj, origin_pix.x(),
|
| origin_pix.y());
|
| }
|
| }
|
| @@ -82,7 +82,7 @@ void PopupTouchHandleDrawable::SetAlpha(float alpha) {
|
| ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
|
| bool visible = alpha > 0;
|
| if (!obj.is_null())
|
| - Java_PopupTouchHandleDrawable_setVisible(env, obj.obj(), visible);
|
| + Java_PopupTouchHandleDrawable_setVisible(env, obj, visible);
|
| }
|
|
|
| gfx::RectF PopupTouchHandleDrawable::GetVisibleBounds() const {
|
| @@ -91,10 +91,10 @@ gfx::RectF PopupTouchHandleDrawable::GetVisibleBounds() const {
|
| if (obj.is_null())
|
| return gfx::RectF();
|
| gfx::RectF unscaled_rect(
|
| - Java_PopupTouchHandleDrawable_getPositionX(env, obj.obj()),
|
| - Java_PopupTouchHandleDrawable_getPositionY(env, obj.obj()),
|
| - Java_PopupTouchHandleDrawable_getVisibleWidth(env, obj.obj()),
|
| - Java_PopupTouchHandleDrawable_getVisibleHeight(env, obj.obj()));
|
| + Java_PopupTouchHandleDrawable_getPositionX(env, obj),
|
| + Java_PopupTouchHandleDrawable_getPositionY(env, obj),
|
| + Java_PopupTouchHandleDrawable_getVisibleWidth(env, obj),
|
| + Java_PopupTouchHandleDrawable_getVisibleHeight(env, obj));
|
| return gfx::ScaleRect(unscaled_rect, 1.f / dpi_scale_);
|
| }
|
|
|
|
|