Index: content/shell/renderer/test_runner/event_sender.cc |
diff --git a/content/shell/renderer/test_runner/event_sender.cc b/content/shell/renderer/test_runner/event_sender.cc |
index 9646019048df4f3169433a53ef7a50947d4af6db..00d6a59fbf6c29ccd085353ee929564510e1a6bb 100644 |
--- a/content/shell/renderer/test_runner/event_sender.cc |
+++ b/content/shell/renderer/test_runner/event_sender.cc |
@@ -361,7 +361,7 @@ class EventSenderBindings : public gin::Wrappable<EventSenderBindings> { |
void GestureScrollEnd(gin::Arguments* args); |
void GestureScrollUpdate(gin::Arguments* args); |
void GestureScrollUpdateWithoutPropagation(gin::Arguments* args); |
- void GestureTap(gin::Arguments* args); |
+ bool GestureTap(gin::Arguments* args); |
void GestureTapDown(gin::Arguments* args); |
void GestureShowPress(gin::Arguments* args); |
void GestureTapCancel(gin::Arguments* args); |
@@ -742,9 +742,10 @@ void EventSenderBindings::GestureScrollUpdateWithoutPropagation( |
sender_->GestureScrollUpdateWithoutPropagation(args); |
} |
-void EventSenderBindings::GestureTap(gin::Arguments* args) { |
+bool EventSenderBindings::GestureTap(gin::Arguments* args) { |
if (sender_) |
- sender_->GestureTap(args); |
+ return sender_->GestureTap(args); |
+ return false; // TODO(donnd): true? |
Rick Byers
2014/05/29 20:57:47
yeah this is goofy (should probably throw instead
donnd
2014/05/31 03:14:57
Done.
|
} |
void EventSenderBindings::GestureTapDown(gin::Arguments* args) { |
@@ -1691,8 +1692,8 @@ void EventSender::GestureScrollUpdateWithoutPropagation(gin::Arguments* args) { |
GestureEvent(WebInputEvent::GestureScrollUpdateWithoutPropagation, args); |
} |
-void EventSender::GestureTap(gin::Arguments* args) { |
- GestureEvent(WebInputEvent::GestureTap, args); |
+bool EventSender::GestureTap(gin::Arguments* args) { |
Rick Byers
2014/05/29 20:57:47
I'm new to gin (gin is a new lightweight javascrip
donnd
2014/05/31 03:14:57
Done.
|
+ return GestureEvent(WebInputEvent::GestureTap, args); |
} |
void EventSender::GestureTapDown(gin::Arguments* args) { |
@@ -1890,7 +1891,7 @@ void EventSender::SendCurrentTouchEvent(WebInputEvent::Type type) { |
} |
} |
-void EventSender::GestureEvent(WebInputEvent::Type type, |
+bool EventSender::GestureEvent(WebInputEvent::Type type, |
gin::Arguments* args) { |
double x; |
double y; |
@@ -1928,7 +1929,7 @@ void EventSender::GestureEvent(WebInputEvent::Type type, |
float tap_count; |
if (!args->GetNext(&tap_count)) { |
args->ThrowError(); |
- return; |
+ return false; |
Rick Byers
2014/05/29 20:57:47
If the right way to set a return value to JS is ar
donnd
2014/05/31 03:14:57
Done.
|
} |
event.data.tap.tapCount = tap_count; |
} else { |
@@ -1943,7 +1944,7 @@ void EventSender::GestureEvent(WebInputEvent::Type type, |
float tap_count; |
if (!args->GetNext(&tap_count)) { |
args->ThrowError(); |
- return; |
+ return false; |
} |
event.data.tap.tapCount = tap_count; |
} else { |
@@ -1959,7 +1960,7 @@ void EventSender::GestureEvent(WebInputEvent::Type type, |
float width; |
if (!args->GetNext(&width)) { |
args->ThrowError(); |
- return; |
+ return false; |
} |
event.data.tapDown.width = width; |
} |
@@ -1967,7 +1968,7 @@ void EventSender::GestureEvent(WebInputEvent::Type type, |
float height; |
if (!args->GetNext(&height)) { |
args->ThrowError(); |
- return; |
+ return false; |
} |
event.data.tapDown.height = height; |
} |
@@ -1979,14 +1980,14 @@ void EventSender::GestureEvent(WebInputEvent::Type type, |
float width; |
if (!args->GetNext(&width)) { |
args->ThrowError(); |
- return; |
+ return false; |
} |
event.data.showPress.width = width; |
if (!args->PeekNext().IsEmpty()) { |
float height; |
if (!args->GetNext(&height)) { |
args->ThrowError(); |
- return; |
+ return false; |
} |
event.data.showPress.height = height; |
} |
@@ -2003,14 +2004,14 @@ void EventSender::GestureEvent(WebInputEvent::Type type, |
float width; |
if (!args->GetNext(&width)) { |
args->ThrowError(); |
- return; |
+ return false; |
} |
event.data.longPress.width = width; |
if (!args->PeekNext().IsEmpty()) { |
float height; |
if (!args->GetNext(&height)) { |
args->ThrowError(); |
- return; |
+ return false; |
} |
event.data.longPress.height = height; |
} |
@@ -2023,14 +2024,14 @@ void EventSender::GestureEvent(WebInputEvent::Type type, |
float width; |
if (!args->GetNext(&width)) { |
args->ThrowError(); |
- return; |
+ return false; |
} |
event.data.longPress.width = width; |
if (!args->PeekNext().IsEmpty()) { |
float height; |
if (!args->GetNext(&height)) { |
args->ThrowError(); |
- return; |
+ return false; |
} |
event.data.longPress.height = height; |
} |
@@ -2043,14 +2044,14 @@ void EventSender::GestureEvent(WebInputEvent::Type type, |
float first_finger_width; |
if (!args->GetNext(&first_finger_width)) { |
args->ThrowError(); |
- return; |
+ return false; |
} |
event.data.twoFingerTap.firstFingerWidth = first_finger_width; |
if (!args->PeekNext().IsEmpty()) { |
float first_finger_height; |
if (!args->GetNext(&first_finger_height)) { |
args->ThrowError(); |
- return; |
+ return false; |
} |
event.data.twoFingerTap.firstFingerHeight = first_finger_height; |
} |
@@ -2067,7 +2068,7 @@ void EventSender::GestureEvent(WebInputEvent::Type type, |
if (force_layout_on_events_) |
view_->layout(); |
- view_->handleInputEvent(event); |
+ bool result = view_->handleInputEvent(event); |
// Long press might start a drag drop session. Complete it if so. |
if (type == WebInputEvent::GestureLongPress && !current_drag_data_.isNull()) { |
@@ -2081,7 +2082,9 @@ void EventSender::GestureEvent(WebInputEvent::Type type, |
&mouse_event); |
FinishDragAndDrop(mouse_event, blink::WebDragOperationNone); |
+ result = true; |
} |
+ return result; |
} |
void EventSender::UpdateClickCountForButton( |