Index: components/test_runner/event_sender.cc |
diff --git a/components/test_runner/event_sender.cc b/components/test_runner/event_sender.cc |
index 15bd8bbd8ab11a092c1b1570719bf5f50deabdfa..b06eef101d565668c389a42691953d3ed54083de 100644 |
--- a/components/test_runner/event_sender.cc |
+++ b/components/test_runner/event_sender.cc |
@@ -33,6 +33,7 @@ using blink::WebFloatPoint; |
using blink::WebFrame; |
using blink::WebGestureEvent; |
using blink::WebInputEvent; |
+using blink::WebInputEventResult; |
using blink::WebKeyboardEvent; |
using blink::WebMenuItemInfo; |
using blink::WebMouseEvent; |
@@ -2293,7 +2294,7 @@ void EventSender::GestureEvent(WebInputEvent::Type type, |
if (force_layout_on_events_) |
view_->updateAllLifecyclePhases(); |
- bool result = HandleInputEventOnViewOrPopup(event); |
+ WebInputEventResult result = HandleInputEventOnViewOrPopup(event); |
// Long press might start a drag drop session. Complete it if so. |
if (type == WebInputEvent::GestureLongPress && !current_drag_data_.isNull()) { |
@@ -2308,7 +2309,7 @@ void EventSender::GestureEvent(WebInputEvent::Type type, |
FinishDragAndDrop(mouse_event, blink::WebDragOperationNone); |
} |
- args->Return(result); |
+ args->Return(result != WebInputEventResult::NotHandled); |
} |
void EventSender::UpdateClickCountForButton( |
@@ -2549,7 +2550,8 @@ void EventSender::ReplaySavedEvents() { |
replaying_saved_events_ = false; |
} |
-bool EventSender::HandleInputEventOnViewOrPopup(const WebInputEvent& event) { |
+WebInputEventResult EventSender::HandleInputEventOnViewOrPopup( |
+ const WebInputEvent& event) { |
last_event_timestamp_ = event.timeStampSeconds; |
if (WebPagePopup* popup = view_->pagePopup()) { |