<!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>[192341] trunk/Source/WebCore</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/192341">192341</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-11-11 17:47:04 -0800 (Wed, 11 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove more dead code
https://bugs.webkit.org/show_bug.cgi?id=151170
Reviewed by Beth Dakin.
* platform/ContextMenu.cpp:
(WebCore::findItemWithAction): Deleted.
(WebCore::ContextMenu::itemWithAction): Deleted.
* platform/ContextMenu.h:
(WebCore::ContextMenu::itemAtIndex): Deleted.
* platform/ContextMenuItem.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformContextMenucpp">trunk/Source/WebCore/platform/ContextMenu.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformContextMenuh">trunk/Source/WebCore/platform/ContextMenu.h</a></li>
<li><a href="#trunkSourceWebCoreplatformContextMenuItemh">trunk/Source/WebCore/platform/ContextMenuItem.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (192340 => 192341)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-11-12 01:35:26 UTC (rev 192340)
+++ trunk/Source/WebCore/ChangeLog 2015-11-12 01:47:04 UTC (rev 192341)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2015-11-11 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Remove more dead code
+ https://bugs.webkit.org/show_bug.cgi?id=151170
+
+ Reviewed by Beth Dakin.
+
+ * platform/ContextMenu.cpp:
+ (WebCore::findItemWithAction): Deleted.
+ (WebCore::ContextMenu::itemWithAction): Deleted.
+ * platform/ContextMenu.h:
+ (WebCore::ContextMenu::itemAtIndex): Deleted.
+ * platform/ContextMenuItem.h:
+
+2015-11-11 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> De-indent ContextMenu.h and ContextMenuItem.h.
</span><span class="cx">
</span><span class="cx"> Rubber-stamped by Andreas Kling.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformContextMenucpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ContextMenu.cpp (192340 => 192341)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ContextMenu.cpp 2015-11-12 01:35:26 UTC (rev 192340)
+++ trunk/Source/WebCore/platform/ContextMenu.cpp 2015-11-12 01:47:04 UTC (rev 192341)
</span><span class="lines">@@ -34,28 +34,6 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static const ContextMenuItem* findItemWithAction(unsigned action, const Vector<ContextMenuItem>& items)
-{
- for (size_t i = 0; i < items.size(); ++i) {
- const ContextMenuItem& item = items[i];
- if (item.action() == static_cast<ContextMenuAction>(action))
- return &item;
- if (item.type() != SubmenuType)
- continue;
- if (const ContextMenuItem* subMenuItem = findItemWithAction(action, item.subMenuItems()))
- return subMenuItem;
- }
-
- return 0;
-}
-
-ContextMenuItem* ContextMenu::itemWithAction(unsigned action)
-{
- // FIXME: When more platforms switch over, this fucntion should return a const ContextMenuItem*'s, and the const_cast
- // won't be needed anymore.
- return const_cast<ContextMenuItem*>(findItemWithAction(action, m_items));
-}
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(CONTEXT_MENUS) && USE(CROSS_PLATFORM_CONTEXT_MENUS)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformContextMenuh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ContextMenu.h (192340 => 192341)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ContextMenu.h 2015-11-12 01:35:26 UTC (rev 192340)
+++ trunk/Source/WebCore/platform/ContextMenu.h 2015-11-12 01:47:04 UTC (rev 192341)
</span><span class="lines">@@ -49,19 +49,7 @@
</span><span class="cx"> public:
</span><span class="cx"> ContextMenu();
</span><span class="cx">
</span><del>- ContextMenuItem* itemWithAction(unsigned);
-
</del><span class="cx"> #if USE(CROSS_PLATFORM_CONTEXT_MENUS)
</span><del>- explicit ContextMenu(PlatformContextMenu);
-
- PlatformContextMenu platformContextMenu() const;
-
- static PlatformContextMenu createPlatformContextMenuFromItems(const Vector<ContextMenuItem>&);
- static void getContextMenuItems(PlatformContextMenu, Vector<ContextMenuItem>&);
-
- // FIXME: When more platforms switch over, this should return const ContextMenuItem*'s.
- ContextMenuItem* itemAtIndex(unsigned index) { return &m_items[index]; }
-
</del><span class="cx"> void setItems(const Vector<ContextMenuItem>& items) { m_items = items; }
</span><span class="cx"> const Vector<ContextMenuItem>& items() const { return m_items; }
</span><span class="cx">
</span><span class="lines">@@ -73,8 +61,6 @@
</span><span class="cx"> void insertItem(unsigned position, ContextMenuItem&);
</span><span class="cx"> void appendItem(ContextMenuItem&);
</span><span class="cx">
</span><del>- ContextMenuItem* itemAtIndex(unsigned, const PlatformMenuDescription);
-
</del><span class="cx"> unsigned itemCount() const;
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT PlatformMenuDescription platformDescription() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformContextMenuItemh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ContextMenuItem.h (192340 => 192341)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ContextMenuItem.h 2015-11-12 01:35:26 UTC (rev 192340)
+++ trunk/Source/WebCore/platform/ContextMenuItem.h 2015-11-12 01:47:04 UTC (rev 192341)
</span><span class="lines">@@ -205,15 +205,10 @@
</span><span class="cx">
</span><span class="cx"> #if USE(CROSS_PLATFORM_CONTEXT_MENUS)
</span><span class="cx"> ContextMenuItem(ContextMenuAction, const String&, bool enabled, bool checked, const Vector<ContextMenuItem>& subMenuItems);
</span><del>- explicit ContextMenuItem(const PlatformContextMenuItem&);
</del><span class="cx"> ContextMenuItem();
</span><span class="cx">
</span><span class="cx"> bool isNull() const;
</span><span class="cx">
</span><del>- // On Windows, the title (dwTypeData of the MENUITEMINFO) is not set in this function. Callers can set the title themselves,
- // and handle the lifetime of the title, if they need it.
- PlatformContextMenuItem platformContextMenuItem() const;
-
</del><span class="cx"> void setTitle(const String& title) { m_title = title; }
</span><span class="cx"> const String& title() const { return m_title; }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>