Divide gesture events by dpi scale if IsDIPEnabled().

content/browser/android/content_view_core_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/android/content_view_core_impl.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/android/load_url_params.h"
 #include "content/browser/android/touch_point.h"
 #include "content/browser/renderer_host/java/java_bound_object.h"
 #include "content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_android.h"
 #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"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/page_transition_types.h"
 #include "jni/ContentViewCore_jni.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 #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"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertJavaStringToUTF16;
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertUTF16ToJavaString;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::GetClass;
 using base::android::HasField;
 using base::android::JavaByteArrayToByteVector;
 using base::android::ScopedJavaGlobalRef;
 using base::android::ScopedJavaLocalRef;
 using WebKit::WebInputEvent;
+using WebKit::WebGestureEvent;

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

nit: move 1 line down

 using WebKit::WebInputEventFactory;
 
 // Describes the type and enabled state of a select popup item.
 // Keep in sync with the value defined in SelectPopupDialog.java
 enum PopupItemType {
   POPUP_ITEM_TYPE_GROUP = 0,
   POPUP_ITEM_TYPE_DISABLED,
   POPUP_ITEM_TYPE_ENABLED
 };
 
@@ skipping 22 matching lines @@
       web_contents_(static_cast<WebContentsImpl*>(web_contents)),
       tab_crashed_(false),
       window_android_(window_android) {
   DCHECK(web_contents) <<
       "A ContentViewCoreImpl should be created with a valid WebContents.";
 
   // TODO(leandrogracia): make use of the hardware_accelerated argument.
 
   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());
 
   // Currently, the only use case we have for overriding a user agent involves
   // spoofing a desktop Linux user agent for "Request desktop site".
   // Automatically set it for all WebContents so that it is available when a
   // NavigationEntry requires the user agent to be overridden.
   const char kLinuxInfoStr[] = "X11; Linux x86_64";
   std::string product = content::GetContentClient()->GetProduct();
@@ skipping 381 matching lines @@
   }
   return false;
 }
 
 int ContentViewCoreImpl::GetTouchPadding()
 {
   // TODO(trchen): derive a proper padding value from device dpi
   return 48;
 }
 
+float ContentViewCoreImpl::DpiScale() const {
+  return dpi_scale_;
+}
+
 jboolean ContentViewCoreImpl::SendMouseMoveEvent(JNIEnv* env,
                                                  jobject obj,
                                                  jlong time_ms,
                                                  jint x,
                                                  jint y) {
   RenderWidgetHostViewAndroid* rwhv = GetRenderWidgetHostViewAndroid();
   if (!rwhv)
     return false;
 
   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;
 }
 
 jboolean ContentViewCoreImpl::SendMouseWheelEvent(JNIEnv* env,
                                                   jobject obj,
                                                   jlong time_ms,
                                                   jint x,
                                                   jint y,
                                                   jfloat vertical_axis) {
   RenderWidgetHostViewAndroid* rwhv = GetRenderWidgetHostViewAndroid();
   if (!rwhv)
     return false;
 
   WebKit::WebInputEventFactory::MouseWheelDirectionType type;
   if (vertical_axis > 0) {
     type = WebInputEventFactory::MouseWheelDirectionTypeUp;
   } else if (vertical_axis < 0) {
     type = WebInputEventFactory::MouseWheelDirectionTypeDown;
   } else {
     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);
+WebGestureEvent ContentViewCoreImpl::MakeGestureEvent(WebInputEvent::Type type,
+                                         long time_ms, int x, int y) const {

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

nit:indentation

+  WebGestureEvent event;
+  event.type = type;
+  event.x = x / DpiScale();
+  event.y = y / DpiScale();
+  event.timeStampSeconds = time_ms / 1000.0;
+  return event;
+}
 
-  if (type == WebInputEvent::GestureFlingStart)
-    event.data.flingStart.sourceDevice = WebKit::WebGestureEvent::Touchscreen;
-
+void ContentViewCoreImpl::ScrollBegin(JNIEnv* env, jobject obj, jlong time_ms,
+                                      jint x, jint y) {
+  WebGestureEvent event = MakeGestureEvent(
+      WebInputEvent::GestureScrollBegin, time_ms, x, y);
   if (GetRenderWidgetHostViewAndroid())
     GetRenderWidgetHostViewAndroid()->SendGestureEvent(event);
 }
 
-void ContentViewCoreImpl::ScrollBegin(JNIEnv* env, jobject obj, jlong time_ms,
-                                      jint x, jint y) {
-  SendGestureEvent(
-      WebInputEvent::GestureScrollBegin, time_ms, x, y);
-}
-
 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);
 }
 
 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())
     GetRenderWidgetHostViewAndroid()->SendGestureEvent(event);
 }
 
 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 (GetRenderWidgetHostViewAndroid())
     GetRenderWidgetHostViewAndroid()->SendGestureEvent(event);
 }
 
 void ContentViewCoreImpl::PinchBegin(JNIEnv* env, jobject obj, jlong time_ms,
                                      jint x, jint y) {
-  SendGestureEvent(
+  WebGestureEvent event = MakeGestureEvent(
       WebInputEvent::GesturePinchBegin, time_ms, x, y);
+  if (GetRenderWidgetHostViewAndroid())
+    GetRenderWidgetHostViewAndroid()->SendGestureEvent(event);
 }
 
 void ContentViewCoreImpl::PinchEnd(JNIEnv* env, jobject obj, jlong time_ms) {
-  SendGestureEvent(WebInputEvent::GesturePinchEnd, time_ms, 0, 0);
+  WebGestureEvent event = MakeGestureEvent(
+      WebInputEvent::GesturePinchEnd, time_ms, 0, 0);
+  if (GetRenderWidgetHostViewAndroid())
+    GetRenderWidgetHostViewAndroid()->SendGestureEvent(event);
 }
 
 void ContentViewCoreImpl::PinchBy(JNIEnv* env, jobject obj, jlong time_ms,
                                   jint anchor_x, jint anchor_y, jfloat delta) {
-  WebKit::WebGestureEvent event = WebInputEventFactory::gestureEvent(
-      WebInputEvent::GesturePinchUpdate, time_ms / 1000.0, anchor_x, anchor_y,
-      delta, delta, 0);
+  WebGestureEvent event = MakeGestureEvent(
+      WebInputEvent::GesturePinchUpdate, time_ms, anchor_x, anchor_y);
   event.data.pinchUpdate.scale = delta;
 
   if (GetRenderWidgetHostViewAndroid())
     GetRenderWidgetHostViewAndroid()->SendGestureEvent(event);
 }
 
 void ContentViewCoreImpl::SelectBetweenCoordinates(JNIEnv* env, jobject obj,
                                                    jint x1, jint y1,
                                                    jint x2, jint y2) {
   if (GetRenderWidgetHostViewAndroid()) {
@@ skipping 205 matching lines @@
   if (!HasField(env, clazz, "mNativeContentViewCore", "I")) {
     DLOG(ERROR) << "Unable to find ContentView.mNativeContentViewCore!";
     return false;
   }
   g_native_content_view = GetFieldID(env, clazz, "mNativeContentViewCore", "I");
 
   return RegisterNativesImpl(env) >= 0;
 }
 
 }  // namespace content