Diff
Modified: trunk/Source/WebCore/ChangeLog (182300 => 182301)
--- trunk/Source/WebCore/ChangeLog 2015-04-03 00:43:29 UTC (rev 182300)
+++ trunk/Source/WebCore/ChangeLog 2015-04-03 00:53:15 UTC (rev 182301)
@@ -1,3 +1,17 @@
+2015-04-02 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r182293.
+ https://bugs.webkit.org/show_bug.cgi?id=143355
+
+ Broke GTK and EFL builds. (Requested by bfulgham on #webkit).
+
+ Reverted changeset:
+
+ "Expose the "Share" menu for text selections on platforms
+ where it's available."
+ https://bugs.webkit.org/show_bug.cgi?id=143318
+ http://trac.webkit.org/changeset/182293
+
2015-04-02 Brent Fulgham <bfulg...@apple.com>
REGRESSION: Caption Menus show language codes instead of display names.
Modified: trunk/Source/WebCore/page/ContextMenuClient.h (182300 => 182301)
--- trunk/Source/WebCore/page/ContextMenuClient.h 2015-04-03 00:43:29 UTC (rev 182300)
+++ trunk/Source/WebCore/page/ContextMenuClient.h 2015-04-03 00:53:15 UTC (rev 182301)
@@ -60,7 +60,6 @@
#if PLATFORM(COCOA)
virtual void searchWithSpotlight() = 0;
- virtual ContextMenuItem shareSelectedTextMenuItem(const String& selectedText) { return ContextMenuItem::shareSelectedTextMenuItem(selectedText); }
#endif
#if USE(ACCESSIBILITY_CONTEXT_MENUS)
Modified: trunk/Source/WebCore/page/ContextMenuContext.h (182300 => 182301)
--- trunk/Source/WebCore/page/ContextMenuContext.h 2015-04-03 00:43:29 UTC (rev 182300)
+++ trunk/Source/WebCore/page/ContextMenuContext.h 2015-04-03 00:53:15 UTC (rev 182301)
@@ -41,9 +41,6 @@
const HitTestResult& hitTestResult() const { return m_hitTestResult; }
- void setSelectedText(const String& selectedText) { m_selectedText = selectedText; }
- const String& selectedText() const { return m_selectedText; }
-
#if ENABLE(SERVICE_CONTROLS)
void setControlledImage(Image* controlledImage) { m_controlledImage = controlledImage; }
Image* controlledImage() const { return m_controlledImage.get(); }
@@ -52,7 +49,6 @@
private:
HitTestResult m_hitTestResult;
- String m_selectedText;
#if ENABLE(SERVICE_CONTROLS)
RefPtr<Image> m_controlledImage;
Modified: trunk/Source/WebCore/page/ContextMenuController.cpp (182300 => 182301)
--- trunk/Source/WebCore/page/ContextMenuController.cpp 2015-04-03 00:43:29 UTC (rev 182300)
+++ trunk/Source/WebCore/page/ContextMenuController.cpp 2015-04-03 00:53:15 UTC (rev 182301)
@@ -892,10 +892,9 @@
if (imageURL.isEmpty() && linkURL.isEmpty() && mediaURL.isEmpty()) {
if (m_context.hitTestResult().isSelected()) {
- String selectedString;
if (selectionContainsPossibleWord(frame)) {
#if PLATFORM(COCOA)
- selectedString = frame->displayStringModifiedByEncoding(frame->editor().selectedText());
+ String selectedString = frame->displayStringModifiedByEncoding(frame->editor().selectedText());
ContextMenuItem LookUpInDictionaryItem(ActionType, ContextMenuItemTagLookUpInDictionary, contextMenuItemTagLookUpInDictionary(selectedString));
appendItem(LookUpInDictionaryItem, m_contextMenu.get());
@@ -911,14 +910,6 @@
#if PLATFORM(COCOA)
appendItem(*separatorItem(), m_contextMenu.get());
- if (!selectedString.isEmpty() && ContextMenuItem::supportsShareMenu()) {
- ContextMenuItem ShareItem(m_client.shareSelectedTextMenuItem(selectedString));
- appendItem(ShareItem, m_contextMenu.get());
- appendItem(*separatorItem(), m_contextMenu.get());
-
- m_context.setSelectedText(selectedString);
- }
-
ContextMenuItem SpeechMenuItem(SubmenuType, ContextMenuItemTagSpeechMenu, contextMenuItemTagSpeechMenu());
createAndAppendSpeechSubMenu(SpeechMenuItem);
appendItem(SpeechMenuItem, m_contextMenu.get());
@@ -1409,7 +1400,6 @@
case ContextMenuItemLastCustomTag:
case ContextMenuItemBaseApplicationTag:
case ContextMenuItemTagDictationAlternative:
- case ContextMenuItemTagShareMenu:
break;
case ContextMenuItemTagMediaPlayPause:
if (m_context.hitTestResult().mediaPlaying())
Modified: trunk/Source/WebCore/platform/ContextMenuItem.cpp (182300 => 182301)
--- trunk/Source/WebCore/platform/ContextMenuItem.cpp 2015-04-03 00:43:29 UTC (rev 182300)
+++ trunk/Source/WebCore/platform/ContextMenuItem.cpp 2015-04-03 00:53:15 UTC (rev 182301)
@@ -117,16 +117,6 @@
return m_enabled;
}
-bool ContextMenuItem::supportsShareMenu()
-{
- return false;
-}
-
-ContextMenuItem ContextMenuItem::shareSelectedTextMenuItem(const String&)
-{
- return ContextMenuItem(SubmenuType, ContextMenuItemTagShareMenu, emptyString());
-}
-
} // namespace WebCore
#endif // ENABLE(CONTEXT_MENUS) && USE(CROSS_PLATFORM_CONTEXT_MENUS)
Modified: trunk/Source/WebCore/platform/ContextMenuItem.h (182300 => 182301)
--- trunk/Source/WebCore/platform/ContextMenuItem.h 2015-04-03 00:43:29 UTC (rev 182300)
+++ trunk/Source/WebCore/platform/ContextMenuItem.h 2015-04-03 00:53:15 UTC (rev 182301)
@@ -161,7 +161,6 @@
ContextMenuItemTagDictationAlternative,
ContextMenuItemTagOpenLinkInThisWindow,
ContextMenuItemTagToggleVideoFullscreen,
- ContextMenuItemTagShareMenu,
ContextMenuItemBaseCustomTag = 5000,
ContextMenuItemCustomTagNoAction = 5998,
ContextMenuItemLastCustomTag = 5999,
@@ -206,9 +205,6 @@
void setSubMenu(ContextMenu*);
- static bool supportsShareMenu();
- WEBCORE_EXPORT static ContextMenuItem shareSelectedTextMenuItem(const String&);
-
#if PLATFORM(GTK)
GtkAction* gtkAction() const;
#endif
@@ -232,7 +228,6 @@
ContextMenuItem(ContextMenuAction, const String&, bool enabled, bool checked, Vector<ContextMenuItem>& submenuItems);
WEBCORE_EXPORT PlatformMenuItemDescription releasePlatformDescription();
- WEBCORE_EXPORT PlatformMenuItemDescription getPlatformDescription() const;
WEBCORE_EXPORT String title() const;
void setTitle(const String&);
Modified: trunk/Source/WebCore/platform/gtk/ContextMenuItemGtk.cpp (182300 => 182301)
--- trunk/Source/WebCore/platform/gtk/ContextMenuItemGtk.cpp 2015-04-03 00:43:29 UTC (rev 182300)
+++ trunk/Source/WebCore/platform/gtk/ContextMenuItemGtk.cpp 2015-04-03 00:53:15 UTC (rev 182301)
@@ -283,16 +283,6 @@
return gtk_activatable_get_related_action(GTK_ACTIVATABLE(m_platformDescription));
}
-bool ContextMenuItem::supportsShareMenu()
-{
- return false;
}
-ContextMenuItem ContextMenuItem::shareSelectedTextMenuItem(const String&)
-{
- return ContextMenuItem(SubmenuType, ContextMenuItemTagShareMenu, emptyString());
-}
-
-}
-
#endif // ENABLE(CONTEXT_MENUS)
Modified: trunk/Source/WebCore/platform/mac/ContextMenuItemMac.mm (182300 => 182301)
--- trunk/Source/WebCore/platform/mac/ContextMenuItemMac.mm 2015-04-03 00:43:29 UTC (rev 182300)
+++ trunk/Source/WebCore/platform/mac/ContextMenuItemMac.mm 2015-04-03 00:53:15 UTC (rev 182301)
@@ -29,7 +29,6 @@
#if ENABLE(CONTEXT_MENUS)
#include "ContextMenu.h"
-#include "NSMenuSPI.h"
namespace WebCore {
@@ -96,18 +95,13 @@
{
}
-NSMenuItem *ContextMenuItem::releasePlatformDescription()
+NSMenuItem* ContextMenuItem::releasePlatformDescription()
{
- NSMenuItem *item = [m_platformDescription.get() retain];
+ NSMenuItem* item = [m_platformDescription.get() retain];
m_platformDescription = 0;
return item;
}
-NSMenuItem *ContextMenuItem::getPlatformDescription() const
-{
- return m_platformDescription.get();
-}
-
ContextMenuItemType ContextMenuItem::type() const
{
if ([m_platformDescription.get() isSeparatorItem])
@@ -193,19 +187,6 @@
return [m_platformDescription.get() state] == NSOnState;
}
-bool ContextMenuItem::supportsShareMenu()
-{
- static bool supportsShareMenu = [[NSMenuItem class] respondsToSelector:@selector(standardShareMenuItemWithItems:)];
- return supportsShareMenu;
-}
-
-ContextMenuItem ContextMenuItem::shareSelectedTextMenuItem(const String& selectedText)
-{
- ContextMenuItem item([NSMenuItem standardShareMenuItemWithItems:@[ (NSString *)selectedText ]]);
- item.setAction(ContextMenuItemTagShareMenu);
- return item;
-}
-
} // namespace WebCore
#endif // ENABLE(CONTEXT_MENUS)
Modified: trunk/Source/WebCore/platform/spi/mac/NSMenuSPI.h (182300 => 182301)
--- trunk/Source/WebCore/platform/spi/mac/NSMenuSPI.h 2015-04-03 00:43:29 UTC (rev 182300)
+++ trunk/Source/WebCore/platform/spi/mac/NSMenuSPI.h 2015-04-03 00:53:15 UTC (rev 182301)
@@ -23,6 +23,8 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
+#import "QuickLookMacSPI.h"
+
// FIXME: We should just include the appropriate internal headers.
typedef NS_ENUM(NSInteger, NSMenuType) {
@@ -35,8 +37,6 @@
+ (NSMenuType)menuTypeForEvent:(NSEvent *)event;
@end
-@class QLPreviewMenuItem;
-
@interface NSMenuItem (Private)
+ (QLPreviewMenuItem *)standardQuickLookMenuItem;
+ (NSMenuItem *)standardShareMenuItemWithItems:(NSArray *)items;
Modified: trunk/Source/WebKit/mac/ChangeLog (182300 => 182301)
--- trunk/Source/WebKit/mac/ChangeLog 2015-04-03 00:43:29 UTC (rev 182300)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-04-03 00:53:15 UTC (rev 182301)
@@ -1,3 +1,17 @@
+2015-04-02 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r182293.
+ https://bugs.webkit.org/show_bug.cgi?id=143355
+
+ Broke GTK and EFL builds. (Requested by bfulgham on #webkit).
+
+ Reverted changeset:
+
+ "Expose the "Share" menu for text selections on platforms
+ where it's available."
+ https://bugs.webkit.org/show_bug.cgi?id=143318
+ http://trac.webkit.org/changeset/182293
+
2015-04-02 Brady Eidson <beid...@apple.com>
Expose the "Share" menu for text selections on platforms where it's available.
Modified: trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm (182300 => 182301)
--- trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm 2015-04-03 00:43:29 UTC (rev 182300)
+++ trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm 2015-04-03 00:53:15 UTC (rev 182301)
@@ -49,7 +49,6 @@
#import <WebCore/LookupSPI.h>
#import <WebCore/NSMenuSPI.h>
#import <WebCore/Page.h>
-#import <WebCore/QuickLookMacSPI.h>
#import <WebCore/RenderElement.h>
#import <WebCore/RenderObject.h>
#import <WebCore/RuntimeApplicationChecks.h>
Modified: trunk/Source/WebKit2/ChangeLog (182300 => 182301)
--- trunk/Source/WebKit2/ChangeLog 2015-04-03 00:43:29 UTC (rev 182300)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-03 00:53:15 UTC (rev 182301)
@@ -1,3 +1,17 @@
+2015-04-02 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r182293.
+ https://bugs.webkit.org/show_bug.cgi?id=143355
+
+ Broke GTK and EFL builds. (Requested by bfulgham on #webkit).
+
+ Reverted changeset:
+
+ "Expose the "Share" menu for text selections on platforms
+ where it's available."
+ https://bugs.webkit.org/show_bug.cgi?id=143318
+ http://trac.webkit.org/changeset/182293
+
2015-04-02 Chris Dumez <cdu...@apple.com>
[WK2][NetworkCache] Drop HTTP method from NetworkCache::Key
Modified: trunk/Source/WebKit2/Shared/API/c/WKContextMenuItemTypes.h (182300 => 182301)
--- trunk/Source/WebKit2/Shared/API/c/WKContextMenuItemTypes.h 2015-04-03 00:43:29 UTC (rev 182300)
+++ trunk/Source/WebKit2/Shared/API/c/WKContextMenuItemTypes.h 2015-04-03 00:53:15 UTC (rev 182301)
@@ -121,7 +121,6 @@
kWKContextMenuItemTagSelectAll,
kWKContextMenuItemTagOpenLinkInThisWindow,
kWKContextMenuItemTagToggleVideoFullscreen,
- kWKContextMenuItemTagShareMenu,
kWKContextMenuItemBaseApplicationTag = 10000
};
typedef uint32_t WKContextMenuItemTag;
Modified: trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h (182300 => 182301)
--- trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h 2015-04-03 00:43:29 UTC (rev 182300)
+++ trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h 2015-04-03 00:53:15 UTC (rev 182301)
@@ -503,8 +503,6 @@
#endif
case WebCore::ContextMenuItemTagOpenLinkInThisWindow:
return kWKContextMenuItemTagOpenLinkInThisWindow;
- case WebCore::ContextMenuItemTagShareMenu:
- return kWKContextMenuItemTagShareMenu;
default:
if (action < WebCore::ContextMenuItemBaseApplicationTag)
LOG_ERROR("ContextMenuAction %i is an unknown tag but is below the allowable custom tag value of %i", action, WebCore:: ContextMenuItemBaseApplicationTag);
@@ -694,8 +692,6 @@
return WebCore::ContextMenuItemTagCapitalize;
case kWKContextMenuItemTagChangeBack:
return WebCore::ContextMenuItemTagChangeBack;
- case kWKContextMenuItemTagShareMenu:
- return WebCore::ContextMenuItemTagShareMenu;
#endif
case kWKContextMenuItemTagOpenLinkInThisWindow:
return WebCore::ContextMenuItemTagOpenLinkInThisWindow;
Modified: trunk/Source/WebKit2/Shared/ContextMenuContextData.cpp (182300 => 182301)
--- trunk/Source/WebKit2/Shared/ContextMenuContextData.cpp 2015-04-03 00:43:29 UTC (rev 182300)
+++ trunk/Source/WebKit2/Shared/ContextMenuContextData.cpp 2015-04-03 00:53:15 UTC (rev 182301)
@@ -46,7 +46,6 @@
ContextMenuContextData::ContextMenuContextData(const ContextMenuContext& context)
: m_webHitTestResultData(WebHitTestResult::Data(context.hitTestResult()))
- , m_selectedText(context.selectedText())
#if ENABLE(SERVICE_CONTROLS)
, m_selectionIsEditable(false)
#endif
@@ -65,7 +64,6 @@
void ContextMenuContextData::encode(IPC::ArgumentEncoder& encoder) const
{
encoder << m_webHitTestResultData;
- encoder << m_selectedText;
#if ENABLE(SERVICE_CONTROLS)
ShareableBitmap::Handle handle;
@@ -80,9 +78,6 @@
if (!decoder.decode(contextMenuContextData.m_webHitTestResultData))
return false;
- if (!decoder.decode(contextMenuContextData.m_selectedText))
- return false;
-
#if ENABLE(SERVICE_CONTROLS)
ShareableBitmap::Handle handle;
if (!decoder.decode(handle))
Modified: trunk/Source/WebKit2/Shared/ContextMenuContextData.h (182300 => 182301)
--- trunk/Source/WebKit2/Shared/ContextMenuContextData.h 2015-04-03 00:43:29 UTC (rev 182300)
+++ trunk/Source/WebKit2/Shared/ContextMenuContextData.h 2015-04-03 00:53:15 UTC (rev 182301)
@@ -49,7 +49,6 @@
ContextMenuContextData(const WebCore::ContextMenuContext&);
const WebHitTestResult::Data& webHitTestResultData() const { return m_webHitTestResultData; }
- const String& selectedText() const { return m_selectedText; }
#if ENABLE(SERVICE_CONTROLS)
ContextMenuContextData(const Vector<uint8_t>& selectionData, const Vector<String>& selectedTelephoneNumbers, bool isEditable)
@@ -72,7 +71,6 @@
private:
WebHitTestResult::Data m_webHitTestResultData;
- String m_selectedText;
#if ENABLE(SERVICE_CONTROLS)
RefPtr<ShareableBitmap> m_controlledImage;
Deleted: trunk/Source/WebKit2/Shared/NativeContextMenuItem.h (182300 => 182301)
--- trunk/Source/WebKit2/Shared/NativeContextMenuItem.h 2015-04-03 00:43:29 UTC (rev 182300)
+++ trunk/Source/WebKit2/Shared/NativeContextMenuItem.h 2015-04-03 00:53:15 UTC (rev 182301)
@@ -1,65 +0,0 @@
-/*
- * 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.
- */
-
-#ifndef NativeContextMenuItem_h
-#define NativeContextMenuItem_h
-
-#if ENABLE(CONTEXT_MENUS)
-
-#if PLATFORM(COCOA)
-#include <wtf/RetainPtr.h>
-OBJC_CLASS NSMenuItem;
-#endif
-
-namespace WebCore {
-
-class ContextMenuItem;
-
-}
-
-namespace WebKit {
-
-class NativeContextMenuItem {
-public:
- NativeContextMenuItem(const WebCore::ContextMenuItem& coreItem);
-
- virtual ~NativeContextMenuItem() { }
-
-#if PLATFORM(COCOA)
- NSMenuItem *nsMenuItem() { return m_nsMenuItem.get(); }
-#endif
-
-private:
-
-#if PLATFORM(COCOA)
- RetainPtr<NSMenuItem> m_nsMenuItem;
-#endif
-
-};
-
-} // namespace WebKit
-
-#endif // ENABLE(CONTEXT_MENUS)
-#endif // NativeContextMenuItem_h
Modified: trunk/Source/WebKit2/Shared/WebContextMenuItem.cpp (182300 => 182301)
--- trunk/Source/WebKit2/Shared/WebContextMenuItem.cpp 2015-04-03 00:43:29 UTC (rev 182300)
+++ trunk/Source/WebKit2/Shared/WebContextMenuItem.cpp 2015-04-03 00:53:15 UTC (rev 182301)
@@ -40,12 +40,6 @@
{
}
-WebContextMenuItem::WebContextMenuItem(const WebCore::ContextMenuItem& coreItem)
- : m_webContextMenuItemData(coreItem)
-{
- m_nativeContextMenuItem = std::make_unique<NativeContextMenuItem>(coreItem);
-}
-
PassRefPtr<WebContextMenuItem> WebContextMenuItem::create(const String& title, bool enabled, API::Array* submenuItems)
{
size_t size = submenuItems->size();
Modified: trunk/Source/WebKit2/Shared/WebContextMenuItem.h (182300 => 182301)
--- trunk/Source/WebKit2/Shared/WebContextMenuItem.h 2015-04-03 00:43:29 UTC (rev 182300)
+++ trunk/Source/WebKit2/Shared/WebContextMenuItem.h 2015-04-03 00:53:15 UTC (rev 182301)
@@ -29,17 +29,12 @@
#if ENABLE(CONTEXT_MENUS)
#include "APIObject.h"
-#include "NativeContextMenuItem.h"
#include "WebContextMenuItemData.h"
namespace API {
class Array;
}
-namespace WebCore {
-class ContextMenuItem;
-}
-
namespace WebKit {
class WebContextMenuItem : public API::ObjectImpl<API::Object::Type::ContextMenuItem> {
@@ -48,12 +43,6 @@
{
return adoptRef(new WebContextMenuItem(data));
}
-
- static PassRefPtr<WebContextMenuItem> create(const WebCore::ContextMenuItem& item)
- {
- return adoptRef(new WebContextMenuItem(item));
- }
-
static PassRefPtr<WebContextMenuItem> create(const String& title, bool enabled, API::Array* submenuItems);
static WebContextMenuItem* separatorItem();
@@ -63,15 +52,11 @@
void setUserData(API::Object*);
WebContextMenuItemData* data() { return &m_webContextMenuItemData; }
- NativeContextMenuItem* nativeContextMenuItem() { return m_nativeContextMenuItem.get(); }
private:
WebContextMenuItem(const WebContextMenuItemData&);
- WebContextMenuItem(const WebCore::ContextMenuItem&);
WebContextMenuItemData m_webContextMenuItemData;
-
- std::unique_ptr<NativeContextMenuItem> m_nativeContextMenuItem;
};
} // namespace WebKit
Deleted: trunk/Source/WebKit2/Shared/mac/NativeContextMenuItem.mm (182300 => 182301)
--- trunk/Source/WebKit2/Shared/mac/NativeContextMenuItem.mm 2015-04-03 00:43:29 UTC (rev 182300)
+++ trunk/Source/WebKit2/Shared/mac/NativeContextMenuItem.mm 2015-04-03 00:53:15 UTC (rev 182301)
@@ -1,44 +0,0 @@
-/*
- * 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 "NativeContextMenuItem.h"
-
-#if ENABLE(CONTEXT_MENUS)
-
-#include <WebCore/ContextMenuItem.h>
-
-using namespace WebCore;
-
-namespace WebKit {
-
-NativeContextMenuItem::NativeContextMenuItem(const ContextMenuItem& coreItem)
- : m_nsMenuItem(coreItem.getPlatformDescription())
-{
-}
-
-} // namespace WebKit
-
-#endif // ENABLE(CONTEXT_MENUS)
Modified: trunk/Source/WebKit2/UIProcess/API/APIContextMenuClient.h (182300 => 182301)
--- trunk/Source/WebKit2/UIProcess/API/APIContextMenuClient.h 2015-04-03 00:43:29 UTC (rev 182300)
+++ trunk/Source/WebKit2/UIProcess/API/APIContextMenuClient.h 2015-04-03 00:53:15 UTC (rev 182301)
@@ -29,7 +29,6 @@
#if ENABLE(CONTEXT_MENUS)
#include "WebHitTestResult.h"
-#include <wtf/RefPtr.h>
#include <wtf/Vector.h>
namespace WebCore {
@@ -37,7 +36,6 @@
}
namespace WebKit {
-class WebContextMenuItem;
class WebContextMenuItemData;
class WebPageProxy;
}
@@ -48,10 +46,10 @@
public:
virtual ~ContextMenuClient() { }
- virtual bool getContextMenuFromProposedMenu(WebKit::WebPageProxy&, const Vector<RefPtr<WebKit::WebContextMenuItem>>& /* proposedMenu */, Vector<RefPtr<WebKit::WebContextMenuItem>>& /* customMenu */, const WebKit::WebHitTestResult::Data&, API::Object* /* userData */) { return false; }
+ virtual bool getContextMenuFromProposedMenu(WebKit::WebPageProxy&, const Vector<WebKit::WebContextMenuItemData>& /* proposedMenu */, Vector<WebKit::WebContextMenuItemData>& /* customMenu */, const WebKit::WebHitTestResult::Data&, API::Object* /* userData */) { return false; }
virtual void customContextMenuItemSelected(WebKit::WebPageProxy&, const WebKit::WebContextMenuItemData&) { }
virtual void contextMenuDismissed(WebKit::WebPageProxy&) { }
- virtual bool showContextMenu(WebKit::WebPageProxy&, const WebCore::IntPoint&, const Vector<RefPtr<WebKit::WebContextMenuItem>>&) { return false; }
+ virtual bool showContextMenu(WebKit::WebPageProxy&, const WebCore::IntPoint&, const Vector<WebKit::WebContextMenuItemData>&) { return false; }
virtual bool hideContextMenu(WebKit::WebPageProxy&) { return false; }
};
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (182300 => 182301)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-04-03 00:43:29 UTC (rev 182300)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-04-03 00:53:15 UTC (rev 182301)
@@ -744,7 +744,7 @@
}
private:
- virtual bool getContextMenuFromProposedMenu(WebPageProxy& page, const Vector<RefPtr<WebKit::WebContextMenuItem>>& proposedMenuVector, Vector<RefPtr<WebKit::WebContextMenuItem>>& customMenu, const WebHitTestResult::Data& hitTestResultData, API::Object* userData) override
+ virtual bool getContextMenuFromProposedMenu(WebPageProxy& page, const Vector<WebContextMenuItemData>& proposedMenuVector, Vector<WebContextMenuItemData>& customMenu, const WebHitTestResult::Data& hitTestResultData, API::Object* userData) override
{
if (!m_client.getContextMenuFromProposedMenu && !m_client.getContextMenuFromProposedMenu_deprecatedForUseWithV0)
return false;
@@ -756,7 +756,7 @@
proposedMenuItems.reserveInitialCapacity(proposedMenuVector.size());
for (const auto& menuItem : proposedMenuVector)
- proposedMenuItems.uncheckedAppend(menuItem);
+ proposedMenuItems.uncheckedAppend(WebContextMenuItem::create(menuItem));
WKArrayRef newMenu = nullptr;
if (m_client.base.version >= 2) {
@@ -777,7 +777,7 @@
continue;
}
- customMenu.append(item);
+ customMenu.append(*item->data());
}
return true;
@@ -799,7 +799,7 @@
m_client.contextMenuDismissed(toAPI(&page), m_client.base.clientInfo);
}
- virtual bool showContextMenu(WebPageProxy& page, const WebCore::IntPoint& menuLocation, const Vector<RefPtr<WebContextMenuItem>>& menuItemsVector) override
+ virtual bool showContextMenu(WebPageProxy& page, const WebCore::IntPoint& menuLocation, const Vector<WebContextMenuItemData>& menuItemsVector) override
{
if (!m_client.showContextMenu)
return false;
@@ -808,7 +808,7 @@
menuItems.reserveInitialCapacity(menuItemsVector.size());
for (const auto& menuItem : menuItemsVector)
- menuItems.uncheckedAppend(menuItem);
+ menuItems.uncheckedAppend(WebContextMenuItem::create(menuItem));
m_client.showContextMenu(toAPI(&page), toAPI(menuLocation), toAPI(API::Array::create(WTF::move(menuItems)).get()), m_client.base.clientInfo);
Modified: trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.h (182300 => 182301)
--- trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.h 2015-04-03 00:43:29 UTC (rev 182300)
+++ trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.h 2015-04-03 00:53:15 UTC (rev 182301)
@@ -37,13 +37,13 @@
namespace WebKit {
class ContextMenuContextData;
-class WebContextMenuItem;
+class WebContextMenuItemData;
class WebContextMenuProxy : public RefCounted<WebContextMenuProxy> {
public:
virtual ~WebContextMenuProxy();
- virtual void showContextMenu(const WebCore::IntPoint&, const Vector<RefPtr<WebContextMenuItem>>&, const ContextMenuContextData&) = 0;
+ virtual void showContextMenu(const WebCore::IntPoint&, const Vector<WebContextMenuItemData>&, const ContextMenuContextData&) = 0;
virtual void hideContextMenu() = 0;
virtual void cancelTracking() { }
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (182300 => 182301)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-04-03 00:43:29 UTC (rev 182300)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-04-03 00:53:15 UTC (rev 182301)
@@ -69,7 +69,6 @@
#include "WebBackForwardList.h"
#include "WebBackForwardListItem.h"
#include "WebCertificateInfo.h"
-#include "WebContextMenuItem.h"
#include "WebContextMenuProxy.h"
#include "WebCoreArgumentCoders.h"
#include "WebEditCommandProxy.h"
@@ -4029,31 +4028,18 @@
m_process->responsivenessTimer()->stop();
// Unless this is an image control, give the PageContextMenuClient one last swipe at changing the menu.
+ Vector<WebContextMenuItemData> items;
+ bool useProposedItems = true;
bool askClientToChangeMenu = clientEligibility == ContextMenuClientEligibility::EligibleForClient;
#if ENABLE(SERVICE_CONTROLS)
if (contextMenuContextData.controlledImage())
askClientToChangeMenu = false;
#endif
- Vector<RefPtr<WebContextMenuItem>> proposedAPIItems;
- for (auto& item : proposedItems) {
- if (item.action() != ContextMenuItemTagShareMenu) {
- proposedAPIItems.append(WebContextMenuItem::create(item));
- continue;
- }
-
- // Currently we only support the share menu for text selection, so create the appropriate menu item for that text selection now.
- ContextMenuItem coreItem = ContextMenuItem::shareSelectedTextMenuItem(contextMenuContextData.selectedText());
- proposedAPIItems.append(WebContextMenuItem::create(coreItem));
- }
-
- Vector<RefPtr<WebContextMenuItem>> clientItems;
- bool useProposedItems = true;
-
- if (askClientToChangeMenu && m_contextMenuClient->getContextMenuFromProposedMenu(*this, proposedAPIItems, clientItems, contextMenuContextData.webHitTestResultData(), m_process->transformHandlesToObjects(userData.object()).get()))
+ if (askClientToChangeMenu && m_contextMenuClient->getContextMenuFromProposedMenu(*this, proposedItems, items, contextMenuContextData.webHitTestResultData(), m_process->transformHandlesToObjects(userData.object()).get()))
useProposedItems = false;
- const Vector<RefPtr<WebContextMenuItem>>& itemsToShow = useProposedItems ? proposedAPIItems : clientItems;
+ const Vector<WebContextMenuItemData>& itemsToShow = useProposedItems ? proposedItems : items;
if (!m_contextMenuClient->showContextMenu(*this, menuLocation, itemsToShow))
m_activeContextMenu->showContextMenu(menuLocation, itemsToShow, contextMenuContextData);
Modified: trunk/Source/WebKit2/UIProcess/efl/WebContextMenuProxyEfl.cpp (182300 => 182301)
--- trunk/Source/WebKit2/UIProcess/efl/WebContextMenuProxyEfl.cpp 2015-04-03 00:43:29 UTC (rev 182300)
+++ trunk/Source/WebKit2/UIProcess/efl/WebContextMenuProxyEfl.cpp 2015-04-03 00:53:15 UTC (rev 182301)
@@ -47,7 +47,7 @@
{
}
-void WebContextMenuProxyEfl::showContextMenu(const WebCore::IntPoint&, const Vector<RefPtr<WebContextMenuItem>>&, const ContextMenuContextData&)
+void WebContextMenuProxyEfl::showContextMenu(const WebCore::IntPoint&, const Vector<WebContextMenuItemData>&, const ContextMenuContextData&)
{
notImplemented();
}
Modified: trunk/Source/WebKit2/UIProcess/efl/WebContextMenuProxyEfl.h (182300 => 182301)
--- trunk/Source/WebKit2/UIProcess/efl/WebContextMenuProxyEfl.h 2015-04-03 00:43:29 UTC (rev 182300)
+++ trunk/Source/WebKit2/UIProcess/efl/WebContextMenuProxyEfl.h 2015-04-03 00:53:15 UTC (rev 182301)
@@ -48,7 +48,7 @@
~WebContextMenuProxyEfl();
- void showContextMenu(const WebCore::IntPoint&, const Vector<RefPtr<WebContextMenuItem>>&, const ContextMenuContextData&);
+ void showContextMenu(const WebCore::IntPoint&, const Vector<WebContextMenuItemData>&, const ContextMenuContextData&);
void hideContextMenu();
private:
Modified: trunk/Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.cpp (182300 => 182301)
--- trunk/Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.cpp 2015-04-03 00:43:29 UTC (rev 182300)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.cpp 2015-04-03 00:53:15 UTC (rev 182301)
@@ -130,15 +130,15 @@
}
}
-void WebContextMenuProxyGtk::populate(const Vector<RefPtr<WebContextMenuItem>>& items)
+void WebContextMenuProxyGtk::populate(const Vector<WebContextMenuItemData>& items)
{
for (size_t i = 0; i < items.size(); i++) {
- ContextMenuItem menuitem = items.at(i)->data()->core();
+ ContextMenuItem menuitem = items.at(i).core();
append(menuitem);
}
}
-void WebContextMenuProxyGtk::showContextMenu(const WebCore::IntPoint& position, const Vector<RefPtr<WebContextMenuItem>>& items, const ContextMenuContextData&)
+void WebContextMenuProxyGtk::showContextMenu(const WebCore::IntPoint& position, const Vector<WebContextMenuItemData>& items, const ContextMenuContextData&)
{
if (!items.isEmpty())
populate(items);
Modified: trunk/Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.h (182300 => 182301)
--- trunk/Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.h 2015-04-03 00:43:29 UTC (rev 182300)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.h 2015-04-03 00:53:15 UTC (rev 182301)
@@ -46,7 +46,7 @@
}
~WebContextMenuProxyGtk();
- virtual void showContextMenu(const WebCore::IntPoint&, const Vector<RefPtr<WebContextMenuItem>>&, const ContextMenuContextData&);
+ virtual void showContextMenu(const WebCore::IntPoint&, const Vector<WebContextMenuItemData>&, const ContextMenuContextData&);
virtual void hideContextMenu();
void populate(Vector<WebCore::ContextMenuItem>&);
@@ -56,7 +56,7 @@
WebContextMenuProxyGtk(GtkWidget*, WebPageProxy*);
void append(WebCore::ContextMenuItem&);
- void populate(const Vector<RefPtr<WebContextMenuItem>>&);
+ void populate(const Vector<WebContextMenuItemData>&);
static void menuPositionFunction(GtkMenu*, gint*, gint*, gboolean*, WebContextMenuProxyGtk*);
GtkWidget* m_webView;
Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h (182300 => 182301)
--- trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h 2015-04-03 00:43:29 UTC (rev 182300)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h 2015-04-03 00:53:15 UTC (rev 182301)
@@ -38,7 +38,6 @@
namespace WebKit {
class ShareableBitmap;
-class WebContextMenuItemData;
class WebPageProxy;
class WebContextMenuProxyMac : public WebContextMenuProxy {
@@ -49,7 +48,7 @@
}
~WebContextMenuProxyMac();
- virtual void showContextMenu(const WebCore::IntPoint&, const Vector<RefPtr<WebContextMenuItem>>&, const ContextMenuContextData&) override;
+ virtual void showContextMenu(const WebCore::IntPoint&, const Vector<WebContextMenuItemData>&, const ContextMenuContextData&) override;
virtual void hideContextMenu() override;
virtual void cancelTracking() override;
@@ -66,7 +65,7 @@
private:
WebContextMenuProxyMac(WKView*, WebPageProxy*);
- void populate(const Vector<RefPtr<WebContextMenuItem>>&, const ContextMenuContextData&);
+ void populate(const Vector<WebContextMenuItemData>&, const ContextMenuContextData&);
#if ENABLE(SERVICE_CONTROLS)
void setupServicesMenu(const ContextMenuContextData&);
Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm (182300 => 182301)
--- trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2015-04-03 00:43:29 UTC (rev 182300)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2015-04-03 00:53:15 UTC (rev 182301)
@@ -34,7 +34,6 @@
#import "ServicesController.h"
#import "ShareableBitmap.h"
#import "StringUtilities.h"
-#import "WebContextMenuItem.h"
#import "WebContextMenuItemData.h"
#import "WebProcessProxy.h"
#import "WKView.h"
@@ -141,7 +140,7 @@
ASSERT([representedObject isKindOfClass:[WKUserDataWrapper class]]);
item.setUserData([static_cast<WKUserDataWrapper *>(representedObject) userData]);
}
-
+
_menuProxy->contextMenuItemSelected(item);
}
@@ -293,72 +292,59 @@
}
}
-template<typename ItemType> static Vector<RetainPtr<NSMenuItem>> nsMenuItemVector(const Vector<ItemType>&);
-
-static RetainPtr<NSMenuItem> nsMenuItem(const WebContextMenuItemData& item)
+static Vector<RetainPtr<NSMenuItem>> nsMenuItemVector(const Vector<WebContextMenuItemData>& items)
{
- switch (item.type()) {
- case ActionType:
- case CheckableActionType: {
- NSMenuItem* menuItem = [[NSMenuItem alloc] initWithTitle:nsStringFromWebCoreString(item.title()) action:@selector(forwardContextMenuAction:) keyEquivalent:@""];
- [menuItem setTag:item.action()];
- [menuItem setEnabled:item.enabled()];
- [menuItem setState:item.checked() ? NSOnState : NSOffState];
+ Vector<RetainPtr<NSMenuItem>> result;
- if (std::function<void ()> selectionHandler = item.selectionHandler()) {
- WKSelectionHandlerWrapper *wrapper = [[WKSelectionHandlerWrapper alloc] initWithSelectionHandler:selectionHandler];
- [menuItem setRepresentedObject:wrapper];
- [wrapper release];
- } else if (item.userData()) {
- WKUserDataWrapper *wrapper = [[WKUserDataWrapper alloc] initWithUserData:item.userData()];
- [menuItem setRepresentedObject:wrapper];
- [wrapper release];
+ unsigned size = items.size();
+ result.reserveCapacity(size);
+ for (unsigned i = 0; i < size; i++) {
+ switch (items[i].type()) {
+ case ActionType:
+ case CheckableActionType: {
+ NSMenuItem* menuItem = [[NSMenuItem alloc] initWithTitle:nsStringFromWebCoreString(items[i].title()) action:@selector(forwardContextMenuAction:) keyEquivalent:@""];
+ [menuItem setTag:items[i].action()];
+ [menuItem setEnabled:items[i].enabled()];
+ [menuItem setState:items[i].checked() ? NSOnState : NSOffState];
+
+ if (std::function<void ()> selectionHandler = items[i].selectionHandler()) {
+ WKSelectionHandlerWrapper *wrapper = [[WKSelectionHandlerWrapper alloc] initWithSelectionHandler:selectionHandler];
+ [menuItem setRepresentedObject:wrapper];
+ [wrapper release];
+ } else if (items[i].userData()) {
+ WKUserDataWrapper *wrapper = [[WKUserDataWrapper alloc] initWithUserData:items[i].userData()];
+ [menuItem setRepresentedObject:wrapper];
+ [wrapper release];
+ }
+
+ result.append(adoptNS(menuItem));
+ break;
}
+ case SeparatorType:
+ result.append([NSMenuItem separatorItem]);
+ break;
+ case SubmenuType: {
+ NSMenu* menu = [[NSMenu alloc] initWithTitle:nsStringFromWebCoreString(items[i].title())];
+ [menu setAutoenablesItems:NO];
+ populateNSMenu(menu, nsMenuItemVector(items[i].submenu()));
+
+ NSMenuItem* menuItem = [[NSMenuItem alloc] initWithTitle:nsStringFromWebCoreString(items[i].title()) action:@selector(forwardContextMenuAction:) keyEquivalent:@""];
+ [menuItem setEnabled:items[i].enabled()];
+ [menuItem setSubmenu:menu];
+ [menu release];
- return adoptNS(menuItem);
- break;
- }
- case SeparatorType:
- return [NSMenuItem separatorItem];
- break;
- case SubmenuType: {
- NSMenu* menu = [[NSMenu alloc] initWithTitle:nsStringFromWebCoreString(item.title())];
- [menu setAutoenablesItems:NO];
- populateNSMenu(menu, nsMenuItemVector(item.submenu()));
+ result.append(adoptNS(menuItem));
- NSMenuItem* menuItem = [[NSMenuItem alloc] initWithTitle:nsStringFromWebCoreString(item.title()) action:@selector(forwardContextMenuAction:) keyEquivalent:@""];
- [menuItem setEnabled:item.enabled()];
- [menuItem setSubmenu:menu];
- [menu release];
-
- return adoptNS(menuItem);
+ break;
+ }
+ default:
+ ASSERT_NOT_REACHED();
+ }
}
- default:
- ASSERT_NOT_REACHED();
- }
-}
-static RetainPtr<NSMenuItem> nsMenuItem(const RefPtr<WebContextMenuItem>& item)
-{
- if (NativeContextMenuItem* nativeItem = item->nativeContextMenuItem())
- return nativeItem->nsMenuItem();
-
- ASSERT(item->data());
- return nsMenuItem(*item->data());
-}
-
-template<typename ItemType> static Vector<RetainPtr<NSMenuItem>> nsMenuItemVector(const Vector<ItemType>& items)
-{
- Vector<RetainPtr<NSMenuItem>> result;
-
- unsigned size = items.size();
- result.reserveCapacity(size);
- for (auto& item : items)
- result.uncheckedAppend(nsMenuItem(item));
-
WKMenuTarget* target = [WKMenuTarget sharedMenuTarget];
- for (auto& item : result)
- [item.get() setTarget:target];
+ for (unsigned i = 0; i < size; ++i)
+ [result[i].get() setTarget:target];
return result;
}
@@ -435,7 +421,7 @@
}
#endif
-void WebContextMenuProxyMac::populate(const Vector<RefPtr<WebContextMenuItem>>& items, const ContextMenuContextData& context)
+void WebContextMenuProxyMac::populate(const Vector<WebContextMenuItemData>& items, const ContextMenuContextData& context)
{
#if ENABLE(SERVICE_CONTROLS)
if (context.needsServicesMenu()) {
@@ -456,7 +442,7 @@
populateNSMenu(menu, nsMenuItemVector(items));
}
-void WebContextMenuProxyMac::showContextMenu(const IntPoint& menuLocation, const Vector<RefPtr<WebContextMenuItem>>& items, const ContextMenuContextData& context)
+void WebContextMenuProxyMac::showContextMenu(const IntPoint& menuLocation, const Vector<WebContextMenuItemData>& items, const ContextMenuContextData& context)
{
#if ENABLE(SERVICE_CONTROLS)
if (items.isEmpty() && !context.needsServicesMenu())
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (182300 => 182301)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-04-03 00:43:29 UTC (rev 182300)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-04-03 00:53:15 UTC (rev 182301)
@@ -944,7 +944,6 @@
516319921628980A00E22F00 /* NetworkProcessProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 516319911628980A00E22F00 /* NetworkProcessProxyMac.mm */; };
5163199416289A6000E22F00 /* NetworkProcessMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51ACC9341628064800342550 /* NetworkProcessMessageReceiver.cpp */; };
5163199516289A6300E22F00 /* NetworkProcessMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 51ACC9351628064800342550 /* NetworkProcessMessages.h */; };
- 5163EA451ACC7AE50012D1E4 /* NativeContextMenuItem.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5163EA431ACC74AE0012D1E4 /* NativeContextMenuItem.mm */; };
51654EFD184EF33F007DC837 /* UniqueIDBDatabaseBackingStoreSQLite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51654EFB184EF33F007DC837 /* UniqueIDBDatabaseBackingStoreSQLite.cpp */; };
51654EFE184EF33F007DC837 /* UniqueIDBDatabaseBackingStoreSQLite.h in Headers */ = {isa = PBXBuildFile; fileRef = 51654EFC184EF33F007DC837 /* UniqueIDBDatabaseBackingStoreSQLite.h */; };
51654F00184EF34A007DC837 /* UniqueIDBDatabaseBackingStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 51654EFF184EF34A007DC837 /* UniqueIDBDatabaseBackingStore.h */; };
@@ -3132,8 +3131,6 @@
5160BFE013381DF900918999 /* LoggingFoundation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LoggingFoundation.mm; sourceTree = "<group>"; };
516311861858446600534647 /* WebCrossThreadCopier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebCrossThreadCopier.h; sourceTree = "<group>"; };
516319911628980A00E22F00 /* NetworkProcessProxyMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = NetworkProcessProxyMac.mm; path = mac/NetworkProcessProxyMac.mm; sourceTree = "<group>"; };
- 5163EA3F1ACC74820012D1E4 /* NativeContextMenuItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NativeContextMenuItem.h; sourceTree = "<group>"; };
- 5163EA431ACC74AE0012D1E4 /* NativeContextMenuItem.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NativeContextMenuItem.mm; sourceTree = "<group>"; };
51654EFB184EF33F007DC837 /* UniqueIDBDatabaseBackingStoreSQLite.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UniqueIDBDatabaseBackingStoreSQLite.cpp; sourceTree = "<group>"; };
51654EFC184EF33F007DC837 /* UniqueIDBDatabaseBackingStoreSQLite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UniqueIDBDatabaseBackingStoreSQLite.h; sourceTree = "<group>"; };
51654EFF184EF34A007DC837 /* UniqueIDBDatabaseBackingStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UniqueIDBDatabaseBackingStore.h; sourceTree = "<group>"; };
@@ -4739,7 +4736,6 @@
C58CDF2C1887609F00871536 /* InteractionInformationAtPosition.h */,
1A92DC1212F8BAB90017AF65 /* LayerTreeContext.cpp */,
1A92DC1012F8BA460017AF65 /* LayerTreeContext.h */,
- 5163EA3F1ACC74820012D1E4 /* NativeContextMenuItem.h */,
C02BFF1512514FD8009CCBEA /* NativeWebKeyboardEvent.h */,
31EA25D3134F78D6005B1452 /* NativeWebMouseEvent.h */,
263172CE18B469490065B9C3 /* NativeWebTouchEvent.h */,
@@ -6533,7 +6529,6 @@
CDC3830D1721242D008A2FC3 /* CookieStorageShim.mm */,
CDC382F9172116D3008A2FC3 /* CookieStorageShimLibrary.cpp */,
CDC3830B172121CE008A2FC3 /* CookieStorageShimLibrary.h */,
- 5163EA431ACC74AE0012D1E4 /* NativeContextMenuItem.mm */,
C02BFF1D1251502E009CCBEA /* NativeWebKeyboardEventMac.mm */,
31EA25D0134F78B2005B1452 /* NativeWebMouseEventMac.mm */,
DF58C6351371ACA000F9A37C /* NativeWebWheelEventMac.mm */,
@@ -9996,7 +9991,6 @@
BCA284D61492F2C7001F9042 /* WKConnection.mm in Sources */,
BC4A6296147313A0006C681A /* WKConnectionRef.cpp in Sources */,
0FCB4E4D18BBE044000FCFC9 /* WKContentView.mm in Sources */,
- 5163EA451ACC7AE50012D1E4 /* NativeContextMenuItem.mm in Sources */,
0FCB4E6D18BBF26A000FCFC9 /* WKContentViewInteraction.mm in Sources */,
BCB9E24C1120E15C00A137E0 /* WKContext.cpp in Sources */,
1AE52F971920263300A1FA37 /* WKContextConfigurationRef.cpp in Sources */,
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.h (182300 => 182301)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.h 2015-04-03 00:43:29 UTC (rev 182300)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.h 2015-04-03 00:53:15 UTC (rev 182301)
@@ -60,7 +60,6 @@
#if PLATFORM(COCOA)
virtual void searchWithSpotlight() override;
- virtual WebCore::ContextMenuItem shareSelectedTextMenuItem(const String&) override;
#endif
#if USE(ACCESSIBILITY_CONTEXT_MENUS)
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm (182300 => 182301)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm 2015-04-03 00:43:29 UTC (rev 182300)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm 2015-04-03 00:53:15 UTC (rev 182301)
@@ -94,11 +94,6 @@
m_page->send(Messages::WebPageProxy::SearchWithSpotlight(selectedString));
}
-ContextMenuItem WebContextMenuClient::shareSelectedTextMenuItem(const String& selectedText)
-{
- return ContextMenuItem(SubmenuType, ContextMenuItemTagShareMenu, emptyString());
-}
-
} // namespace WebKit
#endif // ENABLE(CONTEXT_MENUS)
