Source/core/page/CustomContextMenuProvider.cpp - Issue 802233004: Implement icon attribute for menuitem

Unified Diff: Source/core/page/CustomContextMenuProvider.cpp

Issue 802233004: Implement icon attribute for menuitem (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 5 years, 12 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:

Index: Source/core/page/CustomContextMenuProvider.cpp

diff --git a/Source/core/page/CustomContextMenuProvider.cpp b/Source/core/page/CustomContextMenuProvider.cpp

index 0dcb6767c0312aac578c450cc5a7419cffb43cbb..b063b2dfa1cc3c4366cb536e25caa9350f0b822b 100644

--- a/Source/core/page/CustomContextMenuProvider.cpp

+++ b/Source/core/page/CustomContextMenuProvider.cpp

@@ -69,7 +69,7 @@ void CustomContextMenuProvider::appendSeparator(ContextMenu& contextMenu)

if (lastItem.type() == SeparatorType)

return;

- contextMenu.appendItem(ContextMenuItem(SeparatorType, ContextMenuItemCustomTagNoAction, String()));

+ contextMenu.appendItem(ContextMenuItem(SeparatorType, ContextMenuItemCustomTagNoAction, String(), String()));

}

void CustomContextMenuProvider::appendMenuItem(HTMLMenuItemElement* menuItem, ContextMenu& contextMenu)

@@ -82,11 +82,12 @@ void CustomContextMenuProvider::appendMenuItem(HTMLMenuItemElement* menuItem, Co

m_menuItems.append(menuItem);

bool enabled = !menuItem->fastHasAttribute(disabledAttr);

+ String icon = menuItem->fastGetAttribute(iconAttr);

pals 2015/01/02 12:07:47 We need to resolve icon's url relative to the elem

pals 2015/01/02 13:05:42 Done.

ContextMenuAction action = static_cast<ContextMenuAction>(ContextMenuItemBaseCustomTag + m_menuItems.size() - 1);

if (equalIgnoringCase(menuItem->fastGetAttribute(typeAttr), "checkbox"))

- contextMenu.appendItem(ContextMenuItem(CheckableActionType, action, labelString, enabled, menuItem->fastHasAttribute(checkedAttr)));

+ contextMenu.appendItem(ContextMenuItem(CheckableActionType, action, labelString, icon, enabled, menuItem->fastHasAttribute(checkedAttr)));

else

- contextMenu.appendItem(ContextMenuItem(ActionType, action, labelString, enabled, false));

+ contextMenu.appendItem(ContextMenuItem(ActionType, action, labelString, icon, enabled, false));

}

void CustomContextMenuProvider::populateContextMenuItems(const HTMLMenuElement& menu, ContextMenu& contextMenu)

@@ -105,7 +106,7 @@ void CustomContextMenuProvider::populateContextMenuItems(const HTMLMenuElement&

appendSeparator(contextMenu);

} else if (!labelString.isEmpty()) {

populateContextMenuItems(*toHTMLMenuElement(nextElement), subMenu);

- contextMenu.appendItem(ContextMenuItem(SubmenuType, ContextMenuItemCustomTagNoAction, labelString, &subMenu));

+ contextMenu.appendItem(ContextMenuItem(SubmenuType, ContextMenuItemCustomTagNoAction, labelString, String(), &subMenu));

}

nextElement = Traversal<HTMLElement>::nextSibling(*nextElement);

} else if (isHTMLMenuItemElement(*nextElement)) {

« no previous file with comments | « Source/core/html/HTMLMenuItemElement.idl ('k') | Source/platform/ContextMenuItem.h » ('j') | no next file with comments »