Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / content / renderer / input / input_handler_proxy.cc

diff --git a/src/content/renderer/input/input_handler_proxy.cc b/src/content/renderer/input/input_handler_proxy.cc
index d721dcf..789cb58 100644 (file)
--- a/src/content/renderer/input/input_handler_proxy.cc
+++ b/src/content/renderer/input/input_handler_proxy.cc
@@ -51,7 +51,7 @@ void SendScrollLatencyUma(const WebInputEvent& event,
     UMA_HISTOGRAM_CUSTOM_COUNTS(
         "Event.Latency.RendererImpl.GestureScroll2",
         delta.InMicroseconds(),
-        0,
+        1,
         1000000,
         100);
   }
@@ -222,9 +222,11 @@ InputHandlerProxy::EventDisposition InputHandlerProxy::HandleInputEvent(
     for (size_t i = 0; i < touch_event.touchesLength; ++i) {
       if (touch_event.touches[i].state != WebTouchPoint::StatePressed)
         continue;
-      if (input_handler_->HaveTouchEventHandlersAt(touch_event.touches[i]
-                                                       .position))
+      if (input_handler_->HaveTouchEventHandlersAt(
+              blink::WebPoint(touch_event.touches[i].position.x,
+                              touch_event.touches[i].position.y))) {
         return DID_NOT_HANDLE;
+      }
     }
     return DROP_EVENT;
   } else if (WebInputEvent::isKeyboardEventType(event.type)) {