Support for Adaptive Handle Orientation

content/browser/android/popup_touch_handle_drawable.cc

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..ef66a3de83b242d9b7eb4a88034126ebc58d0abd 100644
--- a/content/browser/android/popup_touch_handle_drawable.cc
+++ b/content/browser/android/popup_touch_handle_drawable.cc
@@ -13,6 +13,7 @@ PopupTouchHandleDrawable::PopupTouchHandleDrawable(
     float dpi_scale)
     : dpi_scale_(dpi_scale), drawable_(drawable) {
   DCHECK(drawable.obj());
+  drawable_padding_ = GetPaddingSize();
 }
 
 PopupTouchHandleDrawable::~PopupTouchHandleDrawable() {
@@ -29,12 +30,20 @@ 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) {
+  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);
 }
 
 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(
@@ -60,6 +62,24 @@ gfx::RectF PopupTouchHandleDrawable::GetVisibleBounds() const {
   return gfx::ScaleRect(unscaled_rect, 1.f / dpi_scale_);
 }
 
+gfx::SizeF PopupTouchHandleDrawable::GetPaddingSize() {
+  gfx::SizeF drawable_padding;
+  JNIEnv* env = base::android::AttachCurrentThread();
+  float vertical_padding =
+      Java_PopupTouchHandleDrawable_getHandleVerticalPadding(env,
+                                                             drawable_.obj());
+  float horizontal_padding =
+      Java_PopupTouchHandleDrawable_getHandleHorizontalPadding(env,
+                                                               drawable_.obj());
+  drawable_padding.set_height(vertical_padding);
+  drawable_padding.set_width(horizontal_padding);
+  return drawable_padding;
+}
+
+gfx::SizeF PopupTouchHandleDrawable::GetDrawablePadding() const {
+  return drawable_padding_;
+}
+
 // static
 bool PopupTouchHandleDrawable::RegisterPopupTouchHandleDrawable(JNIEnv* env) {
   return RegisterNativesImpl(env);