<!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>[191205] trunk/Source/WebKit2</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/191205">191205</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-10-16 14:02:33 -0700 (Fri, 16 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove some dead menu code
https://bugs.webkit.org/show_bug.cgi?id=150247
Reviewed by Andreas Kling.
* Shared/WebContextMenuItemData.cpp:
(WebKit::WebContextMenuItemData::WebContextMenuItemData):
(WebKit::WebContextMenuItemData::encode): Deleted.
* Shared/WebContextMenuItemData.h:
(WebKit::WebContextMenuItemData::selectionHandler): Deleted.
* UIProcess/mac/WebContextMenuProxyMac.mm:
(WebKit::nsMenuItem):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebContextMenuItemDatacpp">trunk/Source/WebKit2/Shared/WebContextMenuItemData.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebContextMenuItemDatah">trunk/Source/WebKit2/Shared/WebContextMenuItemData.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebContextMenuProxyMacmm">trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (191204 => 191205)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-10-16 20:50:22 UTC (rev 191204)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-16 21:02:33 UTC (rev 191205)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2015-10-16 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Remove some dead menu code
+ https://bugs.webkit.org/show_bug.cgi?id=150247
+
+ Reviewed by Andreas Kling.
+
+ * Shared/WebContextMenuItemData.cpp:
+ (WebKit::WebContextMenuItemData::WebContextMenuItemData):
+ (WebKit::WebContextMenuItemData::encode): Deleted.
+ * Shared/WebContextMenuItemData.h:
+ (WebKit::WebContextMenuItemData::selectionHandler): Deleted.
+ * UIProcess/mac/WebContextMenuProxyMac.mm:
+ (WebKit::nsMenuItem):
+
+2015-10-16 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Move more code to WebContextMenuProxyMac
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=150240
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebContextMenuItemDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebContextMenuItemData.cpp (191204 => 191205)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebContextMenuItemData.cpp 2015-10-16 20:50:22 UTC (rev 191204)
+++ trunk/Source/WebKit2/Shared/WebContextMenuItemData.cpp 2015-10-16 21:02:33 UTC (rev 191205)
</span><span class="lines">@@ -67,11 +67,10 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebContextMenuItemData::WebContextMenuItemData(const WebCore::ContextMenuItem& item, std::function<void ()> selectionHandler)
</del><ins>+WebContextMenuItemData::WebContextMenuItemData(const WebCore::ContextMenuItem& item)
</ins><span class="cx"> : m_type(item.type())
</span><span class="cx"> , m_action(item.action())
</span><span class="cx"> , m_title(item.title())
</span><del>- , m_selectionHandler(selectionHandler)
</del><span class="cx"> {
</span><span class="cx"> if (m_type == WebCore::SubmenuType) {
</span><span class="cx"> #if USE(CROSS_PLATFORM_CONTEXT_MENUS)
</span><span class="lines">@@ -107,9 +106,6 @@
</span><span class="cx">
</span><span class="cx"> void WebContextMenuItemData::encode(IPC::ArgumentEncoder& encoder) const
</span><span class="cx"> {
</span><del>- // WebContextMenuItemDatas with a selection handler are meant to exist solely in the UIProcess and should never be sent over IPC.
- ASSERT(!m_selectionHandler);
-
</del><span class="cx"> encoder.encodeEnum(m_type);
</span><span class="cx"> encoder.encodeEnum(m_action);
</span><span class="cx"> encoder << m_title;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebContextMenuItemDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebContextMenuItemData.h (191204 => 191205)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebContextMenuItemData.h 2015-10-16 20:50:22 UTC (rev 191204)
+++ trunk/Source/WebKit2/Shared/WebContextMenuItemData.h 2015-10-16 21:02:33 UTC (rev 191205)
</span><span class="lines">@@ -37,8 +37,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace IPC {
</span><del>- class ArgumentDecoder;
- class ArgumentEncoder;
</del><ins>+class ArgumentDecoder;
+class ArgumentEncoder;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> class WebContextMenuItemData {
</span><span class="cx"> public:
</span><span class="cx"> WebContextMenuItemData();
</span><del>- WebContextMenuItemData(const WebCore::ContextMenuItem&, std::function<void ()> selectionHandler = nullptr);
</del><ins>+ WebContextMenuItemData(const WebCore::ContextMenuItem&);
</ins><span class="cx"> WebContextMenuItemData(WebCore::ContextMenuItemType, WebCore::ContextMenuAction, const String& title, bool enabled, bool checked);
</span><span class="cx"> WebContextMenuItemData(WebCore::ContextMenuAction, const String& title, bool enabled, const Vector<WebContextMenuItemData>& submenu);
</span><span class="cx">
</span><span class="lines">@@ -65,8 +65,6 @@
</span><span class="cx"> void encode(IPC::ArgumentEncoder&) const;
</span><span class="cx"> static bool decode(IPC::ArgumentDecoder&, WebContextMenuItemData&);
</span><span class="cx">
</span><del>- std::function<void ()> selectionHandler() const { return m_selectionHandler; }
-
</del><span class="cx"> private:
</span><span class="cx"> WebCore::ContextMenuItemType m_type;
</span><span class="cx"> WebCore::ContextMenuAction m_action;
</span><span class="lines">@@ -75,8 +73,6 @@
</span><span class="cx"> bool m_checked;
</span><span class="cx"> Vector<WebContextMenuItemData> m_submenu;
</span><span class="cx"> RefPtr<API::Object> m_userData;
</span><del>-
- std::function<void ()> m_selectionHandler;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> Vector<WebContextMenuItemData> kitItems(const Vector<WebCore::ContextMenuItem>&);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebContextMenuProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm (191204 => 191205)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2015-10-16 20:50:22 UTC (rev 191204)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2015-10-16 21:02:33 UTC (rev 191205)
</span><span class="lines">@@ -193,11 +193,7 @@
</span><span class="cx"> [menuItem setEnabled:item.enabled()];
</span><span class="cx"> [menuItem setState:item.checked() ? NSOnState : NSOffState];
</span><span class="cx">
</span><del>- if (std::function<void ()> selectionHandler = item.selectionHandler()) {
- WKSelectionHandlerWrapper *wrapper = [[WKSelectionHandlerWrapper alloc] initWithSelectionHandler:selectionHandler];
- [menuItem setRepresentedObject:wrapper];
- [wrapper release];
- } else if (item.userData()) {
</del><ins>+ if (item.userData()) {
</ins><span class="cx"> WKUserDataWrapper *wrapper = [[WKUserDataWrapper alloc] initWithUserData:item.userData()];
</span><span class="cx"> [menuItem setRepresentedObject:wrapper];
</span><span class="cx"> [wrapper release];
</span></span></pre>
</div>
</div>
</body>
</html>