| Index: Source/core/page/ContextMenuController.cpp
|
| diff --git a/Source/core/page/ContextMenuController.cpp b/Source/core/page/ContextMenuController.cpp
|
| index cd8b65b29a1ccda5d59d5bf3638542ef8f94489a..a4c183f769ed3eef495e565f87c95e801a3fc029 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(EventTypeNames::show);
|
| + relatedEvent->setRelatedTarget(node);
|
| + EventDispatcher::dispatchEvent(menuElement.get(), EventDispatchMediator::create(relatedEvent.release()));
|
| + m_menuProvider = menuElement->menuProvider();
|
| + m_menuProvider->populateContextMenu(m_contextMenu.get());
|
| + }
|
| + }
|
| showContextMenu(event);
|
| }
|
|
|
|
|