<!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>[192394] 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/192394">192394</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-11-12 16:15:35 -0800 (Thu, 12 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Delete PlatformMenuDescription.h
https://bugs.webkit.org/show_bug.cgi?id=151229
Reviewed by Beth Dakin.
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* WebCore.xcodeproj/project.pbxproj:
* page/ContextMenuClient.h:
* platform/ContextMenu.h:
* platform/ContextMenuItem.h:
* platform/PlatformMenuDescription.h: Removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorepageContextMenuClienth">trunk/Source/WebCore/page/ContextMenuClient.h</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>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformPlatformMenuDescriptionh">trunk/Source/WebCore/platform/PlatformMenuDescription.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (192393 => 192394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-11-12 23:55:49 UTC (rev 192393)
+++ trunk/Source/WebCore/ChangeLog 2015-11-13 00:15:35 UTC (rev 192394)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2015-11-12 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Delete PlatformMenuDescription.h
+ https://bugs.webkit.org/show_bug.cgi?id=151229
+
+ Reviewed by Beth Dakin.
+
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCore.vcxproj.filters:
+ * WebCore.xcodeproj/project.pbxproj:
+ * page/ContextMenuClient.h:
+ * platform/ContextMenu.h:
+ * platform/ContextMenuItem.h:
+ * platform/PlatformMenuDescription.h: Removed.
+
+2015-11-12 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> ContextMenuAction and WebMenuItemTag shouldn't have to be in sync
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=151226
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (192393 => 192394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-11-12 23:55:49 UTC (rev 192393)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-11-13 00:15:35 UTC (rev 192394)
</span><span class="lines">@@ -21048,7 +21048,6 @@
</span><span class="cx"> <ClInclude Include="..\platform\Pasteboard.h" />
</span><span class="cx"> <ClInclude Include="..\platform\PlatformEvent.h" />
</span><span class="cx"> <ClInclude Include="..\platform\PlatformKeyboardEvent.h" />
</span><del>- <ClInclude Include="..\platform\PlatformMenuDescription.h" />
</del><span class="cx"> <ClInclude Include="..\platform\PlatformMouseEvent.h" />
</span><span class="cx"> <ClInclude Include="..\platform\PlatformScreen.h" />
</span><span class="cx"> <ClInclude Include="..\platform\PlatformStrategies.h" />
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (192393 => 192394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-11-12 23:55:49 UTC (rev 192393)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-11-13 00:15:35 UTC (rev 192394)
</span><span class="lines">@@ -8221,9 +8221,6 @@
</span><span class="cx"> <ClInclude Include="..\platform\PlatformKeyboardEvent.h">
</span><span class="cx"> <Filter>platform</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\platform\PlatformMenuDescription.h">
- <Filter>platform</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\platform\PlatformMouseEvent.h">
</span><span class="cx"> <Filter>platform</Filter>
</span><span class="cx"> </ClInclude>
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (192393 => 192394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-11-12 23:55:49 UTC (rev 192393)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-11-13 00:15:35 UTC (rev 192394)
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx"> 0709FC4E1025DEE30059CDBA /* AccessibilitySlider.h in Headers */ = {isa = PBXBuildFile; fileRef = 0709FC4D1025DEE30059CDBA /* AccessibilitySlider.h */; };
</span><span class="cx"> 070E09191875EEFC003A1D3C /* PlatformMediaSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 070E09181875ED93003A1D3C /* PlatformMediaSession.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 070E091B1875EF71003A1D3C /* PlatformMediaSession.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 070E091A1875EF71003A1D3C /* PlatformMediaSession.cpp */; };
</span><del>- 070E81D11BF27656001FDA48 /* VideoTrackPrivateMediaStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 070E81D01BF27656001FDA48 /* VideoTrackPrivateMediaStream.h */; settings = {ASSET_TAGS = (); }; };
</del><ins>+ 070E81D11BF27656001FDA48 /* VideoTrackPrivateMediaStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 070E81D01BF27656001FDA48 /* VideoTrackPrivateMediaStream.h */; };
</ins><span class="cx"> 070F549817F12F6B00169E04 /* MediaStreamConstraintsValidationClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 070F549717F12F6B00169E04 /* MediaStreamConstraintsValidationClient.h */; };
</span><span class="cx"> 070F549E17F2402700169E04 /* AudioDestinationConsumer.h in Headers */ = {isa = PBXBuildFile; fileRef = 070F549D17F2402700169E04 /* AudioDestinationConsumer.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 0711589117DF6F6600EDFE2B /* MediaStreamPrivate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0711588F17DF633700EDFE2B /* MediaStreamPrivate.cpp */; };
</span><span class="lines">@@ -343,7 +343,7 @@
</span><span class="cx"> 07D6A4F01BECF2D200174146 /* MockRealtimeMediaSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 07D6A4EE1BECF2D200174146 /* MockRealtimeMediaSource.h */; };
</span><span class="cx"> 07D6A4F31BED5F8800174146 /* MockRealtimeAudioSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07D6A4F11BED5F8800174146 /* MockRealtimeAudioSource.cpp */; };
</span><span class="cx"> 07D6A4F41BED5F8800174146 /* MockRealtimeAudioSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 07D6A4F21BED5F8800174146 /* MockRealtimeAudioSource.h */; };
</span><del>- 07D6A4F81BF2307D00174146 /* AudioTrackPrivateMediaStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 07D6A4F61BF2307D00174146 /* AudioTrackPrivateMediaStream.h */; settings = {ASSET_TAGS = (); }; };
</del><ins>+ 07D6A4F81BF2307D00174146 /* AudioTrackPrivateMediaStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 07D6A4F61BF2307D00174146 /* AudioTrackPrivateMediaStream.h */; };
</ins><span class="cx"> 07DC5FD417D3EEE90099F890 /* JSRTCStatsResponseCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07DC5FD317D3EEE90099F890 /* JSRTCStatsResponseCustom.cpp */; };
</span><span class="cx"> 07E116B11489C9A100EC5ACE /* JSTextTrackCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07E116B01489C9A100EC5ACE /* JSTextTrackCustom.cpp */; };
</span><span class="cx"> 07E117071489EBEB00EC5ACE /* JSTextTrackCueCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07E117061489EBEB00EC5ACE /* JSTextTrackCueCustom.cpp */; };
</span><span class="lines">@@ -3470,7 +3470,6 @@
</span><span class="cx"> 9321D5901A390704008052BE /* NSImmediateActionGestureRecognizerSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 9321D58F1A3906FA008052BE /* NSImmediateActionGestureRecognizerSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 9326DC0C09DAD5D600AFC847 /* CharsetData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 656581AC09D14EE6000E61D7 /* CharsetData.cpp */; };
</span><span class="cx"> 9327A94209968D1A0068A546 /* HTMLOptionsCollection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9327A94109968D1A0068A546 /* HTMLOptionsCollection.cpp */; };
</span><del>- 932871C00B20DEB70049035A /* PlatformMenuDescription.h in Headers */ = {isa = PBXBuildFile; fileRef = 932871BF0B20DEB70049035A /* PlatformMenuDescription.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> 932AD70517EFA2C30038F8FF /* MainFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 932AD70317EFA2C30038F8FF /* MainFrame.cpp */; };
</span><span class="cx"> 932AD70617EFA2C40038F8FF /* MainFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 932AD70417EFA2C30038F8FF /* MainFrame.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 932E16090AF578340025F408 /* FrameLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 932E16080AF578340025F408 /* FrameLoader.cpp */; };
</span><span class="lines">@@ -10959,7 +10958,6 @@
</span><span class="cx"> 931D72F515FE695300C4C07E /* LayoutMilestones.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LayoutMilestones.h; sourceTree = "<group>"; };
</span><span class="cx"> 9321D58F1A3906FA008052BE /* NSImmediateActionGestureRecognizerSPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NSImmediateActionGestureRecognizerSPI.h; sourceTree = "<group>"; };
</span><span class="cx"> 9327A94109968D1A0068A546 /* HTMLOptionsCollection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLOptionsCollection.cpp; sourceTree = "<group>"; };
</span><del>- 932871BF0B20DEB70049035A /* PlatformMenuDescription.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PlatformMenuDescription.h; sourceTree = "<group>"; };
</del><span class="cx"> 932AD70317EFA2C30038F8FF /* MainFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MainFrame.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 932AD70417EFA2C30038F8FF /* MainFrame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainFrame.h; sourceTree = "<group>"; };
</span><span class="cx"> 932E16080AF578340025F408 /* FrameLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FrameLoader.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -22548,7 +22546,6 @@
</span><span class="cx"> A723F77A1484CA4C008C6DBE /* PlatformExportMacros.h */,
</span><span class="cx"> 515E5FEF195101470086CA5E /* PlatformGamepad.h */,
</span><span class="cx"> 935C476609AC4D4300A6AAB4 /* PlatformKeyboardEvent.h */,
</span><del>- 932871BF0B20DEB70049035A /* PlatformMenuDescription.h */,
</del><span class="cx"> 935C476709AC4D4300A6AAB4 /* PlatformMouseEvent.h */,
</span><span class="cx"> C5BAC16F14E30E4700008837 /* PlatformPasteboard.h */,
</span><span class="cx"> BCEC01D60C274EB4009F4EC9 /* PlatformScreen.h */,
</span><span class="lines">@@ -26938,7 +26935,6 @@
</span><span class="cx"> CEEFCD7C19DB33DC003876D7 /* PlatformMediaResourceLoader.h in Headers */,
</span><span class="cx"> 070E09191875EEFC003A1D3C /* PlatformMediaSession.h in Headers */,
</span><span class="cx"> 07F944161864D046005D31CB /* PlatformMediaSessionManager.h in Headers */,
</span><del>- 932871C00B20DEB70049035A /* PlatformMenuDescription.h in Headers */,
</del><span class="cx"> 41BF70100FE86F61005E8DEC /* PlatformMessagePortChannel.h in Headers */,
</span><span class="cx"> 935C476909AC4D4300A6AAB4 /* PlatformMouseEvent.h in Headers */,
</span><span class="cx"> C598905814E9C29900E8D18B /* PlatformPasteboard.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebCorepageContextMenuClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ContextMenuClient.h (192393 => 192394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ContextMenuClient.h 2015-11-12 23:55:49 UTC (rev 192393)
+++ trunk/Source/WebCore/page/ContextMenuClient.h 2015-11-13 00:15:35 UTC (rev 192394)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><span class="cx">
</span><span class="cx"> #include "ContextMenu.h"
</span><del>-#include "PlatformMenuDescription.h"
</del><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformContextMenuh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ContextMenu.h (192393 => 192394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ContextMenu.h 2015-11-12 23:55:49 UTC (rev 192393)
+++ trunk/Source/WebCore/platform/ContextMenu.h 2015-11-13 00:15:35 UTC (rev 192394)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx">
</span><span class="cx"> #include "ContextMenuItem.h"
</span><del>-#include "PlatformMenuDescription.h"
</del><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformContextMenuItemh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ContextMenuItem.h (192393 => 192394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ContextMenuItem.h 2015-11-12 23:55:49 UTC (rev 192393)
+++ trunk/Source/WebCore/platform/ContextMenuItem.h 2015-11-13 00:15:35 UTC (rev 192394)
</span><span class="lines">@@ -27,11 +27,6 @@
</span><span class="cx"> #ifndef ContextMenuItem_h
</span><span class="cx"> #define ContextMenuItem_h
</span><span class="cx">
</span><del>-#if ENABLE(CONTEXT_MENUS)
-
-#include "PlatformMenuDescription.h"
-#endif // ENABLE(CONTEXT_MENUS)
-
</del><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformPlatformMenuDescriptionh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/PlatformMenuDescription.h (192393 => 192394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/PlatformMenuDescription.h 2015-11-12 23:55:49 UTC (rev 192393)
+++ trunk/Source/WebCore/platform/PlatformMenuDescription.h 2015-11-13 00:15:35 UTC (rev 192394)
</span><span class="lines">@@ -1,61 +0,0 @@
</span><del>-/*
- * Copyright (C) 2006 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.
- */
-
-#ifndef PlatformMenuDescription_h
-#define PlatformMenuDescription_h
-
-#if PLATFORM(COCOA)
-OBJC_CLASS NSMutableArray;
-#elif PLATFORM(WIN)
-#include <windows.h>
-#elif PLATFORM(GTK)
-typedef struct _GtkMenu GtkMenu;
-#endif
-
-namespace WebCore {
-
-#if !USE(CROSS_PLATFORM_CONTEXT_MENUS)
-#if PLATFORM(COCOA)
- typedef NSMutableArray* PlatformMenuDescription;
-#elif PLATFORM(GTK)
- typedef GtkMenu* PlatformMenuDescription;
-#else
- typedef void* PlatformMenuDescription;
-#endif
-#else
-// FIXME: When more platforms switch over, and PlatformMenuDescription
-// is not used anymore, we should rename this header to PlatformContextMenu.
-#if PLATFORM(WIN)
- typedef HMENU PlatformContextMenu;
- typedef MENUITEMINFO PlatformContextMenuItem;
-#else
- typedef void* PlatformContextMenu;
- typedef void* PlatformContextMenuItem;
-#endif
-#endif // !USE(CROSS_PLATFORM_CONTEXT_MENUS)
-
-} // namespace
-
-#endif // PlatformMenuDescription_h
</del></span></pre>
</div>
</div>
</body>
</html>