Diff
Modified: trunk/Source/WebCore/ChangeLog (191590 => 191591)
--- trunk/Source/WebCore/ChangeLog 2015-10-26 18:39:05 UTC (rev 191590)
+++ trunk/Source/WebCore/ChangeLog 2015-10-26 19:01:28 UTC (rev 191591)
@@ -1,3 +1,15 @@
+2015-10-26 Anders Carlsson <[email protected]>
+
+ Remove dead context menu code
+ https://bugs.webkit.org/show_bug.cgi?id=150567
+
+ Reviewed by Tim Horton.
+
+ * loader/EmptyClients.h:
+ * page/ContextMenuClient.h:
+ * page/ContextMenuController.cpp:
+ (WebCore::ContextMenuController::showContextMenu): Deleted.
+
2015-10-26 Simon Fraser <[email protected]>
Implement 'round' and 'space' values for border-image
Modified: trunk/Source/WebCore/loader/EmptyClients.h (191590 => 191591)
--- trunk/Source/WebCore/loader/EmptyClients.h 2015-10-26 18:39:05 UTC (rev 191590)
+++ trunk/Source/WebCore/loader/EmptyClients.h 2015-10-26 19:01:28 UTC (rev 191591)
@@ -549,9 +549,6 @@
virtual ~EmptyContextMenuClient() { }
virtual void contextMenuDestroyed() override { }
-#if !USE(CROSS_PLATFORM_CONTEXT_MENUS)
- virtual PlatformMenuDescription getCustomMenuFromDefaultItems(ContextMenu*) override { return nullptr; }
-#endif
virtual void contextMenuItemSelected(ContextMenuItem*, const ContextMenu*) override { }
virtual void downloadURL(const URL&) override { }
Modified: trunk/Source/WebCore/page/ContextMenuClient.h (191590 => 191591)
--- trunk/Source/WebCore/page/ContextMenuClient.h 2015-10-26 18:39:05 UTC (rev 191590)
+++ trunk/Source/WebCore/page/ContextMenuClient.h 2015-10-26 19:01:28 UTC (rev 191591)
@@ -43,10 +43,6 @@
virtual ~ContextMenuClient() { }
virtual void contextMenuDestroyed() = 0;
-#if !USE(CROSS_PLATFORM_CONTEXT_MENUS)
- virtual PlatformMenuDescription getCustomMenuFromDefaultItems(ContextMenu*) = 0;
-#endif
-
virtual void contextMenuItemSelected(ContextMenuItem*, const ContextMenu*) = 0;
virtual void downloadURL(const URL& url) = 0;
Modified: trunk/Source/WebCore/page/ContextMenuController.cpp (191590 => 191591)
--- trunk/Source/WebCore/page/ContextMenuController.cpp 2015-10-26 18:39:05 UTC (rev 191590)
+++ trunk/Source/WebCore/page/ContextMenuController.cpp 2015-10-26 19:01:28 UTC (rev 191591)
@@ -181,10 +181,6 @@
if (m_page.inspectorController().enabled())
addInspectElementItem();
-#if !USE(CROSS_PLATFORM_CONTEXT_MENUS)
- PlatformMenuDescription customMenu = m_client.getCustomMenuFromDefaultItems(m_contextMenu.get());
- m_contextMenu->setPlatformDescription(customMenu);
-#endif
event->setDefaultHandled();
}
Modified: trunk/Source/WebKit/mac/ChangeLog (191590 => 191591)
--- trunk/Source/WebKit/mac/ChangeLog 2015-10-26 18:39:05 UTC (rev 191590)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-10-26 19:01:28 UTC (rev 191591)
@@ -1,3 +1,14 @@
+2015-10-26 Anders Carlsson <[email protected]>
+
+ Remove dead context menu code
+ https://bugs.webkit.org/show_bug.cgi?id=150567
+
+ Reviewed by Tim Horton.
+
+ * WebCoreSupport/WebContextMenuClient.h:
+ * WebCoreSupport/WebContextMenuClient.mm:
+ (WebContextMenuClient::getCustomMenuFromDefaultItems): Deleted.
+
2015-10-23 Anders Carlsson <[email protected]>
Invoke the context menu delegate callback right before we return the menu
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.h (191590 => 191591)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.h 2015-10-26 18:39:05 UTC (rev 191590)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.h 2015-10-26 19:01:28 UTC (rev 191591)
@@ -50,7 +50,6 @@
virtual void contextMenuDestroyed() override;
- virtual NSMutableArray* getCustomMenuFromDefaultItems(WebCore::ContextMenu*) override;
virtual void contextMenuItemSelected(WebCore::ContextMenuItem*, const WebCore::ContextMenu*) override;
virtual void downloadURL(const WebCore::URL&) override;
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm (191590 => 191591)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm 2015-10-26 18:39:05 UTC (rev 191590)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm 2015-10-26 19:01:28 UTC (rev 191591)
@@ -89,11 +89,6 @@
delete this;
}
-NSMutableArray* WebContextMenuClient::getCustomMenuFromDefaultItems(ContextMenu* defaultMenu)
-{
- return defaultMenu->platformDescription();
-}
-
void WebContextMenuClient::contextMenuItemSelected(ContextMenuItem* item, const ContextMenu* parentMenu)
{
id delegate = [m_webView UIDelegate];
Modified: trunk/Source/WebKit2/ChangeLog (191590 => 191591)
--- trunk/Source/WebKit2/ChangeLog 2015-10-26 18:39:05 UTC (rev 191590)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-26 19:01:28 UTC (rev 191591)
@@ -1,3 +1,14 @@
+2015-10-26 Anders Carlsson <[email protected]>
+
+ Remove dead context menu code
+ https://bugs.webkit.org/show_bug.cgi?id=150567
+
+ Reviewed by Tim Horton.
+
+ * WebProcess/WebCoreSupport/WebContextMenuClient.cpp:
+ (WebKit::WebContextMenuClient::getCustomMenuFromDefaultItems): Deleted.
+ * WebProcess/WebCoreSupport/WebContextMenuClient.h:
+
2015-10-26 Tim Horton <[email protected]>
Don't expose the whitelist/blacklist in _WKUserStyleSheet
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.cpp (191590 => 191591)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.cpp 2015-10-26 18:39:05 UTC (rev 191590)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.cpp 2015-10-26 19:01:28 UTC (rev 191591)
@@ -49,14 +49,6 @@
delete this;
}
-#if !USE(CROSS_PLATFORM_CONTEXT_MENUS)
-PlatformMenuDescription WebContextMenuClient::getCustomMenuFromDefaultItems(ContextMenu* menu)
-{
- // WebKit2 ignores this client callback and does context menu customization when it is told to show the menu.
- return menu->platformDescription();
-}
-#endif
-
void WebContextMenuClient::contextMenuItemSelected(ContextMenuItem*, const ContextMenu*)
{
notImplemented();
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.h (191590 => 191591)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.h 2015-10-26 18:39:05 UTC (rev 191590)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.h 2015-10-26 19:01:28 UTC (rev 191591)
@@ -44,9 +44,6 @@
private:
virtual void contextMenuDestroyed() override;
-#if !USE(CROSS_PLATFORM_CONTEXT_MENUS)
- virtual WebCore::PlatformMenuDescription getCustomMenuFromDefaultItems(WebCore::ContextMenu*) override;
-#endif
virtual void contextMenuItemSelected(WebCore::ContextMenuItem*, const WebCore::ContextMenu*) override;
virtual void downloadURL(const WebCore::URL&) override;
