Divide gesture events by dpi scale if IsDIPEnabled().

Divide gesture events by dpi scale if IsDIPEnabled().

In the future, we're planning to flip the value of IsDIPEnabled() to
true to match other platforms.  One of the behaviors implied by this is
for gesture events to be divided by the dpi scale in the browser process.

Also, this patch removes the dependency on
WebInputEventFactory::gestureEvent() since it provides no value-added on
Android and has been making it harder to make changes to this code.

BUG=152505
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=160940

[aelias_OOO_until_Jul13, 2012-10-09 01:52:55]

Hi Yusuf and Daniel, this is one of many small patches needed for the transition
to the new pinch zoom coordinate space.  It should be a no-op until the flag is
flipped.

[no sievers, 2012-10-09 15:29:21]

On 2012/10/09 01:52:55, aelias wrote:
> Hi Yusuf and Daniel, this is one of many small patches needed for the
transition
> to the new pinch zoom coordinate space.  It should be a no-op until the flag
is
> flipped.

lgtm

[no sievers, 2012-10-09 15:29:29]

https://codereview.chromium.org/11099007/diff/1/content/browser/android/conte...
File content/browser/android/content_view_core_impl.cc (right):

https://codereview.chromium.org/11099007/diff/1/content/browser/android/conte...
content/browser/android/content_view_core_impl.cc:56: using
WebKit::WebGestureEvent;
nit: move 1 line down

[Yusuf, 2012-10-09 18:34:24]

lgtm

https://codereview.chromium.org/11099007/diff/1/content/browser/android/conte...
File content/browser/android/content_view_core_impl.cc (right):

https://codereview.chromium.org/11099007/diff/1/content/browser/android/conte...
content/browser/android/content_view_core_impl.cc:555: long time_ms, int x, int
y) const {
nit:indentation

[commit-bot: I haz the power, 2012-10-09 18:39:03]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/aelias@chromium.org/11099007/2002

[commit-bot: I haz the power, 2012-10-09 18:39:05]

Failed to apply patch for content/browser/android/content_view_core_impl.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file content/browser/android/content_view_core_impl.cc
  Hunk #1 FAILED at 21.
  Hunk #2 succeeded at 38 (offset 1 line).
  Hunk #3 succeeded at 52 (offset 1 line).
  Hunk #4 succeeded at 96 (offset 1 line).
  Hunk #5 succeeded at 504 (offset 1 line).
  Hunk #6 succeeded at 520 (offset 1 line).
  Hunk #7 succeeded at 545 (offset 1 line).
  Hunk #8 succeeded at 591 (offset 1 line).
  Hunk #9 succeeded at 628 (offset 1 line).
  Hunk #10 succeeded at 660 (offset 1 line).
  1 out of 10 hunks FAILED -- saving rejects to file
content/browser/android/content_view_core_impl.cc.rej

Patch:       content/browser/android/content_view_core_impl.cc
Index: content/browser/android/content_view_core_impl.cc
diff --git a/content/browser/android/content_view_core_impl.cc
b/content/browser/android/content_view_core_impl.cc
index
2af8683f70fb91163d96fe7b2e5515073a356e26..5ee632e751d3622df87b0869dfe7ebbe521f2a3b
100644
--- a/content/browser/android/content_view_core_impl.cc
+++ b/content/browser/android/content_view_core_impl.cc
@@ -21,6 +21,7 @@
 #include "content/browser/web_contents/navigation_controller_impl.h"
 #include "content/browser/web_contents/navigation_entry_impl.h"
 #include "content/browser/web_contents/web_contents_view_android.h"
+#include "content/common/android/device_info.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/interstitial_page.h"
@@ -37,6 +38,7 @@
 #include
"third_party/WebKit/Source/WebKit/chromium/public/android/WebInputEventFactory.h"
 #include "ui/gfx/android/java_bitmap.h"
 #include "ui/gfx/android/window_android.h"
+#include "ui/gfx/screen.h"
 #include "webkit/glue/webmenuitem.h"
 #include "webkit/user_agent/user_agent_util.h"
 
@@ -50,6 +52,7 @@ using base::android::HasField;
 using base::android::JavaByteArrayToByteVector;
 using base::android::ScopedJavaGlobalRef;
 using base::android::ScopedJavaLocalRef;
+using WebKit::WebGestureEvent;
 using WebKit::WebInputEvent;
 using WebKit::WebInputEventFactory;
 
@@ -93,6 +96,13 @@ ContentViewCoreImpl::ContentViewCoreImpl(JNIEnv* env, jobject
obj,
 
   InitJNI(env, obj);
 
+  if (!gfx::Screen::IsDIPEnabled()) {
+    dpi_scale_ = 1;
+  } else {
+    scoped_ptr<content::DeviceInfo> device_info(new content::DeviceInfo());
+    dpi_scale_ = device_info->GetDPIScale();
+  }
+
   notification_registrar_.Add(this,
                               NOTIFICATION_EXECUTE_JAVASCRIPT_RESULT,
                               NotificationService::AllSources());
@@ -494,6 +504,10 @@ int ContentViewCoreImpl::GetTouchPadding()
   return 48;
 }
 
+float ContentViewCoreImpl::DpiScale() const {
+  return dpi_scale_;
+}
+
 jboolean ContentViewCoreImpl::SendMouseMoveEvent(JNIEnv* env,
                                                  jobject obj,
                                                  jlong time_ms,
@@ -506,7 +520,7 @@ jboolean ContentViewCoreImpl::SendMouseMoveEvent(JNIEnv*
env,
   WebKit::WebMouseEvent event = WebInputEventFactory::mouseEvent(
       WebInputEventFactory::MouseEventTypeMove,
       WebKit::WebMouseEvent::ButtonNone,
-      time_ms / 1000.0, x, y, 0, 1);
+      time_ms / 1000.0, x / DpiScale(), y / DpiScale(), 0, 1);
 
   rwhv->SendMouseEvent(event);
   return true;
@@ -531,42 +545,45 @@ jboolean ContentViewCoreImpl::SendMouseWheelEvent(JNIEnv*
env,
     return false;
   }
   WebKit::WebMouseWheelEvent event = WebInputEventFactory::mouseWheelEvent(
-      type, time_ms / 1000.0, x, y);
+      type, time_ms / 1000.0, x / DpiScale(), y / DpiScale());
 
   rwhv->SendMouseWheelEvent(event);
   return true;
 }
 
