| Index: third_party/WebKit/Source/core/page/ContextMenuController.cpp
|
| diff --git a/third_party/WebKit/Source/core/page/ContextMenuController.cpp b/third_party/WebKit/Source/core/page/ContextMenuController.cpp
|
| index 4372fbbf37747f56d40d489bc83740baf80889b7..8293676e16981a7165b8236d1aac2c38b9e35239 100644
|
| --- a/third_party/WebKit/Source/core/page/ContextMenuController.cpp
|
| +++ b/third_party/WebKit/Source/core/page/ContextMenuController.cpp
|
| @@ -162,13 +162,15 @@ std::unique_ptr<ContextMenu> ContextMenuController::CreateContextMenu(
|
| }
|
|
|
| void ContextMenuController::ShowContextMenu(Event* event) {
|
| - bool from_touch = false;
|
| + MouseEvent::SyntheticEventType synthetic_event_type =
|
| + MouseEvent::kRealOrIndistinguishable;
|
| if (event && event->IsMouseEvent()) {
|
| MouseEvent* mouse_event = static_cast<MouseEvent*>(event);
|
| - from_touch = mouse_event->FromTouch();
|
| + synthetic_event_type = mouse_event->GetSyntheticEventType();
|
| }
|
|
|
| - if (client_->ShowContextMenu(context_menu_.get(), from_touch) && event)
|
| + if (client_->ShowContextMenu(context_menu_.get(), synthetic_event_type) &&
|
| + event)
|
| event->SetDefaultHandled();
|
| }
|
|
|
|
|