Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1191)

Unified Diff: Source/core/html/HTMLMenuElement.cpp

Issue 243403006: Implement contextmenu attribute with basic support of <menu> (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Added unit tests Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/html/HTMLMenuElement.cpp
diff --git a/Source/core/html/HTMLMenuElement.cpp b/Source/core/html/HTMLMenuElement.cpp
index e043ed557b9176a4132984b499a9040c536cdf3f..bb07c35a9d953f206942ecd93ee71d54130d25af 100644
--- a/Source/core/html/HTMLMenuElement.cpp
+++ b/Source/core/html/HTMLMenuElement.cpp
@@ -21,9 +21,15 @@
*/
#include "config.h"
+
#include "core/html/HTMLMenuElement.h"
-#include "HTMLNames.h"
+#include "core/dom/ElementTraversal.h"
+#include "core/events/RelatedEvent.h"
+#include "core/html/HTMLMenuElementEventListener.h"
+#include "core/html/HTMLMenuitemElement.h"
+#include "core/page/ContextMenuController.h"
+#include "core/page/Page.h"
namespace WebCore {
@@ -33,6 +39,8 @@ inline HTMLMenuElement::HTMLMenuElement(Document& document)
: HTMLElement(menuTag, document)
{
ScriptWrappable::init(this);
+ RefPtr<EventListener> listener = HTMLMenuElementEventListener::create(this);
+ addEventListener("show", listener.release(), false);
esprehn 2014/06/06 22:30:42 We don't normally add event listeners like this. I
pals 2014/06/10 10:42:39 Done. Removed HTMLMenuElementEventListener. Added
}
PassRefPtrWillBeRawPtr<HTMLMenuElement> HTMLMenuElement::create(Document& document)
@@ -40,4 +48,36 @@ PassRefPtrWillBeRawPtr<HTMLMenuElement> HTMLMenuElement::create(Document& docume
return adoptRefWillBeRefCountedGarbageCollected(new HTMLMenuElement(document));
}
+CustomContextMenuProvider& HTMLMenuElement::ensureCustomProvider()
esprehn 2014/06/06 22:30:42 ensureMenuProvider()
pals 2014/06/10 10:42:39 Done.
+{
+ if (!m_menuProvider) {
+ ContextMenu menu;
+ populateContextMenuItems(this, menu);
+ m_menuProvider = CustomContextMenuProvider::create(this, menu.items());
+ }
+ return *m_menuProvider;
+}
+
+void HTMLMenuElement::populateContextMenuItems(HTMLMenuElement* menu, ContextMenu& contextMenu)
+{
+ for (Element* nextElement = ElementTraversal::firstWithin(*menu); nextElement;) {
esprehn 2014/06/06 22:30:42 Lets use a while() loop, it'll be more clear.
pals 2014/06/10 10:42:39 Done.
+ if (nextElement->hasTagName(HTMLNames::menuTag)) {
+ ContextMenu subMenu;
+ populateContextMenuItems(toHTMLMenuElement(nextElement), subMenu);
+ contextMenu.appendItem(ContextMenuItem(SubmenuType, ContextMenuItemCustomTagNoAction, nextElement->fastGetAttribute(HTMLNames::labelAttr), &subMenu));
+ nextElement = ElementTraversal::nextSibling(*nextElement);
+ continue;
+ } else if (nextElement->hasTagName(HTMLNames::menuitemTag)) {
+ m_menuItems.append(toHTMLElement(nextElement));
+ contextMenu.appendItem(ContextMenuItem(ActionType, static_cast<ContextMenuAction>(ContextMenuItemBaseCustomTag + m_menuItems.size() - 1), nextElement->fastGetAttribute(HTMLNames::labelAttr)));
+ }
+ nextElement = ElementTraversal::next(*nextElement, menu);
+ }
+}
+
+HTMLElement* HTMLMenuElement::selectedMenuItem(unsigned menuId)
+{
+ return m_menuItems[menuId - ContextMenuItemBaseCustomTag];
esprehn 2014/06/06 22:30:42 This unsigned thing is really weird.
pals 2014/06/10 10:42:39 Done. Added checks.
+}
+
}

Powered by Google App Engine
This is Rietveld 408576698