-void ContentViewCoreImpl::SendGestureEvent(WebInputEvent::Type type,
-                                           long time_ms, int x, int y) {
-  WebKit::WebGestureEvent event = WebInputEventFactory::gestureEvent(
-      type, time_ms / 1000.0, x, y, 0, 0, 0);
-
-  if (type == WebInputEvent::GestureFlingStart)
-    event.data.flingStart.sourceDevice = WebKit::WebGestureEvent::Touchscreen;
-
-  if (GetRenderWidgetHostViewAndroid())
-    GetRenderWidgetHostViewAndroid()->SendGestureEvent(event);
+WebGestureEvent ContentViewCoreImpl::MakeGestureEvent(WebInputEvent::Type type,
+                                                      long time_ms,
+                                                      int x, int y) const {
+  WebGestureEvent event;
+  event.type = type;
+  event.x = x / DpiScale();
+  event.y = y / DpiScale();
+  event.timeStampSeconds = time_ms / 1000.0;
+  return event;
 }
 
 void ContentViewCoreImpl::ScrollBegin(JNIEnv* env, jobject obj, jlong time_ms,
                                       jint x, jint y) {
-  SendGestureEvent(
+  WebGestureEvent event = MakeGestureEvent(
       WebInputEvent::GestureScrollBegin, time_ms, x, y);
+  if (GetRenderWidgetHostViewAndroid())
+    GetRenderWidgetHostViewAndroid()->SendGestureEvent(event);
 }
 
 void ContentViewCoreImpl::ScrollEnd(JNIEnv* env, jobject obj, jlong time_ms) {
-  SendGestureEvent(WebInputEvent::GestureScrollEnd, time_ms, 0, 0);
+  WebGestureEvent event = MakeGestureEvent(
+      WebInputEvent::GestureScrollEnd, time_ms, 0, 0);
+  if (GetRenderWidgetHostViewAndroid())
+    GetRenderWidgetHostViewAndroid()->SendGestureEvent(event);
 }
 
 void ContentViewCoreImpl::ScrollBy(JNIEnv* env, jobject obj, jlong time_ms,
                                    jint x, jint y, jint dx, jint dy) {
-  // TODO(rbyers): Stop setting generic deltaX/deltaY, crbug.com/143237
-  WebKit::WebGestureEvent event = WebInputEventFactory::gestureEvent(
-      WebInputEvent::GestureScrollUpdate, time_ms / 1000.0, x, y, -dx, -dy, 0);
+  WebGestureEvent event = MakeGestureEvent(
+      WebInputEvent::GestureScrollUpdate, time_ms, x, y);
 
-  event.data.scrollUpdate.deltaX = -dx;
-  event.data.scrollUpdate.deltaY = -dy;
+  event.data.scrollUpdate.deltaX = -dx / DpiScale();
+  event.data.scrollUpdate.deltaY = -dy / DpiScale();
 
   if (GetRenderWidgetHostViewAndroid())
     GetRenderWidgetHostViewAndroid()->SendGestureEvent(event);
@@ -574,30 +591,34 @@ void ContentViewCoreImpl::ScrollBy(JNIEnv* env, jobject
obj, jlong time_ms,
 
 void ContentViewCoreImpl::FlingStart(JNIEnv* env, jobject obj, jlong time_ms,
                                      jint x, jint y, jint vx, jint vy) {
-  WebKit::WebGestureEvent event = WebInputEventFactory::gestureEvent(
-      WebInputEvent::GestureFlingStart, time_ms / 1000.0, x, y, vx, vy, 0);
-  event.data.flingStart.velocityX = vx;
-  event.data.flingStart.velocityY = vy;
+  WebGestureEvent event = MakeGestureEvent(
+      WebInputEvent::GestureFlingStart, time_ms, x, y);
+  event.data.flingStart.velocityX = vx / DpiScale();
+  event.data.flingStart.velocityY = vy / DpiScale();
+  event.data.flingStart.sourceDevice = WebGestureEvent::Touchscreen;
 
   if (GetRenderWidgetHostViewAndroid())
     GetRenderWidgetHostViewAndroid()->SendGestureEvent(event);
 }
 
 void ContentViewCoreImpl::FlingCancel(JNIEnv* env, jobject obj, jlong time_ms)
{
-  SendGestureEvent(WebInputEvent::GestureFlingCancel, time_ms, 0, 0);
+  WebGestureEvent event = MakeGestureEvent(
+      WebInputEvent::GestureFlingCancel, time_ms, 0, 0);
+  if (GetRenderWidgetHostViewAndroid())
+    GetRenderWidgetHostViewAndroid()->SendGestureEvent(event);
 }
 
 void ContentViewCoreImpl::SingleTap(JNIEnv* env, jobject obj, jlong time_ms,
                                     jint x, jint y,
                                     jboolean disambiguation_popup_tap) {
-  WebKit::WebGestureEvent event = WebInputEventFactory::gestureEvent(
-      WebInputEvent::GestureTap, time_ms / 1000.0, x, y, 0, 0, 0);
+  WebGestureEvent event = MakeGestureEvent(
+      WebInputEvent::GestureTap, time_ms, x, y);
 
   event.data.tap.tapCount = 1;
   if (!disambiguation_popup_tap) {
     int touchPadding = GetTouchPadding();
-    event.data.tap.width = touchPadding;
-    event.data.tap.height = touchPadding;
+    event.data.tap.width = touchPadding / DpiScale();
+    event.data.tap.height = touchPadding / DpiScale();
   }
 
   if (GetRenderWidgetHostViewAndroid())
@@ -607,24 +628,30 @@ void ContentViewCoreImpl::SingleTap(JNIEnv* env, jobject
obj, jlong time_ms,
 void ContentViewCoreImpl::ShowPressState(JNIEnv* env, jobject obj,
                                          jlong time_ms,
                                          jint x, jint y) {
-  SendGestureEvent(WebInputEvent::GestureTapDown, time_ms, x, y);
+  WebGestureEvent event = MakeGestureEvent(
+      WebInputEvent::GestureTapDown, time_ms, x, y);
+  if (GetRenderWidgetHostViewAndroid())
+    GetRenderWidgetHostViewAndroid()->SendGestureEvent(event);
 }
 
 void ContentViewCoreImpl::DoubleTap(JNIEnv* env, jobject obj, jlong time_ms,
                                     jint x, jint y) {
-  SendGestureEvent(WebInputEvent::GestureDoubleTap, time_ms, x, y);
+  WebGestureEvent event = MakeGestureEvent(
+      WebInputEvent::GestureDoubleTap, time_ms, x, y);
+  if (GetRenderWidgetHostViewAndroid())
+    GetRenderWidgetHostViewAndroid()->SendGestureEvent(event);
 }
 
 void ContentViewCoreImpl::LongPress(JNIEnv* env, jobject obj, jlong time_ms,
                                     jint x, jint y,
                                     jboolean disambiguation_popup_tap) {
-  WebKit::WebGestureEvent event = WebInputEventFactory::gestureEvent(
-      WebInputEvent::GestureLongPress, time_ms / 1000.0, x, y, 0, 0, 0);
+  WebGestureEvent event = MakeGestureEvent(
+      WebInputEvent::GestureLongPress, time_ms, x, y);
 
   if (!disambiguation_popup_tap) {
     int touchPadding = GetTouchPadding();
-    event.data.longPress.width = touchPadding;
-    event.data.longPress.height = touchPadding;
+    event.data.longPress.width = touchPadding / DpiScale();
+    event.data.longPress.height = touchPadding / DpiScale();
   }
 
   if (GetRenderW…
(message too large)

[commit-bot: I haz the power, 2012-10-09 19:42:03]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/aelias@chromium.org/11099007/5003

[commit-bot: I haz the power, 2012-10-09 22:05:26]

Change committed as 160940