Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / platform / PlatformGestureEvent.h

diff --git a/src/third_party/WebKit/Source/platform/PlatformGestureEvent.h b/src/third_party/WebKit/Source/platform/PlatformGestureEvent.h
index 2542246..86659a0 100644 (file)
--- a/src/third_party/WebKit/Source/platform/PlatformGestureEvent.h
+++ b/src/third_party/WebKit/Source/platform/PlatformGestureEvent.h
@@ -33,7 +33,7 @@
 #include "wtf/Assertions.h"
 #include <string.h>
 
-namespace WebCore {
+namespace blink {
 
 class PlatformGestureEvent : public PlatformEvent {
 public:
@@ -49,15 +49,16 @@ public:
         , m_globalPosition(globalPosition)
         , m_area(area)
     {
-        ASSERT(type == PlatformEvent::GestureScrollBegin
+        memset(&m_data, 0, sizeof(m_data));
+        if (type == PlatformEvent::GestureScrollBegin
             || type == PlatformEvent::GestureScrollEnd
             || type == PlatformEvent::GestureScrollUpdate
-            || type == PlatformEvent::GestureScrollUpdateWithoutPropagation);
-        memset(&m_data, 0, sizeof(m_data));
-        m_data.m_scrollUpdate.m_deltaX = deltaX;
-        m_data.m_scrollUpdate.m_deltaY = deltaY;
-        m_data.m_scrollUpdate.m_velocityX = velocityX;
-        m_data.m_scrollUpdate.m_velocityY = velocityY;
+            || type == PlatformEvent::GestureScrollUpdateWithoutPropagation) {
+            m_data.m_scrollUpdate.m_deltaX = deltaX;
+            m_data.m_scrollUpdate.m_deltaY = deltaY;
+            m_data.m_scrollUpdate.m_velocityX = velocityX;
+            m_data.m_scrollUpdate.m_velocityY = velocityY;
+        }
     }
 
     const IntPoint& position() const { return m_position; } // PlatformWindow coordinates.
@@ -105,6 +106,43 @@ public:
         return m_data.m_pinchUpdate.m_scale;
     }
 
+    void applyTouchAdjustment(const IntPoint& adjustedPosition)
+    {
+        // Update the window-relative position of the event so that the node that was
+        // ultimately hit is under this point (i.e. elementFromPoint for the client
+        // co-ordinates in a 'click' event should yield the target). The global
+        // position is intentionally left unmodified because it's intended to reflect
+        // raw co-ordinates unrelated to any content.
+        m_position = adjustedPosition;
+    }
+
+    bool isScrollEvent() const
+    {
+        switch (m_type) {
+        case GestureScrollBegin:
+        case GestureScrollEnd:
+        case GestureScrollUpdate:
+        case GestureScrollUpdateWithoutPropagation:
+        case GestureFlingStart:
+        case GesturePinchBegin:
+        case GesturePinchEnd:
+        case GesturePinchUpdate:
+            return true;
+        case GestureTap:
+        case GestureTapUnconfirmed:
+        case GestureTapDown:
+        case GestureShowPress:
+        case GestureTapDownCancel:
+        case GestureTwoFingerTap:
+        case GestureLongPress:
+        case GestureLongTap:
+            return false;
+        default:
+            ASSERT_NOT_REACHED();
+            return false;
+        }
+    }
+
 protected:
     IntPoint m_position;
     IntPoint m_globalPosition;
@@ -128,6 +166,6 @@ protected:
     } m_data;
 };
 
-} // namespace WebCore
+} // namespace blink
 
 #endif // PlatformGestureEvent_h