Title: [192387] trunk/Source/WebCore
- Revision
- 192387
- Author
- ander...@apple.com
- Date
- 2015-11-12 14:05:51 -0800 (Thu, 12 Nov 2015)
Log Message
Use ContextMenuItemTagNoAction instead of ContextMenuItemCustomTagNoAction
https://bugs.webkit.org/show_bug.cgi?id=151222
Reviewed by Joseph Pecoraro.
* bindings/js/JSInspectorFrontendHostCustom.cpp:
(WebCore::populateContextMenuItems):
* page/ContextMenuController.cpp:
(WebCore::ContextMenuController::checkOrEnableIfNeeded): Deleted.
* platform/ContextMenuItem.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (192386 => 192387)
--- trunk/Source/WebCore/ChangeLog 2015-11-12 21:57:30 UTC (rev 192386)
+++ trunk/Source/WebCore/ChangeLog 2015-11-12 22:05:51 UTC (rev 192387)
@@ -1,3 +1,16 @@
+2015-11-12 Anders Carlsson <ander...@apple.com>
+
+ Use ContextMenuItemTagNoAction instead of ContextMenuItemCustomTagNoAction
+ https://bugs.webkit.org/show_bug.cgi?id=151222
+
+ Reviewed by Joseph Pecoraro.
+
+ * bindings/js/JSInspectorFrontendHostCustom.cpp:
+ (WebCore::populateContextMenuItems):
+ * page/ContextMenuController.cpp:
+ (WebCore::ContextMenuController::checkOrEnableIfNeeded): Deleted.
+ * platform/ContextMenuItem.h:
+
2015-11-12 Myles C. Maxfield <mmaxfi...@apple.com>
[Cocoa] Font fallback is not language-sensitive
Modified: trunk/Source/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp (192386 => 192387)
--- trunk/Source/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp 2015-11-12 21:57:30 UTC (rev 192386)
+++ trunk/Source/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp 2015-11-12 22:05:51 UTC (rev 192387)
@@ -65,18 +65,13 @@
String typeString = type.toString(exec)->value(exec);
if (typeString == "separator") {
- ContextMenuItem item(SeparatorType,
- ContextMenuItemCustomTagNoAction,
- String());
+ ContextMenuItem item(SeparatorType, ContextMenuItemTagNoAction, String());
menu.appendItem(item);
} else if (typeString == "subMenu" && subItems.inherits(JSArray::info())) {
ContextMenu subMenu;
JSArray* subItemsArray = asArray(subItems);
populateContextMenuItems(exec, subItemsArray, subMenu);
- ContextMenuItem item(SubmenuType,
- ContextMenuItemCustomTagNoAction,
- label.toString(exec)->value(exec),
- &subMenu);
+ ContextMenuItem item(SubmenuType, ContextMenuItemTagNoAction, label.toString(exec)->value(exec), &subMenu);
menu.appendItem(item);
} else {
ContextMenuAction typedId = static_cast<ContextMenuAction>(ContextMenuItemBaseCustomTag + id.toInt32(exec));
Modified: trunk/Source/WebCore/page/ContextMenuController.cpp (192386 => 192387)
--- trunk/Source/WebCore/page/ContextMenuController.cpp 2015-11-12 21:57:30 UTC (rev 192386)
+++ trunk/Source/WebCore/page/ContextMenuController.cpp 2015-11-12 22:05:51 UTC (rev 192387)
@@ -1389,7 +1389,6 @@
case ContextMenuItemTagPDFFacingPagesScrolling:
case ContextMenuItemTagInspectElement:
case ContextMenuItemBaseCustomTag:
- case ContextMenuItemCustomTagNoAction:
case ContextMenuItemLastCustomTag:
case ContextMenuItemBaseApplicationTag:
case ContextMenuItemTagDictationAlternative:
Modified: trunk/Source/WebCore/platform/ContextMenuItem.h (192386 => 192387)
--- trunk/Source/WebCore/platform/ContextMenuItem.h 2015-11-12 21:57:30 UTC (rev 192386)
+++ trunk/Source/WebCore/platform/ContextMenuItem.h 2015-11-12 22:05:51 UTC (rev 192387)
@@ -157,7 +157,6 @@
ContextMenuItemTagToggleVideoFullscreen,
ContextMenuItemTagShareMenu,
ContextMenuItemBaseCustomTag = 5000,
- ContextMenuItemCustomTagNoAction = 5998,
ContextMenuItemLastCustomTag = 5999,
ContextMenuItemBaseApplicationTag = 10000
};
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
