<!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>[192340] 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/192340">192340</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-11-11 17:35:26 -0800 (Wed, 11 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>De-indent ContextMenu.h and ContextMenuItem.h.
Rubber-stamped by Andreas Kling.
* platform/ContextMenu.h:
* platform/ContextMenuItem.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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 (192339 => 192340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-11-12 01:29:31 UTC (rev 192339)
+++ trunk/Source/WebCore/ChangeLog 2015-11-12 01:35:26 UTC (rev 192340)
</span><span class="lines">@@ -1,5 +1,14 @@
</span><span class="cx"> 2015-11-11 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ De-indent ContextMenu.h and ContextMenuItem.h.
+
+ Rubber-stamped by Andreas Kling.
+
+ * platform/ContextMenu.h:
+ * platform/ContextMenuItem.h:
+
+2015-11-11 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Remove ContextMenuWin.cpp and ContextMenuItemWin.cpp
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=150467
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformContextMenuh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ContextMenu.h (192339 => 192340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ContextMenu.h 2015-11-12 01:29:31 UTC (rev 192339)
+++ trunk/Source/WebCore/platform/ContextMenu.h 2015-11-12 01:35:26 UTC (rev 192340)
</span><span class="lines">@@ -42,60 +42,60 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>- class ContextMenuController;
</del><ins>+class ContextMenuController;
</ins><span class="cx">
</span><del>- class ContextMenu {
- WTF_MAKE_NONCOPYABLE(ContextMenu); WTF_MAKE_FAST_ALLOCATED;
- public:
- ContextMenu();
</del><ins>+class ContextMenu {
+ WTF_MAKE_NONCOPYABLE(ContextMenu); WTF_MAKE_FAST_ALLOCATED;
+public:
+ ContextMenu();
</ins><span class="cx">
</span><del>- ContextMenuItem* itemWithAction(unsigned);
</del><ins>+ ContextMenuItem* itemWithAction(unsigned);
</ins><span class="cx">
</span><span class="cx"> #if USE(CROSS_PLATFORM_CONTEXT_MENUS)
</span><del>- explicit ContextMenu(PlatformContextMenu);
</del><ins>+ explicit ContextMenu(PlatformContextMenu);
</ins><span class="cx">
</span><del>- PlatformContextMenu platformContextMenu() const;
</del><ins>+ PlatformContextMenu platformContextMenu() const;
</ins><span class="cx">
</span><del>- static PlatformContextMenu createPlatformContextMenuFromItems(const Vector<ContextMenuItem>&);
- static void getContextMenuItems(PlatformContextMenu, Vector<ContextMenuItem>&);
</del><ins>+ static PlatformContextMenu createPlatformContextMenuFromItems(const Vector<ContextMenuItem>&);
+ static void getContextMenuItems(PlatformContextMenu, Vector<ContextMenuItem>&);
</ins><span class="cx">
</span><del>- // FIXME: When more platforms switch over, this should return const ContextMenuItem*'s.
- ContextMenuItem* itemAtIndex(unsigned index) { return &m_items[index]; }
</del><ins>+ // FIXME: When more platforms switch over, this should return const ContextMenuItem*'s.
+ ContextMenuItem* itemAtIndex(unsigned index) { return &m_items[index]; }
</ins><span class="cx">
</span><del>- void setItems(const Vector<ContextMenuItem>& items) { m_items = items; }
- const Vector<ContextMenuItem>& items() const { return m_items; }
</del><ins>+ void setItems(const Vector<ContextMenuItem>& items) { m_items = items; }
+ const Vector<ContextMenuItem>& items() const { return m_items; }
</ins><span class="cx">
</span><del>- void appendItem(const ContextMenuItem& item) { m_items.append(item); }
</del><ins>+ void appendItem(const ContextMenuItem& item) { m_items.append(item); }
</ins><span class="cx"> #else
</span><del>- explicit ContextMenu(const PlatformMenuDescription);
- ~ContextMenu();
</del><ins>+ explicit ContextMenu(const PlatformMenuDescription);
+ ~ContextMenu();
</ins><span class="cx">
</span><del>- void insertItem(unsigned position, ContextMenuItem&);
- void appendItem(ContextMenuItem&);
</del><ins>+ void insertItem(unsigned position, ContextMenuItem&);
+ void appendItem(ContextMenuItem&);
</ins><span class="cx">
</span><del>- ContextMenuItem* itemAtIndex(unsigned, const PlatformMenuDescription);
</del><ins>+ ContextMenuItem* itemAtIndex(unsigned, const PlatformMenuDescription);
</ins><span class="cx">
</span><del>- unsigned itemCount() const;
</del><ins>+ unsigned itemCount() const;
</ins><span class="cx">
</span><del>- WEBCORE_EXPORT PlatformMenuDescription platformDescription() const;
- WEBCORE_EXPORT void setPlatformDescription(PlatformMenuDescription);
</del><ins>+ WEBCORE_EXPORT PlatformMenuDescription platformDescription() const;
+ WEBCORE_EXPORT void setPlatformDescription(PlatformMenuDescription);
</ins><span class="cx">
</span><del>- PlatformMenuDescription releasePlatformDescription();
</del><ins>+ PlatformMenuDescription releasePlatformDescription();
</ins><span class="cx"> #endif // USE(CROSS_PLATFORM_CONTEXT_MENUS)
</span><span class="cx">
</span><del>- private:
</del><ins>+private:
</ins><span class="cx"> #if USE(CROSS_PLATFORM_CONTEXT_MENUS)
</span><del>- Vector<ContextMenuItem> m_items;
</del><ins>+ Vector<ContextMenuItem> m_items;
</ins><span class="cx"> #else
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>- // Keep this in sync with the PlatformMenuDescription typedef
- RetainPtr<NSMutableArray> m_platformDescription;
</del><ins>+ // Keep this in sync with the PlatformMenuDescription typedef
+ RetainPtr<NSMutableArray> m_platformDescription;
</ins><span class="cx"> #else
</span><del>- PlatformMenuDescription m_platformDescription;
</del><ins>+ PlatformMenuDescription m_platformDescription;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #endif // USE(CROSS_PLATFORM_CONTEXT_MENUS)
</span><del>- };
</del><ins>+};
</ins><span class="cx">
</span><span class="cx"> #if !USE(CROSS_PLATFORM_CONTEXT_MENUS)
</span><span class="cx"> WEBCORE_EXPORT Vector<ContextMenuItem> contextMenuItemVector(PlatformMenuDescription);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformContextMenuItemh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ContextMenuItem.h (192339 => 192340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ContextMenuItem.h 2015-11-12 01:29:31 UTC (rev 192339)
+++ trunk/Source/WebCore/platform/ContextMenuItem.h 2015-11-12 01:35:26 UTC (rev 192340)
</span><span class="lines">@@ -41,217 +41,217 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>- class ContextMenu;
- class Image;
- class URL;
</del><ins>+class ContextMenu;
+class Image;
+class URL;
</ins><span class="cx">
</span><del>- // This enum needs to be in sync with the WebMenuItemTag enum in WebUIDelegate.h and the
- // extra values in WebUIDelegatePrivate.h
- enum ContextMenuAction {
- ContextMenuItemTagNoAction=0, // This item is not actually in WebUIDelegate.h
- ContextMenuItemTagOpenLinkInNewWindow=1,
- ContextMenuItemTagDownloadLinkToDisk,
- ContextMenuItemTagCopyLinkToClipboard,
- ContextMenuItemTagOpenImageInNewWindow,
- ContextMenuItemTagDownloadImageToDisk,
- ContextMenuItemTagCopyImageToClipboard,
</del><ins>+// This enum needs to be in sync with the WebMenuItemTag enum in WebUIDelegate.h and the
+// extra values in WebUIDelegatePrivate.h
+enum ContextMenuAction {
+ ContextMenuItemTagNoAction=0, // This item is not actually in WebUIDelegate.h
+ ContextMenuItemTagOpenLinkInNewWindow=1,
+ ContextMenuItemTagDownloadLinkToDisk,
+ ContextMenuItemTagCopyLinkToClipboard,
+ ContextMenuItemTagOpenImageInNewWindow,
+ ContextMenuItemTagDownloadImageToDisk,
+ ContextMenuItemTagCopyImageToClipboard,
</ins><span class="cx"> #if PLATFORM(GTK) || PLATFORM(EFL)
</span><del>- ContextMenuItemTagCopyImageUrlToClipboard,
</del><ins>+ ContextMenuItemTagCopyImageUrlToClipboard,
</ins><span class="cx"> #endif
</span><del>- ContextMenuItemTagOpenFrameInNewWindow,
- ContextMenuItemTagCopy,
- ContextMenuItemTagGoBack,
- ContextMenuItemTagGoForward,
- ContextMenuItemTagStop,
- ContextMenuItemTagReload,
- ContextMenuItemTagCut,
- ContextMenuItemTagPaste,
</del><ins>+ ContextMenuItemTagOpenFrameInNewWindow,
+ ContextMenuItemTagCopy,
+ ContextMenuItemTagGoBack,
+ ContextMenuItemTagGoForward,
+ ContextMenuItemTagStop,
+ ContextMenuItemTagReload,
+ ContextMenuItemTagCut,
+ ContextMenuItemTagPaste,
</ins><span class="cx"> #if PLATFORM(GTK)
</span><del>- ContextMenuItemTagDelete,
</del><ins>+ ContextMenuItemTagDelete,
</ins><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(GTK) || PLATFORM (EFL)
</span><del>- ContextMenuItemTagSelectAll,
</del><ins>+ ContextMenuItemTagSelectAll,
</ins><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(GTK)
</span><del>- ContextMenuItemTagInputMethods,
- ContextMenuItemTagUnicode,
- ContextMenuItemTagUnicodeInsertLRMMark,
- ContextMenuItemTagUnicodeInsertRLMMark,
- ContextMenuItemTagUnicodeInsertLREMark,
- ContextMenuItemTagUnicodeInsertRLEMark,
- ContextMenuItemTagUnicodeInsertLROMark,
- ContextMenuItemTagUnicodeInsertRLOMark,
- ContextMenuItemTagUnicodeInsertPDFMark,
- ContextMenuItemTagUnicodeInsertZWSMark,
- ContextMenuItemTagUnicodeInsertZWJMark,
- ContextMenuItemTagUnicodeInsertZWNJMark,
</del><ins>+ ContextMenuItemTagInputMethods,
+ ContextMenuItemTagUnicode,
+ ContextMenuItemTagUnicodeInsertLRMMark,
+ ContextMenuItemTagUnicodeInsertRLMMark,
+ ContextMenuItemTagUnicodeInsertLREMark,
+ ContextMenuItemTagUnicodeInsertRLEMark,
+ ContextMenuItemTagUnicodeInsertLROMark,
+ ContextMenuItemTagUnicodeInsertRLOMark,
+ ContextMenuItemTagUnicodeInsertPDFMark,
+ ContextMenuItemTagUnicodeInsertZWSMark,
+ ContextMenuItemTagUnicodeInsertZWJMark,
+ ContextMenuItemTagUnicodeInsertZWNJMark,
</ins><span class="cx"> #endif
</span><del>- ContextMenuItemTagSpellingGuess,
- ContextMenuItemTagNoGuessesFound,
- ContextMenuItemTagIgnoreSpelling,
- ContextMenuItemTagLearnSpelling,
- ContextMenuItemTagOther,
- ContextMenuItemTagSearchInSpotlight,
- ContextMenuItemTagSearchWeb,
- ContextMenuItemTagLookUpInDictionary,
- ContextMenuItemTagOpenWithDefaultApplication,
- ContextMenuItemPDFActualSize,
- ContextMenuItemPDFZoomIn,
- ContextMenuItemPDFZoomOut,
- ContextMenuItemPDFAutoSize,
- ContextMenuItemPDFSinglePage,
- ContextMenuItemPDFFacingPages,
- ContextMenuItemPDFContinuous,
- ContextMenuItemPDFNextPage,
- ContextMenuItemPDFPreviousPage,
- // These are new tags! Not a part of API!!!!
- ContextMenuItemTagOpenLink = 2000,
- ContextMenuItemTagIgnoreGrammar,
- ContextMenuItemTagSpellingMenu, // Spelling or Spelling/Grammar sub-menu
- ContextMenuItemTagShowSpellingPanel,
- ContextMenuItemTagCheckSpelling,
- ContextMenuItemTagCheckSpellingWhileTyping,
- ContextMenuItemTagCheckGrammarWithSpelling,
- ContextMenuItemTagFontMenu, // Font sub-menu
- ContextMenuItemTagShowFonts,
- ContextMenuItemTagBold,
- ContextMenuItemTagItalic,
- ContextMenuItemTagUnderline,
- ContextMenuItemTagOutline,
- ContextMenuItemTagStyles,
- ContextMenuItemTagShowColors,
- ContextMenuItemTagSpeechMenu, // Speech sub-menu
- ContextMenuItemTagStartSpeaking,
- ContextMenuItemTagStopSpeaking,
- ContextMenuItemTagWritingDirectionMenu, // Writing Direction sub-menu
- ContextMenuItemTagDefaultDirection,
- ContextMenuItemTagLeftToRight,
- ContextMenuItemTagRightToLeft,
- ContextMenuItemTagPDFSinglePageScrolling,
- ContextMenuItemTagPDFFacingPagesScrolling,
- ContextMenuItemTagInspectElement,
- ContextMenuItemTagTextDirectionMenu, // Text Direction sub-menu
- ContextMenuItemTagTextDirectionDefault,
- ContextMenuItemTagTextDirectionLeftToRight,
- ContextMenuItemTagTextDirectionRightToLeft,
</del><ins>+ ContextMenuItemTagSpellingGuess,
+ ContextMenuItemTagNoGuessesFound,
+ ContextMenuItemTagIgnoreSpelling,
+ ContextMenuItemTagLearnSpelling,
+ ContextMenuItemTagOther,
+ ContextMenuItemTagSearchInSpotlight,
+ ContextMenuItemTagSearchWeb,
+ ContextMenuItemTagLookUpInDictionary,
+ ContextMenuItemTagOpenWithDefaultApplication,
+ ContextMenuItemPDFActualSize,
+ ContextMenuItemPDFZoomIn,
+ ContextMenuItemPDFZoomOut,
+ ContextMenuItemPDFAutoSize,
+ ContextMenuItemPDFSinglePage,
+ ContextMenuItemPDFFacingPages,
+ ContextMenuItemPDFContinuous,
+ ContextMenuItemPDFNextPage,
+ ContextMenuItemPDFPreviousPage,
+ // These are new tags! Not a part of API!!!!
+ ContextMenuItemTagOpenLink = 2000,
+ ContextMenuItemTagIgnoreGrammar,
+ ContextMenuItemTagSpellingMenu, // Spelling or Spelling/Grammar sub-menu
+ ContextMenuItemTagShowSpellingPanel,
+ ContextMenuItemTagCheckSpelling,
+ ContextMenuItemTagCheckSpellingWhileTyping,
+ ContextMenuItemTagCheckGrammarWithSpelling,
+ ContextMenuItemTagFontMenu, // Font sub-menu
+ ContextMenuItemTagShowFonts,
+ ContextMenuItemTagBold,
+ ContextMenuItemTagItalic,
+ ContextMenuItemTagUnderline,
+ ContextMenuItemTagOutline,
+ ContextMenuItemTagStyles,
+ ContextMenuItemTagShowColors,
+ ContextMenuItemTagSpeechMenu, // Speech sub-menu
+ ContextMenuItemTagStartSpeaking,
+ ContextMenuItemTagStopSpeaking,
+ ContextMenuItemTagWritingDirectionMenu, // Writing Direction sub-menu
+ ContextMenuItemTagDefaultDirection,
+ ContextMenuItemTagLeftToRight,
+ ContextMenuItemTagRightToLeft,
+ ContextMenuItemTagPDFSinglePageScrolling,
+ ContextMenuItemTagPDFFacingPagesScrolling,
+ ContextMenuItemTagInspectElement,
+ ContextMenuItemTagTextDirectionMenu, // Text Direction sub-menu
+ ContextMenuItemTagTextDirectionDefault,
+ ContextMenuItemTagTextDirectionLeftToRight,
+ ContextMenuItemTagTextDirectionRightToLeft,
</ins><span class="cx"> #if PLATFORM(COCOA)
</span><del>- ContextMenuItemTagCorrectSpellingAutomatically,
- ContextMenuItemTagSubstitutionsMenu,
- ContextMenuItemTagShowSubstitutions,
- ContextMenuItemTagSmartCopyPaste,
- ContextMenuItemTagSmartQuotes,
- ContextMenuItemTagSmartDashes,
- ContextMenuItemTagSmartLinks,
- ContextMenuItemTagTextReplacement,
- ContextMenuItemTagTransformationsMenu,
- ContextMenuItemTagMakeUpperCase,
- ContextMenuItemTagMakeLowerCase,
- ContextMenuItemTagCapitalize,
- ContextMenuItemTagChangeBack,
</del><ins>+ ContextMenuItemTagCorrectSpellingAutomatically,
+ ContextMenuItemTagSubstitutionsMenu,
+ ContextMenuItemTagShowSubstitutions,
+ ContextMenuItemTagSmartCopyPaste,
+ ContextMenuItemTagSmartQuotes,
+ ContextMenuItemTagSmartDashes,
+ ContextMenuItemTagSmartLinks,
+ ContextMenuItemTagTextReplacement,
+ ContextMenuItemTagTransformationsMenu,
+ ContextMenuItemTagMakeUpperCase,
+ ContextMenuItemTagMakeLowerCase,
+ ContextMenuItemTagCapitalize,
+ ContextMenuItemTagChangeBack,
</ins><span class="cx"> #endif
</span><del>- ContextMenuItemTagOpenMediaInNewWindow,
- ContextMenuItemTagDownloadMediaToDisk,
- ContextMenuItemTagCopyMediaLinkToClipboard,
- ContextMenuItemTagToggleMediaControls,
- ContextMenuItemTagToggleMediaLoop,
- ContextMenuItemTagEnterVideoFullscreen,
- ContextMenuItemTagMediaPlayPause,
- ContextMenuItemTagMediaMute,
- ContextMenuItemTagDictationAlternative,
- ContextMenuItemTagOpenLinkInThisWindow,
- ContextMenuItemTagToggleVideoFullscreen,
- ContextMenuItemTagShareMenu,
- ContextMenuItemBaseCustomTag = 5000,
- ContextMenuItemCustomTagNoAction = 5998,
- ContextMenuItemLastCustomTag = 5999,
- ContextMenuItemBaseApplicationTag = 10000
- };
</del><ins>+ ContextMenuItemTagOpenMediaInNewWindow,
+ ContextMenuItemTagDownloadMediaToDisk,
+ ContextMenuItemTagCopyMediaLinkToClipboard,
+ ContextMenuItemTagToggleMediaControls,
+ ContextMenuItemTagToggleMediaLoop,
+ ContextMenuItemTagEnterVideoFullscreen,
+ ContextMenuItemTagMediaPlayPause,
+ ContextMenuItemTagMediaMute,
+ ContextMenuItemTagDictationAlternative,
+ ContextMenuItemTagOpenLinkInThisWindow,
+ ContextMenuItemTagToggleVideoFullscreen,
+ ContextMenuItemTagShareMenu,
+ ContextMenuItemBaseCustomTag = 5000,
+ ContextMenuItemCustomTagNoAction = 5998,
+ ContextMenuItemLastCustomTag = 5999,
+ ContextMenuItemBaseApplicationTag = 10000
+};
</ins><span class="cx">
</span><del>- enum ContextMenuItemType {
- ActionType,
- CheckableActionType,
- SeparatorType,
- SubmenuType
- };
</del><ins>+enum ContextMenuItemType {
+ ActionType,
+ CheckableActionType,
+ SeparatorType,
+ SubmenuType
+};
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>- typedef NSMenuItem* PlatformMenuItemDescription;
</del><ins>+typedef NSMenuItem* PlatformMenuItemDescription;
</ins><span class="cx"> #else
</span><del>- typedef void* PlatformMenuItemDescription;
</del><ins>+typedef void* PlatformMenuItemDescription;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- class ContextMenuItem {
- WTF_MAKE_FAST_ALLOCATED;
- public:
- WEBCORE_EXPORT ContextMenuItem(ContextMenuItemType, ContextMenuAction, const String&, ContextMenu* subMenu = 0);
- WEBCORE_EXPORT ContextMenuItem(ContextMenuItemType, ContextMenuAction, const String&, bool enabled, bool checked);
</del><ins>+class ContextMenuItem {
+ WTF_MAKE_FAST_ALLOCATED;
+public:
+ WEBCORE_EXPORT ContextMenuItem(ContextMenuItemType, ContextMenuAction, const String&, ContextMenu* subMenu = 0);
+ WEBCORE_EXPORT ContextMenuItem(ContextMenuItemType, ContextMenuAction, const String&, bool enabled, bool checked);
</ins><span class="cx">
</span><del>- WEBCORE_EXPORT ~ContextMenuItem();
</del><ins>+ WEBCORE_EXPORT ~ContextMenuItem();
</ins><span class="cx">
</span><del>- void setType(ContextMenuItemType);
- WEBCORE_EXPORT ContextMenuItemType type() const;
</del><ins>+ void setType(ContextMenuItemType);
+ WEBCORE_EXPORT ContextMenuItemType type() const;
</ins><span class="cx">
</span><del>- void setAction(ContextMenuAction);
- WEBCORE_EXPORT ContextMenuAction action() const;
</del><ins>+ void setAction(ContextMenuAction);
+ WEBCORE_EXPORT ContextMenuAction action() const;
</ins><span class="cx">
</span><del>- void setChecked(bool = true);
- WEBCORE_EXPORT bool checked() const;
</del><ins>+ void setChecked(bool = true);
+ WEBCORE_EXPORT bool checked() const;
</ins><span class="cx">
</span><del>- void setEnabled(bool = true);
- WEBCORE_EXPORT bool enabled() const;
</del><ins>+ void setEnabled(bool = true);
+ WEBCORE_EXPORT bool enabled() const;
</ins><span class="cx">
</span><del>- void setSubMenu(ContextMenu*);
</del><ins>+ void setSubMenu(ContextMenu*);
</ins><span class="cx">
</span><span class="cx"> #if USE(CROSS_PLATFORM_CONTEXT_MENUS)
</span><del>- ContextMenuItem(ContextMenuAction, const String&, bool enabled, bool checked, const Vector<ContextMenuItem>& subMenuItems);
- explicit ContextMenuItem(const PlatformContextMenuItem&);
- ContextMenuItem();
</del><ins>+ ContextMenuItem(ContextMenuAction, const String&, bool enabled, bool checked, const Vector<ContextMenuItem>& subMenuItems);
+ explicit ContextMenuItem(const PlatformContextMenuItem&);
+ ContextMenuItem();
</ins><span class="cx">
</span><del>- bool isNull() const;
</del><ins>+ bool isNull() const;
</ins><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><ins>+ // 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;
</ins><span class="cx">
</span><del>- void setTitle(const String& title) { m_title = title; }
- const String& title() const { return m_title; }
</del><ins>+ void setTitle(const String& title) { m_title = title; }
+ const String& title() const { return m_title; }
</ins><span class="cx">
</span><del>- const Vector<ContextMenuItem>& subMenuItems() const { return m_subMenuItems; }
</del><ins>+ const Vector<ContextMenuItem>& subMenuItems() const { return m_subMenuItems; }
</ins><span class="cx"> #else
</span><del>- public:
- WEBCORE_EXPORT explicit ContextMenuItem(PlatformMenuItemDescription);
- explicit ContextMenuItem(ContextMenu* subMenu);
- ContextMenuItem(ContextMenuAction, const String&, bool enabled, bool checked, Vector<ContextMenuItem>& submenuItems);
- WEBCORE_EXPORT ContextMenuItem();
</del><ins>+public:
+ WEBCORE_EXPORT explicit ContextMenuItem(PlatformMenuItemDescription);
+ explicit ContextMenuItem(ContextMenu* subMenu);
+ ContextMenuItem(ContextMenuAction, const String&, bool enabled, bool checked, Vector<ContextMenuItem>& submenuItems);
+ WEBCORE_EXPORT ContextMenuItem();
</ins><span class="cx">
</span><del>- bool isNull() const { return !m_platformDescription; }
</del><ins>+ bool isNull() const { return !m_platformDescription; }
</ins><span class="cx">
</span><del>- WEBCORE_EXPORT PlatformMenuItemDescription platformDescription() const;
</del><ins>+ WEBCORE_EXPORT PlatformMenuItemDescription platformDescription() const;
</ins><span class="cx">
</span><del>- WEBCORE_EXPORT String title() const;
- void setTitle(const String&);
</del><ins>+ WEBCORE_EXPORT String title() const;
+ void setTitle(const String&);
</ins><span class="cx">
</span><del>- WEBCORE_EXPORT PlatformMenuDescription platformSubMenu() const;
- void setSubMenu(Vector<ContextMenuItem>&);
</del><ins>+ WEBCORE_EXPORT PlatformMenuDescription platformSubMenu() const;
+ void setSubMenu(Vector<ContextMenuItem>&);
</ins><span class="cx">
</span><span class="cx"> #endif // USE(CROSS_PLATFORM_CONTEXT_MENUS)
</span><del>- private:
</del><ins>+private:
</ins><span class="cx"> #if USE(CROSS_PLATFORM_CONTEXT_MENUS)
</span><del>- ContextMenuItemType m_type;
- ContextMenuAction m_action;
- String m_title;
- bool m_enabled;
- bool m_checked;
- Vector<ContextMenuItem> m_subMenuItems;
</del><ins>+ ContextMenuItemType m_type;
+ ContextMenuAction m_action;
+ String m_title;
+ bool m_enabled;
+ bool m_checked;
+ Vector<ContextMenuItem> m_subMenuItems;
</ins><span class="cx"> #else
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>- RetainPtr<NSMenuItem> m_platformDescription;
</del><ins>+ RetainPtr<NSMenuItem> m_platformDescription;
</ins><span class="cx"> #else
</span><del>- PlatformMenuItemDescription m_platformDescription;
</del><ins>+ PlatformMenuItemDescription m_platformDescription;
</ins><span class="cx"> #endif
</span><span class="cx"> #endif // USE(CROSS_PLATFORM_CONTEXT_MENUS)
</span><del>- };
</del><ins>+};
</ins><span class="cx">
</span><span class="cx"> #endif // ENABLE(CONTEXT_MENUS)
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>