<!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>[192339] 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/192339">192339</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-11-11 17:29:31 -0800 (Wed, 11 Nov 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Remove ContextMenuWin.cpp and ContextMenuItemWin.cpp
https://bugs.webkit.org/show_bug.cgi?id=150467

Reviewed by Beth Dakin.

These files are not needed anymore.

* PlatformWin.cmake:
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* platform/win/ContextMenuItemWin.cpp: Removed.
(WebCore::ContextMenuItem::ContextMenuItem): Deleted.
(WebCore::ContextMenuItem::platformContextMenuItem): Deleted.
* platform/win/ContextMenuWin.cpp: Removed.
(WebCore::ContextMenu::ContextMenu): Deleted.
(WebCore::ContextMenu::getContextMenuItems): Deleted.
(WebCore::ContextMenu::createPlatformContextMenuFromItems): Deleted.
(WebCore::ContextMenu::platformContextMenu): Deleted.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformWincmake">trunk/Source/WebCore/PlatformWin.cmake</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformwinContextMenuItemWincpp">trunk/Source/WebCore/platform/win/ContextMenuItemWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformwinContextMenuWincpp">trunk/Source/WebCore/platform/win/ContextMenuWin.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (192338 => 192339)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-11-12 01:19:55 UTC (rev 192338)
+++ trunk/Source/WebCore/ChangeLog        2015-11-12 01:29:31 UTC (rev 192339)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2015-11-11  Anders Carlsson  &lt;andersca@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Remove ContextMenuWin.cpp and ContextMenuItemWin.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=150467
+
+        Reviewed by Beth Dakin.
+
+        These files are not needed anymore.
+
+        * PlatformWin.cmake:
+        * WebCore.vcxproj/WebCore.vcxproj:
+        * WebCore.vcxproj/WebCore.vcxproj.filters:
+        * platform/win/ContextMenuItemWin.cpp: Removed.
+        (WebCore::ContextMenuItem::ContextMenuItem): Deleted.
+        (WebCore::ContextMenuItem::platformContextMenuItem): Deleted.
+        * platform/win/ContextMenuWin.cpp: Removed.
+        (WebCore::ContextMenu::ContextMenu): Deleted.
+        (WebCore::ContextMenu::getContextMenuItems): Deleted.
+        (WebCore::ContextMenu::createPlatformContextMenuFromItems): Deleted.
+        (WebCore::ContextMenu::platformContextMenu): Deleted.
+
+2015-11-11  Anders Carlsson  &lt;andersca@apple.com&gt;
+
</ins><span class="cx">         Get rid of ContextMenuNone.cpp and ContextMenuItemNone.cpp
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=151169
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformWin.cmake (192338 => 192339)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformWin.cmake        2015-11-12 01:19:55 UTC (rev 192338)
+++ trunk/Source/WebCore/PlatformWin.cmake        2015-11-12 01:29:31 UTC (rev 192339)
</span><span class="lines">@@ -111,8 +111,6 @@
</span><span class="cx">     platform/win/BString.cpp
</span><span class="cx">     platform/win/BitmapInfo.cpp
</span><span class="cx">     platform/win/ClipboardUtilitiesWin.cpp
</span><del>-    platform/win/ContextMenuItemWin.cpp
-    platform/win/ContextMenuWin.cpp
</del><span class="cx">     platform/win/CursorWin.cpp
</span><span class="cx">     platform/win/DefWndProcWindowClass.cpp
</span><span class="cx">     platform/win/DragDataWin.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (192338 => 192339)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj        2015-11-12 01:19:55 UTC (rev 192338)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj        2015-11-12 01:29:31 UTC (rev 192339)
</span><span class="lines">@@ -8182,8 +8182,6 @@
</span><span class="cx">     &lt;ClCompile Include=&quot;..\platform\win\BitmapInfo.cpp&quot; /&gt;
</span><span class="cx">     &lt;ClCompile Include=&quot;..\platform\win\BString.cpp&quot; /&gt;
</span><span class="cx">     &lt;ClCompile Include=&quot;..\platform\win\ClipboardUtilitiesWin.cpp&quot; /&gt;
</span><del>-    &lt;ClCompile Include=&quot;..\platform\win\ContextMenuItemWin.cpp&quot; /&gt;
-    &lt;ClCompile Include=&quot;..\platform\win\ContextMenuWin.cpp&quot; /&gt;
</del><span class="cx">     &lt;ClCompile Include=&quot;..\platform\win\CursorWin.cpp&quot; /&gt;
</span><span class="cx">     &lt;ClCompile Include=&quot;..\platform\win\DefWndProcWindowClass.cpp&quot; /&gt;
</span><span class="cx">     &lt;ClCompile Include=&quot;..\platform\win\DelayLoadedModulesEnumerator.cpp&quot; /&gt;
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (192338 => 192339)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters        2015-11-12 01:19:55 UTC (rev 192338)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters        2015-11-12 01:29:31 UTC (rev 192339)
</span><span class="lines">@@ -1190,12 +1190,6 @@
</span><span class="cx">     &lt;ClCompile Include=&quot;..\platform\win\ClipboardUtilitiesWin.cpp&quot;&gt;
</span><span class="cx">       &lt;Filter&gt;platform\win&lt;/Filter&gt;
</span><span class="cx">     &lt;/ClCompile&gt;
</span><del>-    &lt;ClCompile Include=&quot;..\platform\win\ContextMenuItemWin.cpp&quot;&gt;
-      &lt;Filter&gt;platform\win&lt;/Filter&gt;
-    &lt;/ClCompile&gt;
-    &lt;ClCompile Include=&quot;..\platform\win\ContextMenuWin.cpp&quot;&gt;
-      &lt;Filter&gt;platform\win&lt;/Filter&gt;
-    &lt;/ClCompile&gt;
</del><span class="cx">     &lt;ClCompile Include=&quot;..\platform\win\CursorWin.cpp&quot;&gt;
</span><span class="cx">       &lt;Filter&gt;platform\win&lt;/Filter&gt;
</span><span class="cx">     &lt;/ClCompile&gt;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinContextMenuItemWincpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/win/ContextMenuItemWin.cpp (192338 => 192339)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/ContextMenuItemWin.cpp        2015-11-12 01:19:55 UTC (rev 192338)
+++ trunk/Source/WebCore/platform/win/ContextMenuItemWin.cpp        2015-11-12 01:29:31 UTC (rev 192339)
</span><span class="lines">@@ -1,93 +0,0 @@
</span><del>-/*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#include &quot;config.h&quot;
-#include &quot;ContextMenuItem.h&quot;
-
-#include &quot;ContextMenu.h&quot;
-
-namespace WebCore {
-
-ContextMenuItem::ContextMenuItem(const MENUITEMINFO&amp; info)
-{
-    if (info.fMask &amp; MIIM_FTYPE)
-        m_type = info.fType == MFT_SEPARATOR ? SeparatorType : ActionType;
-    else
-        m_type = SeparatorType;
-
-    if (m_type == ActionType &amp;&amp; info.fMask &amp; MIIM_STRING)
-        m_title = String(info.dwTypeData, info.cch);
-
-    if ((info.fMask &amp; MIIM_SUBMENU) &amp;&amp; info.hSubMenu) {
-        m_type = SubmenuType;
-        ContextMenu::getContextMenuItems(info.hSubMenu, m_subMenuItems);
-    }
-
-    if (info.fMask &amp; MIIM_ID)
-        m_action = static_cast&lt;ContextMenuAction&gt;(info.wID);
-    else
-        m_action = ContextMenuItemTagNoAction;
-
-    if (info.fMask &amp; MIIM_STATE) {
-        m_checked = info.fState &amp; MFS_CHECKED;
-        m_enabled = !(info.fState &amp; MFS_DISABLED);
-    } else {
-        m_checked = false;
-        m_enabled = false;
-    }
-}
-
-// ContextMenuItem::platformContextMenuItem doesn't set the info.dwTypeData. This is
-// done to make the lifetime handling of the returned MENUITEMINFO easier on
-// callers. Callers can set dwTypeData themselves (and make their own decisions
-// about its lifetime) if they need it.
-MENUITEMINFO ContextMenuItem::platformContextMenuItem() const
-{
-    MENUITEMINFO info = {0};
-    info.cbSize = sizeof(MENUITEMINFO);
-
-    if (m_type == SeparatorType) {
-        info.fMask = MIIM_FTYPE;
-        info.fType = MFT_SEPARATOR;
-        return info;
-    }
-
-    info.fMask = MIIM_FTYPE | MIIM_ID | MIIM_STATE;
-    info.fType = MFT_STRING;
-
-    info.wID = m_action;
-
-    if (m_type == SubmenuType) {
-        info.fMask |= MIIM_SUBMENU;
-        info.hSubMenu = ContextMenu::createPlatformContextMenuFromItems(m_subMenuItems);
-    }
-
-    info.fState |= m_enabled ? MFS_ENABLED : MFS_DISABLED;
-    info.fState |= m_checked ? MFS_CHECKED : MFS_UNCHECKED;
-
-    return info;
-}
-
-}
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformwinContextMenuWincpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/win/ContextMenuWin.cpp (192338 => 192339)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/ContextMenuWin.cpp        2015-11-12 01:19:55 UTC (rev 192338)
+++ trunk/Source/WebCore/platform/win/ContextMenuWin.cpp        2015-11-12 01:29:31 UTC (rev 192339)
</span><span class="lines">@@ -1,114 +0,0 @@
</span><del>-/*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#include &quot;config.h&quot;
-#include &quot;ContextMenu.h&quot;
-
-#include &quot;Document.h&quot;
-#include &quot;Frame.h&quot;
-#include &quot;FrameView.h&quot;
-#include &quot;Node.h&quot;
-#include &quot;NotImplemented.h&quot;
-#include &lt;windows.h&gt;
-#include &lt;wtf/StdLibExtras.h&gt;
-#include &lt;wtf/Vector.h&gt;
-#include &lt;wtf/text/CString.h&gt;
-
-#ifndef MIIM_FTYPE
-#define MIIM_FTYPE MIIM_TYPE
-#endif
-#ifndef MIIM_STRING
-#define MIIM_STRING MIIM_TYPE
-#endif
-
-namespace WebCore {
-
-ContextMenu::ContextMenu(HMENU menu)
-{
-    getContextMenuItems(menu, m_items);
-}
-
-void ContextMenu::getContextMenuItems(HMENU menu, Vector&lt;ContextMenuItem&gt;&amp; items)
-{
-    int count = ::GetMenuItemCount(menu);
-    if (count &lt;= 0)
-        return;
-
-    for (int i = 0; i &lt; count; ++i) {
-        MENUITEMINFO info = {0};
-        info.cbSize = sizeof(MENUITEMINFO);
-        info.fMask = MIIM_FTYPE | MIIM_ID | MIIM_STRING | MIIM_STATE | MIIM_SUBMENU;
-
-        if (!::GetMenuItemInfo(menu, i, TRUE, &amp;info))
-            continue;
-
-        if (info.fType == MFT_SEPARATOR) {
-            items.append(ContextMenuItem(SeparatorType, ContextMenuItemTagNoAction, String()));
-            continue;
-        }
-
-        int menuStringLength = info.cch + 1;
-        auto menuString = std::make_unique&lt;WCHAR[]&gt;(menuStringLength);
-        info.dwTypeData = menuString.get();
-        info.cch = menuStringLength;
-
-        if (::GetMenuItemInfo(menu, i, TRUE, &amp;info))
-           items.append(ContextMenuItem(info));
-    }
-}
-
-HMENU ContextMenu::createPlatformContextMenuFromItems(const Vector&lt;ContextMenuItem&gt;&amp; items)
-{
-    HMENU menu = ::CreatePopupMenu();
-
-    for (size_t i = 0; i &lt; items.size(); ++i) {
-        const ContextMenuItem&amp; item = items[i];
-
-        MENUITEMINFO menuItem = item.platformContextMenuItem();
-
-        // ContextMenuItem::platformContextMenuItem doesn't set the title of the MENUITEMINFO to make the
-        // lifetime handling easier for callers.
-        Vector&lt;UChar&gt; wideCharTitle; // Retain buffer for long enough to make the InsertMenuItem call
-
-        const String&amp; itemTitle = item.title();
-        if (item.type() != SeparatorType) {
-            menuItem.fMask |= MIIM_STRING;
-            menuItem.cch = itemTitle.length();
-            wideCharTitle = itemTitle.charactersWithNullTermination();
-            menuItem.dwTypeData = const_cast&lt;LPWSTR&gt;(wideCharTitle.data());
-        }
-
-        ::InsertMenuItem(menu, i, TRUE, &amp;menuItem);
-    }
-
-    return menu;
-}
-
-HMENU ContextMenu::platformContextMenu() const
-{
-    return createPlatformContextMenuFromItems(m_items);
-}
-
-} // namespace WebCore
</del></span></pre>
</div>
</div>

</body>
</html>