Index: Source/core/page/ContextMenuController.cpp |
diff --git a/Source/core/page/ContextMenuController.cpp b/Source/core/page/ContextMenuController.cpp |
index cd8b65b29a1ccda5d59d5bf3638542ef8f94489a..1e9b4ec8d5ce7e65a21ab30f8ccc50001be0c399 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->isElementNode()) { |
esprehn
2014/05/20 05:51:34
I think you want isHTMLElement
pals
2014/05/21 07:55:12
Done.
|
+ const HTMLElement& element = toHTMLElement(*event->target()->toNode()); |
esprehn
2014/05/20 05:51:34
This is not safe, it could be an SVG element or ju
pals
2014/05/21 07:55:12
Changed to isHTMLElement() above.
|
+ if (HTMLMenuElement* menuElement = element.menuElement()) { |
esprehn
2014/05/20 05:51:34
This probably needs to be a RefPtr, the script bel
pals
2014/05/21 07:55:12
Done.
|
+ RefPtr<RelatedEvent> relatedEvent = RelatedEvent::create("show"); |
+ relatedEvent->setRelatedTarget(node); |
+ EventDispatcher::dispatchEvent(menuElement, EventDispatchMediator::create(relatedEvent)); |
esprehn
2014/05/20 05:51:34
Are you sure it's safe to synchronously execute sc
pals
2014/05/21 07:55:12
m_menuProvider below which is populated by menu el
|
+ m_menuProvider = menuElement->getCustomProvider(); |
+ m_menuProvider->populateContextMenu(m_contextMenu.get()); |
+ } |
+ } |
showContextMenu(event); |
} |