<!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>[192454] trunk/Source</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/192454">192454</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-11-13 20:03:14 -0800 (Fri, 13 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/192445">r192445</a>, <a href="http://trac.webkit.org/projects/webkit/changeset/192451">r192451</a>, and <a href="http://trac.webkit.org/projects/webkit/changeset/192452">r192452</a>.
https://bugs.webkit.org/show_bug.cgi?id=151291
Broke Mavericks build (and thus EWS) (Requested by ap on
#webkit).
Reverted changesets:
"Add identifier strings for a bunch of context menu items"
https://bugs.webkit.org/show_bug.cgi?id=151272
http://trac.webkit.org/changeset/192445
"Try to fix the 32-bit build"
http://trac.webkit.org/changeset/192451
"Try to fix the 32-bit build"
http://trac.webkit.org/changeset/192452</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformspimacNSMenuSPIh">trunk/Source/WebCore/platform/spi/mac/NSMenuSPI.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebContextMenuProxyMacmm">trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKMenuItemIdentifiersmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKMenuItemIdentifiers.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKMenuItemIdentifiersPrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKMenuItemIdentifiersPrivate.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (192453 => 192454)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-11-14 01:18:58 UTC (rev 192453)
+++ trunk/Source/WebCore/ChangeLog 2015-11-14 04:03:14 UTC (rev 192454)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-11-13 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r192445, r192451, and r192452.
+ https://bugs.webkit.org/show_bug.cgi?id=151291
+
+ Broke Mavericks build (and thus EWS) (Requested by ap on
+ #webkit).
+
+ Reverted changesets:
+
+ "Add identifier strings for a bunch of context menu items"
+ https://bugs.webkit.org/show_bug.cgi?id=151272
+ http://trac.webkit.org/changeset/192445
+
+ "Try to fix the 32-bit build"
+ http://trac.webkit.org/changeset/192451
+
+ "Try to fix the 32-bit build"
+ http://trac.webkit.org/changeset/192452
+
</ins><span class="cx"> 2015-11-13 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Add identifier strings for a bunch of context menu items
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspimacNSMenuSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/mac/NSMenuSPI.h (192453 => 192454)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/mac/NSMenuSPI.h 2015-11-14 01:18:58 UTC (rev 192453)
+++ trunk/Source/WebCore/platform/spi/mac/NSMenuSPI.h 2015-11-14 04:03:14 UTC (rev 192454)
</span><span class="lines">@@ -45,7 +45,4 @@
</span><span class="cx"> + (NSMenuItem *)standardShareMenuItemWithItems:(NSArray *)items;
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-@interface NSMenuItem () <NSUserInterfaceItemIdentification>
-@end
-
</del><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (192453 => 192454)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-11-14 01:18:58 UTC (rev 192453)
+++ trunk/Source/WebKit2/ChangeLog 2015-11-14 04:03:14 UTC (rev 192454)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-11-13 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r192445, r192451, and r192452.
+ https://bugs.webkit.org/show_bug.cgi?id=151291
+
+ Broke Mavericks build (and thus EWS) (Requested by ap on
+ #webkit).
+
+ Reverted changesets:
+
+ "Add identifier strings for a bunch of context menu items"
+ https://bugs.webkit.org/show_bug.cgi?id=151272
+ http://trac.webkit.org/changeset/192445
+
+ "Try to fix the 32-bit build"
+ http://trac.webkit.org/changeset/192451
+
+ "Try to fix the 32-bit build"
+ http://trac.webkit.org/changeset/192452
+
</ins><span class="cx"> 2015-11-13 Timothy Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Try to fix the 32-bit build
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKMenuItemIdentifiersmm"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKMenuItemIdentifiers.mm (192453 => 192454)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKMenuItemIdentifiers.mm 2015-11-14 01:18:58 UTC (rev 192453)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKMenuItemIdentifiers.mm 2015-11-14 04:03:14 UTC (rev 192454)
</span><span class="lines">@@ -1,53 +0,0 @@
</span><del>-/*
- * Copyright (C) 2015 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. AND ITS CONTRIBUTORS ``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 ITS 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 "config.h"
-#include "WKMenuItemIdentifiersPrivate.h"
-
-#if WK_API_ENABLED
-
-NSString * const _WKMenuItemIdentifierCopy = @"WKMenuItemIdentifierCopy";
-NSString * const _WKMenuItemIdentifierCopyImage = @"WKMenuItemIdentifierCopyImage";
-NSString * const _WKMenuItemIdentifierCopyLink = @"WKMenuItemIdentifierCopyLink";
-NSString * const _WKMenuItemIdentifierDownloadImage = @"WKMenuItemIdentifierDownloadImage";
-NSString * const _WKMenuItemIdentifierDownloadLinkedFile = @"WKMenuItemIdentifierDownloadLinkedFile";
-NSString * const _WKMenuItemIdentifierGoBack = @"WKMenuItemIdentifierGoBack";
-NSString * const _WKMenuItemIdentifierGoForward = @"WKMenuItemIdentifierGoForward";
-NSString * const _WKMenuItemIdentifierInspectElement = @"WKMenuItemIdentifierInspectElement";
-NSString * const _WKMenuItemIdentifierLookUp = @"WKMenuItemIdentifierLookUp";
-NSString * const _WKMenuItemIdentifierOpenFrameInNewWindow = @"WKMenuItemIdentifierOpenFrameInNewWindow";
-NSString * const _WKMenuItemIdentifierOpenImageInNewWindow = @"WKMenuItemIdentifierOpenImageInNewWindow";
-NSString * const _WKMenuItemIdentifierOpenLink = @"WKMenuItemIdentifierOpenLink";
-NSString * const _WKMenuItemIdentifierOpenLinkInNewWindow = @"WKMenuItemIdentifierOpenLinkInNewWindow";
-NSString * const _WKMenuItemIdentifierPaste = @"WKMenuItemIdentifierPaste";
-NSString * const _WKMenuItemIdentifierReload = @"WKMenuItemIdentifierReload";
-NSString * const _WKMenuItemIdentifierSearchWeb = @"WKMenuItemIdentifierSearchWeb";
-NSString * const _WKMenuItemIdentifierToggleMediaControls = @"WKMenuItemIdentifierToggleMediaControls";
-NSString * const _WKMenuItemIdentifierToggleFullScreen = @"WKMenuItemIdentifierToggleFullScreen";
-
-NSString * const _WKMenuItemIdentifierShareMenu = @"WKMenuItemIdentifierShareMenu";
-NSString * const _WKMenuItemIdentifierSpeechMenu = @"WKMenuItemIdentifierSpeechMenu";
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKMenuItemIdentifiersPrivateh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKMenuItemIdentifiersPrivate.h (192453 => 192454)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKMenuItemIdentifiersPrivate.h 2015-11-14 01:18:58 UTC (rev 192453)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKMenuItemIdentifiersPrivate.h 2015-11-14 04:03:14 UTC (rev 192454)
</span><span class="lines">@@ -1,54 +0,0 @@
</span><del>-/*
- * Copyright (C) 2015 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. AND ITS CONTRIBUTORS ``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 ITS 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.
- */
-
-#import <WebKit/WKFoundation.h>
-
-#if WK_API_ENABLED
-
-#import <WebKit/WKDeclarationSpecifiers.h>
-
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierCopy WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierCopyImage WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierCopyLink WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierDownloadImage WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierDownloadLinkedFile WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierGoBack WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierGoForward WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierInspectElement WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierLookUp WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierOpenFrameInNewWindow WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierOpenImageInNewWindow WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierOpenLink WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierOpenLinkInNewWindow WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierPaste WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierReload WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierSearchWeb WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierToggleMediaControls WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierToggleFullScreen WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
-
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierShareMenu WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierSpeechMenu WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebContextMenuProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm (192453 => 192454)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2015-11-14 01:18:58 UTC (rev 192453)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2015-11-14 04:03:14 UTC (rev 192454)
</span><span class="lines">@@ -35,7 +35,6 @@
</span><span class="cx"> #import "ServicesController.h"
</span><span class="cx"> #import "ShareableBitmap.h"
</span><span class="cx"> #import "StringUtilities.h"
</span><del>-#import "WKMenuItemIdentifiersPrivate.h"
</del><span class="cx"> #import "WKSharingServicePickerDelegate.h"
</span><span class="cx"> #import "WebContextMenuItem.h"
</span><span class="cx"> #import "WebContextMenuItemData.h"
</span><span class="lines">@@ -258,76 +257,6 @@
</span><span class="cx"> m_menu = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static NSString *menuItemIdentifier(const ContextMenuAction action)
-{
- switch (action) {
-#if WK_API_ENABLED
- case ContextMenuItemTagCopy:
- return _WKMenuItemIdentifierCopy;
-
- case ContextMenuItemTagCopyImageToClipboard:
- return _WKMenuItemIdentifierCopyImage;
-
- case ContextMenuItemTagCopyLinkToClipboard:
- return _WKMenuItemIdentifierCopyLink;
-
- case ContextMenuItemTagDownloadImageToDisk:
- return _WKMenuItemIdentifierDownloadImage;
-
- case ContextMenuItemTagDownloadLinkToDisk:
- return _WKMenuItemIdentifierDownloadLinkedFile;
-
- case ContextMenuItemTagGoBack:
- return _WKMenuItemIdentifierGoBack;
-
- case ContextMenuItemTagGoForward:
- return _WKMenuItemIdentifierGoForward;
-
- case ContextMenuItemTagInspectElement:
- return _WKMenuItemIdentifierInspectElement;
-
- case ContextMenuItemTagLookUpInDictionary:
- return _WKMenuItemIdentifierLookUp;
-
- case ContextMenuItemTagOpenFrameInNewWindow:
- return _WKMenuItemIdentifierOpenFrameInNewWindow;
-
- case ContextMenuItemTagOpenImageInNewWindow:
- return _WKMenuItemIdentifierOpenImageInNewWindow;
-
- case ContextMenuItemTagOpenLink:
- return _WKMenuItemIdentifierOpenLink;
-
- case ContextMenuItemTagOpenLinkInNewWindow:
- return _WKMenuItemIdentifierOpenLinkInNewWindow;
-
- case ContextMenuItemTagPaste:
- return _WKMenuItemIdentifierPaste;
-
- case ContextMenuItemTagReload:
- return _WKMenuItemIdentifierReload;
-
- case ContextMenuItemTagSearchWeb:
- return _WKMenuItemIdentifierSearchWeb;
-
- case ContextMenuItemTagToggleMediaControls:
- return _WKMenuItemIdentifierToggleMediaControls;
-
- case ContextMenuItemTagToggleVideoFullscreen:
- return _WKMenuItemIdentifierToggleFullScreen;
-
- case ContextMenuItemTagShareMenu:
- return _WKMenuItemIdentifierShareMenu;
-
- case ContextMenuItemTagSpeechMenu:
- return _WKMenuItemIdentifierSpeechMenu;
-#endif // WK_API_ENABLED
-
- default:
- return nil;
- }
-}
-
</del><span class="cx"> RetainPtr<NSMenuItem> WebContextMenuProxyMac::createShareMenuItem()
</span><span class="cx"> {
</span><span class="cx"> if (![[NSMenuItem class] respondsToSelector:@selector(standardShareMenuItemWithItems:)])
</span><span class="lines">@@ -369,10 +298,6 @@
</span><span class="cx"> // Setting the picker lets the delegate retain it to keep it alive, but this picker is kept alive by the menu item.
</span><span class="cx"> [[WKSharingServicePickerDelegate sharedSharingServicePickerDelegate] setPicker:nil];
</span><span class="cx">
</span><del>-#if WK_API_ENABLED
- [item setIdentifier:_WKMenuItemIdentifierShareMenu];
-#endif
-
</del><span class="cx"> return item;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="lines">@@ -420,7 +345,6 @@
</span><span class="cx"> [menuItem setEnabled:item.enabled()];
</span><span class="cx"> [menuItem setState:item.checked() ? NSOnState : NSOffState];
</span><span class="cx"> [menuItem setTarget:[WKMenuTarget sharedMenuTarget]];
</span><del>- [menuItem setIdentifier:menuItemIdentifier(item.action())];
</del><span class="cx">
</span><span class="cx"> if (item.userData()) {
</span><span class="cx"> auto wrapper = adoptNS([[WKUserDataWrapper alloc] initWithUserData:item.userData()]);
</span><span class="lines">@@ -437,7 +361,6 @@
</span><span class="cx"> auto menuItem = adoptNS([[NSMenuItem alloc] initWithTitle:item.title() action:nullptr keyEquivalent:@""]);
</span><span class="cx"> [menuItem setEnabled:item.enabled()];
</span><span class="cx"> [menuItem setSubmenu:createContextMenuFromItems(item.submenu()).get()];
</span><del>- [menuItem setIdentifier:menuItemIdentifier(item.action())];
</del><span class="cx">
</span><span class="cx"> return menuItem;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (192453 => 192454)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-11-14 01:18:58 UTC (rev 192453)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-11-14 04:03:14 UTC (rev 192454)
</span><span class="lines">@@ -398,8 +398,6 @@
</span><span class="cx"> 1AB16AEA164B3A8800290D62 /* RemoteLayerTreeContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB16AE8164B3A8800290D62 /* RemoteLayerTreeContext.h */; };
</span><span class="cx"> 1AB31A9616BC688100F6DBC9 /* StorageManagerMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AB31A9416BC688100F6DBC9 /* StorageManagerMessageReceiver.cpp */; };
</span><span class="cx"> 1AB31A9716BC688100F6DBC9 /* StorageManagerMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB31A9516BC688100F6DBC9 /* StorageManagerMessages.h */; };
</span><del>- 1AB40EE51BF677E300BA81BE /* WKMenuItemIdentifiers.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AB40EE31BF677E300BA81BE /* WKMenuItemIdentifiers.mm */; };
- 1AB40EE61BF677E300BA81BE /* WKMenuItemIdentifiersPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB40EE41BF677E300BA81BE /* WKMenuItemIdentifiersPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> 1AB474D8184D43FD0051B622 /* WKBundlePageLoaderClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB474D7184D43FD0051B622 /* WKBundlePageLoaderClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 1AB474DA184D44250051B622 /* WKBundlePageResourceLoadClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB474D9184D44250051B622 /* WKBundlePageResourceLoadClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 1AB474DE184D44590051B622 /* WKBundlePageUIClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB474DD184D44590051B622 /* WKBundlePageUIClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -2564,8 +2562,6 @@
</span><span class="cx"> 1AB31A9316BC65AB00F6DBC9 /* StorageManager.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = StorageManager.messages.in; sourceTree = "<group>"; };
</span><span class="cx"> 1AB31A9416BC688100F6DBC9 /* StorageManagerMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageManagerMessageReceiver.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1AB31A9516BC688100F6DBC9 /* StorageManagerMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageManagerMessages.h; sourceTree = "<group>"; };
</span><del>- 1AB40EE31BF677E300BA81BE /* WKMenuItemIdentifiers.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKMenuItemIdentifiers.mm; sourceTree = "<group>"; };
- 1AB40EE41BF677E300BA81BE /* WKMenuItemIdentifiersPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKMenuItemIdentifiersPrivate.h; sourceTree = "<group>"; };
</del><span class="cx"> 1AB474D7184D43FD0051B622 /* WKBundlePageLoaderClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBundlePageLoaderClient.h; sourceTree = "<group>"; };
</span><span class="cx"> 1AB474D9184D44250051B622 /* WKBundlePageResourceLoadClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBundlePageResourceLoadClient.h; sourceTree = "<group>"; };
</span><span class="cx"> 1AB474DD184D44590051B622 /* WKBundlePageUIClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBundlePageUIClient.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -5446,8 +5442,6 @@
</span><span class="cx"> 2DF9EEE71A78245500B6CFBE /* WKFrameInfoInternal.h */,
</span><span class="cx"> 1A6FA21D1BD0435B00AAA650 /* WKFrameInfoPrivate.h */,
</span><span class="cx"> 1A422F8A18B29B5400D8CD96 /* WKHistoryDelegatePrivate.h */,
</span><del>- 1AB40EE31BF677E300BA81BE /* WKMenuItemIdentifiers.mm */,
- 1AB40EE41BF677E300BA81BE /* WKMenuItemIdentifiersPrivate.h */,
</del><span class="cx"> 1A5B1C4F1898606F004FCF9B /* WKNavigation.h */,
</span><span class="cx"> 1A5B1C4E1898606F004FCF9B /* WKNavigation.mm */,
</span><span class="cx"> 1A256E3618A1A788006FB922 /* WKNavigationAction.h */,
</span><span class="lines">@@ -8117,7 +8111,6 @@
</span><span class="cx"> 9391F2CB121B67AD00EBF7E8 /* WebFrameNetworkingContext.h in Headers */,
</span><span class="cx"> BCB9F6A01123A84B00A137E0 /* WebFramePolicyListenerProxy.h in Headers */,
</span><span class="cx"> BC9B38A110F538BE00443A15 /* WebFrameProxy.h in Headers */,
</span><del>- 1AB40EE61BF677E300BA81BE /* WKMenuItemIdentifiersPrivate.h in Headers */,
</del><span class="cx"> BC1BE1E012D54A410004A228 /* WebGeolocationClient.h in Headers */,
</span><span class="cx"> BC0E5FE512D697160012A72A /* WebGeolocationManager.h in Headers */,
</span><span class="cx"> BC0E606212D6BA910012A72A /* WebGeolocationManagerMessages.h in Headers */,
</span><span class="lines">@@ -9536,7 +9529,6 @@
</span><span class="cx"> 1AAB037C185F99D800EDF501 /* APIData.cpp in Sources */,
</span><span class="cx"> 1A1EF1991A1D5B420023200A /* APIDataCocoa.mm in Sources */,
</span><span class="cx"> 7C1BA33D1A4A0E600043E249 /* APIDictionary.cpp in Sources */,
</span><del>- 1AB40EE51BF677E300BA81BE /* WKMenuItemIdentifiers.mm in Sources */,
</del><span class="cx"> BC575613126E0138006F0F12 /* APIError.cpp in Sources */,
</span><span class="cx"> 1AC1337118566C7C00F3EC05 /* APIFrameHandle.cpp in Sources */,
</span><span class="cx"> 2DF9EEE51A781FB400B6CFBE /* APIFrameInfo.cpp in Sources */,
</span></span></pre>
</div>
</div>
</body>
</html>