| 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 9f367910474810e788cfd9256eccf9d8b759566f..2c4704694529613510bcb9f02355abb13ad8e06a 100644
|
| --- a/third_party/WebKit/Source/core/page/ContextMenuController.cpp
|
| +++ b/third_party/WebKit/Source/core/page/ContextMenuController.cpp
|
| @@ -173,8 +173,13 @@ PassOwnPtr<ContextMenu> ContextMenuController::createContextMenu(LocalFrame* fra
|
|
|
| void ContextMenuController::showContextMenu(Event* event)
|
| {
|
| - m_client->showContextMenu(m_contextMenu.get());
|
| - if (event)
|
| + bool fromTouch = false;
|
| + if (event && event->isMouseEvent()) {
|
| + MouseEvent* mouseEvent = static_cast<MouseEvent*>(event);
|
| + fromTouch = mouseEvent->fromTouch();
|
| + }
|
| +
|
| + if (m_client->showContextMenu(m_contextMenu.get(), fromTouch) && event)
|
| event->setDefaultHandled();
|
| }
|
|
|
|
|