Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / ui / events / gesture_detection / gesture_event_data.cc

diff --git a/src/ui/events/gesture_detection/gesture_event_data.cc b/src/ui/events/gesture_detection/gesture_event_data.cc
index 4da5178..2102f23 100644 (file)
--- a/src/ui/events/gesture_detection/gesture_event_data.cc
+++ b/src/ui/events/gesture_detection/gesture_event_data.cc
@@ -17,7 +17,8 @@ GestureEventData::GestureEventData(const GestureEventDetails& details,
                                    float raw_x,
                                    float raw_y,
                                    size_t touch_point_count,
-                                   const gfx::RectF& bounding_box)
+                                   const gfx::RectF& bounding_box,
+                                   int flags)
     : details(details),
       motion_event_id(motion_event_id),
       primary_tool_type(primary_tool_type),
@@ -25,7 +26,8 @@ GestureEventData::GestureEventData(const GestureEventDetails& details,
       x(x),
       y(y),
       raw_x(raw_x),
-      raw_y(raw_y) {
+      raw_y(raw_y),
+      flags(flags) {
   DCHECK_GE(motion_event_id, 0);
   DCHECK_NE(0U, touch_point_count);
   this->details.set_touch_points(static_cast<int>(touch_point_count));
@@ -34,14 +36,15 @@ GestureEventData::GestureEventData(const GestureEventDetails& details,
 
 GestureEventData::GestureEventData(EventType type,
                                    const GestureEventData& other)
-    : details(type, 0, 0),
+    : details(type),
       motion_event_id(other.motion_event_id),
       primary_tool_type(other.primary_tool_type),
       time(other.time),
       x(other.x),
       y(other.y),
       raw_x(other.raw_x),
-      raw_y(other.raw_y) {
+      raw_y(other.raw_y),
+      flags(other.flags) {
   details.set_touch_points(other.details.touch_points());
   details.set_bounding_box(other.details.bounding_box_f());
 }
@@ -52,7 +55,8 @@ GestureEventData::GestureEventData()
       x(0),
       y(0),
       raw_x(0),
-      raw_y(0) {
+      raw_y(0),
+      flags(EF_NONE) {
 }
 
 }  //  namespace ui