Make the "Inspect Element" context menu item appear in nightly builds again.

rdar://problem/11702613
https://webkit.org/b/89323

Reviewed by Dan Bernstein.

Source/WebCore:

* platform/ContextMenuItem.h:
Fix the order of the ContextMenuAction enum to be binary compatible with
older versions of WebKit.

Source/WebKit/mac:

* WebView/WebUIDelegatePrivate.h:
Add missing enums that were added in ContextMenuItem.h but left out here.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@121646 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 439d05a..91c0d22 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2012-07-01  Timothy Hatcher  <timothy@apple.com>
+
+        Make the "Inspect Element" context menu item appear in nightly builds again.
+
+        rdar://problem/11702613
+        https://webkit.org/b/89323
+
+        Reviewed by Dan Bernstein.
+
+        * platform/ContextMenuItem.h:
+        Fix the order of the ContextMenuAction enum to be binary compatible with
+        older versions of WebKit.
+
 2012-07-01  Dan Bernstein  <mitz@apple.com>
 
         <rdar://problem/11785743> [mac] Non-BMP characters in vertical text appear as missing glyphs

diff --git a/Source/WebCore/platform/ContextMenuItem.h b/Source/WebCore/platform/ContextMenuItem.h
index 6973798..9d36744 100644 (file)
--- a/Source/WebCore/platform/ContextMenuItem.h
+++ b/Source/WebCore/platform/ContextMenuItem.h
@@ -134,7 +134,6 @@ namespace WebCore {
         ContextMenuItemTagRightToLeft,
         ContextMenuItemTagPDFSinglePageScrolling,
         ContextMenuItemTagPDFFacingPagesScrolling,
-        ContextMenuItemTagDictationAlternative,
 #if ENABLE(INSPECTOR)
         ContextMenuItemTagInspectElement,
 #endif
@@ -164,6 +163,7 @@ namespace WebCore {
         ContextMenuItemTagEnterVideoFullscreen,
         ContextMenuItemTagMediaPlayPause,
         ContextMenuItemTagMediaMute,
+        ContextMenuItemTagDictationAlternative,
         ContextMenuItemBaseCustomTag = 5000,
         ContextMenuItemCustomTagNoAction = 5998,
         ContextMenuItemLastCustomTag = 5999,

diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog
index e226eec..2a1c4b4 100644 (file)
--- a/Source/WebKit/mac/ChangeLog
+++ b/Source/WebKit/mac/ChangeLog
@@ -1,3 +1,15 @@
+2012-07-01  Timothy Hatcher  <timothy@apple.com>
+
+        Make the "Inspect Element" context menu item appear in nightly builds again.
+
+        rdar://problem/11702613
+        https://webkit.org/b/89323
+
+        Reviewed by Dan Bernstein.
+
+        * WebView/WebUIDelegatePrivate.h:
+        Add missing enums that were added in ContextMenuItem.h but left out here.
+
 2012-06-29  Sheriff Bot  <webkit.review.bot@gmail.com>
 
         Unreviewed, rolling out r121529.

diff --git a/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h b/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h
index 9913231..bb534a2 100644 (file)
--- a/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h
+++ b/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h
@@ -89,6 +89,17 @@ enum {
     WebMenuItemTagMakeLowerCase,
     WebMenuItemTagCapitalize,
     WebMenuItemTagChangeBack,
+    WebMenuItemTagOpenMediaInNewWindow,
+    WebMenuItemTagCopyMediaLinkToClipboard,
+    WebMenuItemTagToggleMediaControls,
+    WebMenuItemTagToggleMediaLoop,
+    WebMenuItemTagEnterVideoFullscreen,
+    WebMenuItemTagMediaPlayPause,
+    WebMenuItemTagMediaMute,
+    WebMenuItemTagDictationAlternative,
+    WebMenuItemBaseCustomTag = 5000,
+    WebMenuItemCustomTagNoAction = 5998,
+    WebMenuItemLastCustomTag = 5999,
     WebMenuItemTagBaseApplication = 10000
 };