OLD | NEW |
---|---|
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/renderer/input/render_widget_input_handler.h" | 5 #include "content/renderer/input/render_widget_input_handler.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
287 widget_->GetTextInputType() != ui::TEXT_INPUT_TYPE_NONE) { | 287 widget_->GetTextInputType() != ui::TEXT_INPUT_TYPE_NONE) { |
288 widget_->showImeIfNeeded(); | 288 widget_->showImeIfNeeded(); |
289 prevent_default = true; | 289 prevent_default = true; |
290 } | 290 } |
291 #endif | 291 #endif |
292 } | 292 } |
293 | 293 |
294 if (WebInputEvent::isGestureEventType(input_event.type)) { | 294 if (WebInputEvent::isGestureEventType(input_event.type)) { |
295 const WebGestureEvent& gesture_event = | 295 const WebGestureEvent& gesture_event = |
296 static_cast<const WebGestureEvent&>(input_event); | 296 static_cast<const WebGestureEvent&>(input_event); |
297 context_menu_source_type_ = ui::MENU_SOURCE_TOUCH; | 297 if (input_event.type == WebInputEvent::GestureLongPress) { |
298 context_menu_source_type_ = ui::MENU_SOURCE_LONG_PRESS; | |
299 } else if (input_event.type == WebInputEvent::GestureLongTap) { | |
300 context_menu_source_type_ = ui::MENU_SOURCE_LONG_TAP; | |
301 } else { | |
302 context_menu_source_type_ = ui::MENU_SOURCE_TOUCH; | |
tdresser
2016/01/26 20:26:30
Do we ever use ui::MENU_SOURCE_TOUCH now? I though
| |
303 } | |
298 prevent_default = | 304 prevent_default = |
299 prevent_default || delegate_->WillHandleGestureEvent(gesture_event); | 305 prevent_default || delegate_->WillHandleGestureEvent(gesture_event); |
300 } | 306 } |
301 | 307 |
302 WebInputEventResult processed = prevent_default | 308 WebInputEventResult processed = prevent_default |
303 ? WebInputEventResult::HandledSuppressed | 309 ? WebInputEventResult::HandledSuppressed |
304 : WebInputEventResult::NotHandled; | 310 : WebInputEventResult::NotHandled; |
305 if (input_event.type != WebInputEvent::Char || !suppress_next_char_events_) { | 311 if (input_event.type != WebInputEvent::Char || !suppress_next_char_events_) { |
306 suppress_next_char_events_ = false; | 312 suppress_next_char_events_ = false; |
307 if (processed == WebInputEventResult::NotHandled && widget_->webwidget()) | 313 if (processed == WebInputEventResult::NotHandled && widget_->webwidget()) |
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
506 if (pending_input_event_ack_) { | 512 if (pending_input_event_ack_) { |
507 TRACE_EVENT_ASYNC_END0("input", | 513 TRACE_EVENT_ASYNC_END0("input", |
508 "RenderWidgetInputHandler::ThrottledInputEventAck", | 514 "RenderWidgetInputHandler::ThrottledInputEventAck", |
509 pending_input_event_ack_.get()); | 515 pending_input_event_ack_.get()); |
510 delegate_->OnInputEventAck(std::move(pending_input_event_ack_)); | 516 delegate_->OnInputEventAck(std::move(pending_input_event_ack_)); |
511 } | 517 } |
512 total_input_handling_time_this_frame_ = base::TimeDelta(); | 518 total_input_handling_time_this_frame_ = base::TimeDelta(); |
513 } | 519 } |
514 | 520 |
515 } // namespace content | 521 } // namespace content |
OLD | NEW |