Index: Source/platform/PlatformGestureEvent.h |
diff --git a/Source/platform/PlatformGestureEvent.h b/Source/platform/PlatformGestureEvent.h |
index 86659a0ea211c75c9d3490174c55b2b1da779095..c72cb1c1e03abe2a51a9737742be9a2a593a5695 100644 |
--- a/Source/platform/PlatformGestureEvent.h |
+++ b/Source/platform/PlatformGestureEvent.h |
@@ -43,7 +43,7 @@ public: |
memset(&m_data, 0, sizeof(m_data)); |
} |
- PlatformGestureEvent(Type type, const IntPoint& position, const IntPoint& globalPosition, const IntSize& area, double timestamp, bool shiftKey, bool ctrlKey, bool altKey, bool metaKey, float deltaX, float deltaY, float velocityX, float velocityY) |
+ PlatformGestureEvent(Type type, const IntPoint& position, const IntPoint& globalPosition, const IntSize& area, double timestamp, bool shiftKey, bool ctrlKey, bool altKey, bool metaKey, float deltaX, float deltaY, float velocityX, float velocityY, bool preventPropagation) |
: PlatformEvent(type, shiftKey, ctrlKey, altKey, metaKey, timestamp) |
, m_position(position) |
, m_globalPosition(globalPosition) |
@@ -58,6 +58,7 @@ public: |
m_data.m_scrollUpdate.m_deltaY = deltaY; |
m_data.m_scrollUpdate.m_velocityX = velocityX; |
m_data.m_scrollUpdate.m_velocityY = velocityY; |
+ m_data.m_scrollUpdate.m_preventPropagation = preventPropagation; |
} |
} |
@@ -100,6 +101,13 @@ public: |
return m_data.m_scrollUpdate.m_velocityY; |
} |
+ bool preventPropagation() const |
+ { |
+ ASSERT(m_type == PlatformEvent::GestureScrollUpdate |
+ || m_type == PlatformEvent::GestureScrollUpdateWithoutPropagation); |
+ return m_data.m_scrollUpdate.m_preventPropagation; |
+ } |
+ |
float scale() const |
{ |
ASSERT(m_type == PlatformEvent::GesturePinchUpdate); |
@@ -158,6 +166,7 @@ protected: |
float m_deltaY; |
float m_velocityX; |
float m_velocityY; |
+ int m_preventPropagation; |
} m_scrollUpdate; |
struct { |