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..9f8922868109db2ff596d962f2857c17a34532ef 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_horizontal_padding_ = GetPaddingFromResources();
 }
 
 PopupTouchHandleDrawable::~PopupTouchHandleDrawable() {
@@ -30,24 +31,30 @@ void PopupTouchHandleDrawable::SetEnabled(bool enabled) {
 }
 
 void PopupTouchHandleDrawable::SetOrientation(
-    ui::TouchHandleOrientation orientation) {
+    ui::TouchHandleOrientation orientation,
+    bool mirror_vertical,
+    bool mirror_horizontal) {
   JNIEnv* env = base::android::AttachCurrentThread();
   jobject obj = drawable_.obj();
-  Java_PopupTouchHandleDrawable_setOrientation(env, obj,
-                                               static_cast<int>(orientation));
+
+  Java_PopupTouchHandleDrawable_setOrientation(
+      env, obj, static_cast<int>(orientation), mirror_vertical,
+      mirror_horizontal);
 }
 
-void PopupTouchHandleDrawable::SetAlpha(float alpha) {
+void PopupTouchHandleDrawable::SetOrigin(const gfx::PointF& origin) {
   JNIEnv* env = base::android::AttachCurrentThread();
-  bool visible = alpha > 0;
-  Java_PopupTouchHandleDrawable_setVisible(env, drawable_.obj(), visible);
+  jobject obj = drawable_.obj();
+
+  const gfx::PointF origin_pix = gfx::ScalePoint(origin, dpi_scale_);
+  Java_PopupTouchHandleDrawable_setOrigin(env, obj, origin_pix.x(),
+                                          origin_pix.y());
 }
 
-void PopupTouchHandleDrawable::SetFocus(const gfx::PointF& position) {
-  const gfx::PointF position_pix = gfx::ScalePoint(position, dpi_scale_);
+void PopupTouchHandleDrawable::SetAlpha(float alpha) {
   JNIEnv* env = base::android::AttachCurrentThread();
-  Java_PopupTouchHandleDrawable_setFocus(
-      env, drawable_.obj(), position_pix.x(), position_pix.y());
+  bool visible = alpha > 0;
+  Java_PopupTouchHandleDrawable_setVisible(env, drawable_.obj(), visible);
 }
 
 gfx::RectF PopupTouchHandleDrawable::GetVisibleBounds() const {
@@ -60,6 +67,18 @@ gfx::RectF PopupTouchHandleDrawable::GetVisibleBounds() const {
   return gfx::ScaleRect(unscaled_rect, 1.f / dpi_scale_);
 }
 
+const float PopupTouchHandleDrawable::GetPaddingFromResources() {

[jdduke (slow), 2015/08/17 17:20:50]

Nit: This is only use once, let's just inline it in the constructor.

[AviD, 2015/08/18 13:56:14]

Done.

+  JNIEnv* env = base::android::AttachCurrentThread();
+  const float horizontal_padding =
+      Java_PopupTouchHandleDrawable_getHandleHorizontalPadding(env,
+                                                               drawable_.obj());
+  return horizontal_padding;
+}
+
+const float PopupTouchHandleDrawable::GetDrawableHorizontalPadding() const {
+  return drawable_horizontal_padding_;
+}
+
 // static
 bool PopupTouchHandleDrawable::RegisterPopupTouchHandleDrawable(JNIEnv* env) {
   return RegisterNativesImpl(env);