Chromium Code Reviews| Index: Source/core/page/ContextMenuController.cpp |
| diff --git a/Source/core/page/ContextMenuController.cpp b/Source/core/page/ContextMenuController.cpp |
| index cd8b65b29a1ccda5d59d5bf3638542ef8f94489a..5c4d275a4408406fd5637079d9f1ec044a20e293 100644 |
| --- a/Source/core/page/ContextMenuController.cpp |
| +++ b/Source/core/page/ContextMenuController.cpp |
| @@ -28,10 +28,14 @@ |
| #include "core/page/ContextMenuController.h" |
| #include "core/dom/Document.h" |
| +#include "core/dom/Node.h" |
| #include "core/events/Event.h" |
| +#include "core/events/EventDispatchMediator.h" |
| +#include "core/events/EventDispatcher.h" |
| #include "core/events/MouseEvent.h" |
| -#include "core/dom/Node.h" |
| +#include "core/events/RelatedEvent.h" |
| #include "core/frame/LocalFrame.h" |
| +#include "core/html/HTMLMenuElement.h" |
| #include "core/page/ContextMenuClient.h" |
| #include "core/page/ContextMenuProvider.h" |
| #include "core/page/EventHandler.h" |
| @@ -40,6 +44,8 @@ |
| namespace WebCore { |
| +using namespace HTMLNames; |
| + |
| ContextMenuController::ContextMenuController(Page*, ContextMenuClient* client) |
| : m_client(client) |
| { |
| @@ -80,6 +86,17 @@ void ContextMenuController::handleContextMenuEvent(Event* event) |
| if (!m_contextMenu) |
| return; |
| + Node* node = event->target()->toNode(); |
| + if (node && node->isHTMLElement()) { |
| + const HTMLElement& element = toHTMLElement(*event->target()->toNode()); |
| + if (RefPtr<HTMLMenuElement> menuElement = element.menuElement()) { |
| + RefPtr<RelatedEvent> relatedEvent = RelatedEvent::create("show"); |
|
esprehn
2014/06/06 22:30:42
This should use EventTypeNames.
pals
2014/06/10 10:42:39
Done.
|
| + relatedEvent->setRelatedTarget(node); |
| + EventDispatcher::dispatchEvent(menuElement.get(), EventDispatchMediator::create(relatedEvent.release())); |
|
esprehn
2014/06/06 22:30:42
Are you sure it's safe to run script here? Who own
pals
2014/06/10 10:42:39
Done. The ContextMenuController is owned by Page.
|
| + m_menuProvider = menuElement->customProvider(); |
| + m_menuProvider->populateContextMenu(m_contextMenu.get()); |
| + } |
| + } |
| showContextMenu(event); |
| } |