Diff
Modified: branches/safari-536.26-branch/Source/WebCore/ChangeLog (124126 => 124127)
--- branches/safari-536.26-branch/Source/WebCore/ChangeLog 2012-07-31 00:46:23 UTC (rev 124126)
+++ branches/safari-536.26-branch/Source/WebCore/ChangeLog 2012-07-31 00:48:15 UTC (rev 124127)
@@ -1,5 +1,22 @@
2012-07-30 Lucas Forschler <lforsch...@apple.com>
+ Merge 121646
+
+ 2012-07-01 Timothy Hatcher <timo...@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-30 Lucas Forschler <lforsch...@apple.com>
+
Merge 121645
2012-07-01 Dan Bernstein <m...@apple.com>
Modified: branches/safari-536.26-branch/Source/WebCore/platform/ContextMenuItem.h (124126 => 124127)
--- branches/safari-536.26-branch/Source/WebCore/platform/ContextMenuItem.h 2012-07-31 00:46:23 UTC (rev 124126)
+++ branches/safari-536.26-branch/Source/WebCore/platform/ContextMenuItem.h 2012-07-31 00:48:15 UTC (rev 124127)
@@ -134,7 +134,6 @@
ContextMenuItemTagRightToLeft,
ContextMenuItemTagPDFSinglePageScrolling,
ContextMenuItemTagPDFFacingPagesScrolling,
- ContextMenuItemTagDictationAlternative,
#if ENABLE(INSPECTOR)
ContextMenuItemTagInspectElement,
#endif
@@ -164,6 +163,7 @@
ContextMenuItemTagEnterVideoFullscreen,
ContextMenuItemTagMediaPlayPause,
ContextMenuItemTagMediaMute,
+ ContextMenuItemTagDictationAlternative,
ContextMenuItemBaseCustomTag = 5000,
ContextMenuItemCustomTagNoAction = 5998,
ContextMenuItemLastCustomTag = 5999,
Modified: branches/safari-536.26-branch/Source/WebKit/mac/ChangeLog (124126 => 124127)
--- branches/safari-536.26-branch/Source/WebKit/mac/ChangeLog 2012-07-31 00:46:23 UTC (rev 124126)
+++ branches/safari-536.26-branch/Source/WebKit/mac/ChangeLog 2012-07-31 00:48:15 UTC (rev 124127)
@@ -1,3 +1,19 @@
+2012-07-30 Lucas Forschler <lforsch...@apple.com>
+
+ Merge 121646
+
+ 2012-07-01 Timothy Hatcher <timo...@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-12 Lucas Forschler <lforsch...@apple.com>
Merge 120357
Modified: branches/safari-536.26-branch/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h (124126 => 124127)
--- branches/safari-536.26-branch/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h 2012-07-31 00:46:23 UTC (rev 124126)
+++ branches/safari-536.26-branch/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h 2012-07-31 00:48:15 UTC (rev 124127)
@@ -89,6 +89,17 @@
WebMenuItemTagMakeLowerCase,
WebMenuItemTagCapitalize,
WebMenuItemTagChangeBack,
+ WebMenuItemTagOpenMediaInNewWindow,
+ WebMenuItemTagCopyMediaLinkToClipboard,
+ WebMenuItemTagToggleMediaControls,
+ WebMenuItemTagToggleMediaLoop,
+ WebMenuItemTagEnterVideoFullscreen,
+ WebMenuItemTagMediaPlayPause,
+ WebMenuItemTagMediaMute,
+ WebMenuItemTagDictationAlternative,
+ WebMenuItemBaseCustomTag = 5000,
+ WebMenuItemCustomTagNoAction = 5998,
+ WebMenuItemLastCustomTag = 5999,
WebMenuItemTagBaseApplication = 10000
};
