| 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 aef23f8fb0f9696f94bcf038d5320cd64fa345c6..78ba48601d58d0780d8e9be0c1e8ce3804e918da 100644
|
| --- a/content/browser/android/popup_touch_handle_drawable.cc
|
| +++ b/content/browser/android/popup_touch_handle_drawable.cc
|
| @@ -29,12 +29,21 @@ void PopupTouchHandleDrawable::SetEnabled(bool enabled) {
|
| Java_PopupTouchHandleDrawable_hide(env, drawable_.obj());
|
| }
|
|
|
| -void PopupTouchHandleDrawable::SetOrientation(
|
| - ui::TouchHandleOrientation orientation) {
|
| +void PopupTouchHandleDrawable::SetLayout(const gfx::PointF& position,
|
| + ui::TouchHandleOrientation orientation,
|
| + bool mirror_vertical,
|
| + bool mirror_horizontal,
|
| + bool mirror_changed) {
|
| + const gfx::PointF position_pix = gfx::ScalePoint(position, dpi_scale_);
|
| JNIEnv* env = base::android::AttachCurrentThread();
|
| jobject obj = drawable_.obj();
|
| - Java_PopupTouchHandleDrawable_setOrientation(env, obj,
|
| - static_cast<int>(orientation));
|
| +
|
| + Java_PopupTouchHandleDrawable_setFocus(env, obj, position_pix.x(),
|
| + position_pix.y());
|
| +
|
| + Java_PopupTouchHandleDrawable_setOrientation(
|
| + env, obj, static_cast<int>(orientation), mirror_vertical,
|
| + mirror_horizontal, mirror_changed);
|
| }
|
|
|
| void PopupTouchHandleDrawable::SetAlpha(float alpha) {
|
| @@ -43,13 +52,6 @@ void PopupTouchHandleDrawable::SetAlpha(float alpha) {
|
| Java_PopupTouchHandleDrawable_setVisible(env, drawable_.obj(), visible);
|
| }
|
|
|
| -void PopupTouchHandleDrawable::SetFocus(const gfx::PointF& position) {
|
| - const gfx::PointF position_pix = gfx::ScalePoint(position, dpi_scale_);
|
| - JNIEnv* env = base::android::AttachCurrentThread();
|
| - Java_PopupTouchHandleDrawable_setFocus(
|
| - env, drawable_.obj(), position_pix.x(), position_pix.y());
|
| -}
|
| -
|
| gfx::RectF PopupTouchHandleDrawable::GetVisibleBounds() const {
|
| JNIEnv* env = base::android::AttachCurrentThread();
|
| gfx::RectF unscaled_rect(
|
|
|