<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[192381] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/192381">192381</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-11-12 13:22:22 -0800 (Thu, 12 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>ContextMenuController::contextMenuItemSelected only needs the action and title, not the full item
https://bugs.webkit.org/show_bug.cgi?id=151217
Reviewed by Joseph Pecoraro.
Source/WebCore:
* inspector/InspectorFrontendHost.cpp:
* page/ContextMenuController.cpp:
(WebCore::ContextMenuController::contextMenuItemSelected):
* page/ContextMenuController.h:
* page/ContextMenuProvider.h:
Source/WebKit/mac:
* WebView/WebHTMLView.mm:
(-[WebMenuTarget forwardContextMenuAction:]):
Source/WebKit/win:
* WebView.cpp:
(WebView::onMenuCommand):
Source/WebKit2:
* WebProcess/WebPage/WebContextMenu.cpp:
(WebKit::WebContextMenu::itemSelected):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorFrontendHostcpp">trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp</a></li>
<li><a href="#trunkSourceWebCorepageContextMenuControllercpp">trunk/Source/WebCore/page/ContextMenuController.cpp</a></li>
<li><a href="#trunkSourceWebCorepageContextMenuControllerh">trunk/Source/WebCore/page/ContextMenuController.h</a></li>
<li><a href="#trunkSourceWebCorepageContextMenuProviderh">trunk/Source/WebCore/page/ContextMenuProvider.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebHTMLViewmm">trunk/Source/WebKit/mac/WebView/WebHTMLView.mm</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebViewcpp">trunk/Source/WebKit/win/WebView.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebContextMenucpp">trunk/Source/WebKit2/WebProcess/WebPage/WebContextMenu.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (192380 => 192381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-11-12 21:21:39 UTC (rev 192380)
+++ trunk/Source/WebCore/ChangeLog 2015-11-12 21:22:22 UTC (rev 192381)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2015-11-12 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ ContextMenuController::contextMenuItemSelected only needs the action and title, not the full item
+ https://bugs.webkit.org/show_bug.cgi?id=151217
+
+ Reviewed by Joseph Pecoraro.
+
+ * inspector/InspectorFrontendHost.cpp:
+ * page/ContextMenuController.cpp:
+ (WebCore::ContextMenuController::contextMenuItemSelected):
+ * page/ContextMenuController.h:
+ * page/ContextMenuProvider.h:
+
+2015-11-12 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Remove an unused function
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=151215
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorFrontendHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp (192380 => 192381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp 2015-11-12 21:21:39 UTC (rev 192380)
+++ trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp 2015-11-12 21:22:22 UTC (rev 192381)
</span><span class="lines">@@ -89,11 +89,11 @@
</span><span class="cx"> menu->appendItem(item);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void contextMenuItemSelected(ContextMenuItem* item) override
</del><ins>+ virtual void contextMenuItemSelected(ContextMenuAction action, const String&) override
</ins><span class="cx"> {
</span><span class="cx"> if (m_frontendHost) {
</span><span class="cx"> UserGestureIndicator gestureIndicator(DefinitelyProcessingUserGesture);
</span><del>- int itemNumber = item->action() - ContextMenuItemBaseCustomTag;
</del><ins>+ int itemNumber = action - ContextMenuItemBaseCustomTag;
</ins><span class="cx">
</span><span class="cx"> Deprecated::ScriptFunctionCall function(m_frontendApiObject, "contextMenuItemSelected", WebCore::functionCallHandlerFromAnyThread);
</span><span class="cx"> function.appendArgument(itemNumber);
</span></span></pre></div>
<a id="trunkSourceWebCorepageContextMenuControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ContextMenuController.cpp (192380 => 192381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ContextMenuController.cpp 2015-11-12 21:21:39 UTC (rev 192380)
+++ trunk/Source/WebCore/page/ContextMenuController.cpp 2015-11-12 21:22:22 UTC (rev 192381)
</span><span class="lines">@@ -211,13 +211,11 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-void ContextMenuController::contextMenuItemSelected(ContextMenuItem* item)
</del><ins>+void ContextMenuController::contextMenuItemSelected(ContextMenuAction action, const String& title)
</ins><span class="cx"> {
</span><del>- ASSERT(item->type() == ActionType || item->type() == CheckableActionType);
-
- if (item->action() >= ContextMenuItemBaseCustomTag) {
</del><ins>+ if (action >= ContextMenuItemBaseCustomTag) {
</ins><span class="cx"> ASSERT(m_menuProvider);
</span><del>- m_menuProvider->contextMenuItemSelected(item);
</del><ins>+ m_menuProvider->contextMenuItemSelected(action, title);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -225,7 +223,7 @@
</span><span class="cx"> if (!frame)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- switch (item->action()) {
</del><ins>+ switch (action) {
</ins><span class="cx"> case ContextMenuItemTagOpenLinkInNewWindow:
</span><span class="cx"> openNewWindow(m_context.hitTestResult().absoluteLinkURL(), frame, ShouldOpenExternalURLsPolicy::ShouldAllowExternalSchemes);
</span><span class="cx"> break;
</span><span class="lines">@@ -354,7 +352,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> case ContextMenuItemTagSpellingGuess: {
</span><span class="cx"> VisibleSelection selection = frame->selection().selection();
</span><del>- if (frame->editor().shouldInsertText(item->title(), selection.toNormalizedRange().get(), EditorInsertActionPasted)) {
</del><ins>+ if (frame->editor().shouldInsertText(title, selection.toNormalizedRange().get(), EditorInsertActionPasted)) {
</ins><span class="cx"> ReplaceSelectionCommand::CommandOptions replaceOptions = ReplaceSelectionCommand::MatchStyle | ReplaceSelectionCommand::PreventNesting;
</span><span class="cx">
</span><span class="cx"> if (frame->editor().behavior().shouldAllowSpellingSuggestionsWithoutSelection()) {
</span><span class="lines">@@ -369,7 +367,7 @@
</span><span class="cx">
</span><span class="cx"> Document* document = frame->document();
</span><span class="cx"> ASSERT(document);
</span><del>- RefPtr<ReplaceSelectionCommand> command = ReplaceSelectionCommand::create(*document, createFragmentFromMarkup(*document, item->title(), ""), replaceOptions);
</del><ins>+ RefPtr<ReplaceSelectionCommand> command = ReplaceSelectionCommand::create(*document, createFragmentFromMarkup(*document, title, ""), replaceOptions);
</ins><span class="cx"> applyCommand(command);
</span><span class="cx"> frame->selection().revealSelection(ScrollAlignment::alignToEdgeIfNeeded);
</span><span class="cx"> }
</span><span class="lines">@@ -513,7 +511,7 @@
</span><span class="cx"> page->inspectorController().inspect(m_context.hitTestResult().innerNonSharedNode());
</span><span class="cx"> break;
</span><span class="cx"> case ContextMenuItemTagDictationAlternative:
</span><del>- frame->editor().applyDictationAlternativelternative(item->title());
</del><ins>+ frame->editor().applyDictationAlternativelternative(title);
</ins><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebCorepageContextMenuControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ContextMenuController.h (192380 => 192381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ContextMenuController.h 2015-11-12 21:21:39 UTC (rev 192380)
+++ trunk/Source/WebCore/page/ContextMenuController.h 2015-11-12 21:22:22 UTC (rev 192381)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><span class="cx">
</span><span class="cx"> #include "ContextMenuContext.h"
</span><ins>+#include "ContextMenuItem.h"
</ins><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="lines">@@ -58,7 +59,7 @@
</span><span class="cx"> void showContextMenu(Event*, PassRefPtr<ContextMenuProvider>);
</span><span class="cx">
</span><span class="cx"> void populate();
</span><del>- WEBCORE_EXPORT void contextMenuItemSelected(ContextMenuItem*);
</del><ins>+ WEBCORE_EXPORT void contextMenuItemSelected(ContextMenuAction, const String& title);
</ins><span class="cx"> void addInspectElementItem();
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void checkOrEnableIfNeeded(ContextMenuItem&) const;
</span></span></pre></div>
<a id="trunkSourceWebCorepageContextMenuProviderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ContextMenuProvider.h (192380 => 192381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ContextMenuProvider.h 2015-11-12 21:21:39 UTC (rev 192380)
+++ trunk/Source/WebCore/page/ContextMenuProvider.h 2015-11-12 21:22:22 UTC (rev 192381)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #ifndef ContextMenuProvider_h
</span><span class="cx"> #define ContextMenuProvider_h
</span><span class="cx">
</span><ins>+#include "ContextMenuItem.h"
</ins><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -43,7 +44,7 @@
</span><span class="cx"> virtual ~ContextMenuProvider() { };
</span><span class="cx">
</span><span class="cx"> virtual void populateContextMenu(ContextMenu*) = 0;
</span><del>- virtual void contextMenuItemSelected(ContextMenuItem*) = 0;
</del><ins>+ virtual void contextMenuItemSelected(ContextMenuAction, const String& title) = 0;
</ins><span class="cx"> virtual void contextMenuCleared() = 0;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (192380 => 192381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-11-12 21:21:39 UTC (rev 192380)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-11-12 21:22:22 UTC (rev 192381)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2015-11-12 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ ContextMenuController::contextMenuItemSelected only needs the action and title, not the full item
+ https://bugs.webkit.org/show_bug.cgi?id=151217
+
+ Reviewed by Joseph Pecoraro.
+
+ * WebView/WebHTMLView.mm:
+ (-[WebMenuTarget forwardContextMenuAction:]):
+
+2015-11-12 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Remove an unused function
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=151215
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebHTMLViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (192380 => 192381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-11-12 21:21:39 UTC (rev 192380)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-11-12 21:22:22 UTC (rev 192381)
</span><span class="lines">@@ -203,8 +203,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)forwardContextMenuAction:(id)sender
</span><span class="cx"> {
</span><del>- WebCore::ContextMenuItem item(WebCore::ActionType, static_cast<WebCore::ContextMenuAction>([sender tag]), [sender title]);
- _menuController->contextMenuItemSelected(&item);
</del><ins>+ _menuController->contextMenuItemSelected(static_cast<WebCore::ContextMenuAction>([sender tag]), [sender title]);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (192380 => 192381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2015-11-12 21:21:39 UTC (rev 192380)
+++ trunk/Source/WebKit/win/ChangeLog 2015-11-12 21:22:22 UTC (rev 192381)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2015-11-12 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ ContextMenuController::contextMenuItemSelected only needs the action and title, not the full item
+ https://bugs.webkit.org/show_bug.cgi?id=151217
+
+ Reviewed by Joseph Pecoraro.
+
+ * WebView.cpp:
+ (WebView::onMenuCommand):
+
+2015-11-12 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Remove an unused function
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=151215
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebView.cpp (192380 => 192381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebView.cpp 2015-11-12 21:21:39 UTC (rev 192380)
+++ trunk/Source/WebKit/win/WebView.cpp 2015-11-12 21:22:22 UTC (rev 192381)
</span><span class="lines">@@ -1635,8 +1635,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ContextMenuItem item(ActionType, action, title, true, false);
- m_page->contextMenuController().contextMenuItemSelected(&item);
</del><ins>+ m_page->contextMenuController().contextMenuItemSelected(action, title);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebView::handleMouseEvent(UINT message, WPARAM wParam, LPARAM lParam)
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (192380 => 192381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-11-12 21:21:39 UTC (rev 192380)
+++ trunk/Source/WebKit2/ChangeLog 2015-11-12 21:22:22 UTC (rev 192381)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2015-11-12 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ ContextMenuController::contextMenuItemSelected only needs the action and title, not the full item
+ https://bugs.webkit.org/show_bug.cgi?id=151217
+
+ Reviewed by Joseph Pecoraro.
+
+ * WebProcess/WebPage/WebContextMenu.cpp:
+ (WebKit::WebContextMenu::itemSelected):
+
+2015-11-12 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Remove an unused function
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=151215
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebContextMenucpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebContextMenu.cpp (192380 => 192381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebContextMenu.cpp 2015-11-12 21:21:39 UTC (rev 192380)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebContextMenu.cpp 2015-11-12 21:22:22 UTC (rev 192381)
</span><span class="lines">@@ -75,8 +75,7 @@
</span><span class="cx">
</span><span class="cx"> void WebContextMenu::itemSelected(const WebContextMenuItemData& item)
</span><span class="cx"> {
</span><del>- ContextMenuItem coreItem(ActionType, static_cast<ContextMenuAction>(item.action()), item.title());
- m_page->corePage()->contextMenuController().contextMenuItemSelected(&coreItem);
</del><ins>+ m_page->corePage()->contextMenuController().contextMenuItemSelected(static_cast<ContextMenuAction>(item.action()), item.title());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebContextMenu::menuItemsWithUserData(Vector<WebContextMenuItemData> &menuItems, RefPtr<API::Object>& userData) const
</span></span></pre>
</div>
</div>
</body>
</html>