Chromium Code Reviews| Index: Source/core/page/ContextMenuController.cpp |
| diff --git a/Source/core/page/ContextMenuController.cpp b/Source/core/page/ContextMenuController.cpp |
| index 13680a5486f29ff9378e8ae7b4d748ff8590b81c..cca67802db4c0d279b517141a468a4a740e4142a 100644 |
| --- a/Source/core/page/ContextMenuController.cpp |
| +++ b/Source/core/page/ContextMenuController.cpp |
| @@ -28,18 +28,25 @@ |
| #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/CustomContextMenuProvider.h" |
| #include "core/page/EventHandler.h" |
| #include "platform/ContextMenu.h" |
| #include "platform/ContextMenuItem.h" |
| namespace blink { |
| +using namespace HTMLNames; |
| + |
| ContextMenuController::ContextMenuController(Page*, ContextMenuClient* client) |
| : m_client(client) |
| { |
| @@ -79,12 +86,33 @@ void ContextMenuController::documentDetached(Document* document) |
| } |
| } |
| +void ContextMenuController::populateCustomContextMenu(Event* event) |
|
tkent
2014/08/21 01:34:39
Event* -> Even&
pals
2014/08/25 14:19:41
Done.
|
| +{ |
| + if (!RuntimeEnabledFeatures::contextMenuEnabled()) |
| + return; |
| + |
| + Node* node = event->target()->toNode(); |
| + if (node && node->isHTMLElement()) { |
|
tkent
2014/08/21 01:34:39
We prefer early return.
if (!node || !node->isHTM
pals
2014/08/25 14:19:41
Done.
|
| + HTMLElement& element = toHTMLElement(*node); |
| + RefPtrWillBeRawPtr<HTMLMenuElement> menuElement = element.contextMenu(); |
| + if (!menuElement) |
| + return; |
| + RefPtrWillBeRawPtr<RelatedEvent> relatedEvent = RelatedEvent::create(EventTypeNames::show, true, true, node); |
|
tkent
2014/08/21 01:34:38
Should we check type=popup?
pals
2014/08/25 14:19:41
Done.
|
| + if (!menuElement->dispatchEvent(relatedEvent.release())) |
| + return; |
|
tkent
2014/08/21 01:34:39
We need a layout test of canceling |show| event.
pals
2014/08/25 14:19:41
Done.
|
| + if (menuElement != element.contextMenu()) |
| + return; |
|
tkent
2014/08/21 01:34:39
Need a layout test for this too.
pals
2014/08/25 14:19:41
Done.
|
| + m_menuProvider = CustomContextMenuProvider::create(*menuElement, element); |
| + m_menuProvider->populateContextMenu(m_contextMenu.get()); |
| + } |
| +} |
| + |
| void ContextMenuController::handleContextMenuEvent(Event* event) |
| { |
| m_contextMenu = createContextMenu(event); |
| if (!m_contextMenu) |
| return; |
| - |
| + populateCustomContextMenu(event); |
| showContextMenu(event); |
| } |