Index: Source/core/page/ContextMenuController.cpp |
diff --git a/Source/core/page/ContextMenuController.cpp b/Source/core/page/ContextMenuController.cpp |
index 13680a5486f29ff9378e8ae7b4d748ff8590b81c..2911c35a09dc145cfdb53b56ce8ec6c674b6690f 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 blink { |
+using namespace HTMLNames; |
+ |
ContextMenuController::ContextMenuController(Page*, ContextMenuClient* client) |
: m_client(client) |
{ |
@@ -85,6 +91,17 @@ void ContextMenuController::handleContextMenuEvent(Event* event) |
if (!m_contextMenu) |
return; |
+ Node* node = event->target()->toNode(); |
+ if (node && node->isHTMLElement() && RuntimeEnabledFeatures::menuElementEnabled()) { |
+ const HTMLElement& element = toHTMLElement(*node); |
+ if (RefPtr<HTMLMenuElement> menuElement = element.menuElement()) { |
Inactive
2014/07/23 14:19:08
oilpan types
pals
2014/07/24 10:49:27
Done.
|
+ RefPtr<RelatedEvent> relatedEvent = RelatedEvent::create(EventTypeNames::show); |
+ relatedEvent->setRelatedTarget(node); |
+ EventDispatcher::dispatchEvent(menuElement.get(), EventDispatchMediator::create(relatedEvent.release())); |
+ m_menuProvider = menuElement->menuProvider(); |
Inactive
2014/07/23 14:19:08
I did not look much into it but is it normal that
pals
2014/07/24 10:49:27
Yes. We are initializing the menu provider in menu
|
+ m_menuProvider->populateContextMenu(m_contextMenu.get()); |
+ } |
+ } |
showContextMenu(event); |
} |