Diff
Modified: trunk/Source/WebCore/ChangeLog (191421 => 191422)
--- trunk/Source/WebCore/ChangeLog 2015-10-22 00:50:25 UTC (rev 191421)
+++ trunk/Source/WebCore/ChangeLog 2015-10-22 00:50:27 UTC (rev 191422)
@@ -1,5 +1,17 @@
2015-10-21 Anders Carlsson <[email protected]>
+ Get rid of WebContextMenuClient::customizeMenu, it's no longer used
+ https://bugs.webkit.org/show_bug.cgi?id=150427
+
+ Reviewed by Tim Horton.
+ * loader/EmptyClients.cpp:
+ (WebCore::EmptyContextMenuClient::customizeMenu): Deleted.
+ * loader/EmptyClients.h:
+ * page/ContextMenuController.cpp:
+ (WebCore::ContextMenuController::showContextMenu):
+
+2015-10-21 Anders Carlsson <[email protected]>
+
Remove dead MHTML code
https://bugs.webkit.org/show_bug.cgi?id=150426
Modified: trunk/Source/WebCore/loader/EmptyClients.cpp (191421 => 191422)
--- trunk/Source/WebCore/loader/EmptyClients.cpp 2015-10-22 00:50:25 UTC (rev 191421)
+++ trunk/Source/WebCore/loader/EmptyClients.cpp 2015-10-22 00:50:27 UTC (rev 191422)
@@ -232,13 +232,4 @@
{
}
-#if ENABLE(CONTEXT_MENUS)
-#if USE(CROSS_PLATFORM_CONTEXT_MENUS)
-std::unique_ptr<ContextMenu> EmptyContextMenuClient::customizeMenu(std::unique_ptr<ContextMenu>)
-{
- return nullptr;
}
-#endif
-#endif
-
-}
Modified: trunk/Source/WebCore/loader/EmptyClients.h (191421 => 191422)
--- trunk/Source/WebCore/loader/EmptyClients.h 2015-10-22 00:50:25 UTC (rev 191421)
+++ trunk/Source/WebCore/loader/EmptyClients.h 2015-10-22 00:50:27 UTC (rev 191422)
@@ -549,9 +549,7 @@
virtual ~EmptyContextMenuClient() { }
virtual void contextMenuDestroyed() override { }
-#if USE(CROSS_PLATFORM_CONTEXT_MENUS)
- virtual std::unique_ptr<ContextMenu> customizeMenu(std::unique_ptr<ContextMenu>) override;
-#else
+#if !USE(CROSS_PLATFORM_CONTEXT_MENUS)
virtual PlatformMenuDescription getCustomMenuFromDefaultItems(ContextMenu*) override { return nullptr; }
#endif
virtual void contextMenuItemSelected(ContextMenuItem*, const ContextMenu*) override { }
Modified: trunk/Source/WebCore/page/ContextMenuController.cpp (191421 => 191422)
--- trunk/Source/WebCore/page/ContextMenuController.cpp 2015-10-22 00:50:25 UTC (rev 191421)
+++ trunk/Source/WebCore/page/ContextMenuController.cpp 2015-10-22 00:50:27 UTC (rev 191422)
@@ -181,9 +181,7 @@
if (m_page.inspectorController().enabled())
addInspectElementItem();
-#if USE(CROSS_PLATFORM_CONTEXT_MENUS)
- m_contextMenu = m_client.customizeMenu(WTF::move(m_contextMenu));
-#else
+#if !USE(CROSS_PLATFORM_CONTEXT_MENUS)
PlatformMenuDescription customMenu = m_client.getCustomMenuFromDefaultItems(m_contextMenu.get());
m_contextMenu->setPlatformDescription(customMenu);
#endif
Modified: trunk/Source/WebKit/win/ChangeLog (191421 => 191422)
--- trunk/Source/WebKit/win/ChangeLog 2015-10-22 00:50:25 UTC (rev 191421)
+++ trunk/Source/WebKit/win/ChangeLog 2015-10-22 00:50:27 UTC (rev 191422)
@@ -1,5 +1,16 @@
2015-10-21 Anders Carlsson <[email protected]>
+ Get rid of WebContextMenuClient::customizeMenu, it's no longer used
+ https://bugs.webkit.org/show_bug.cgi?id=150427
+
+ Reviewed by Tim Horton.
+
+ * WebCoreSupport/WebContextMenuClient.cpp:
+ (WebContextMenuClient::customizeMenu): Deleted.
+ * WebCoreSupport/WebContextMenuClient.h:
+
+2015-10-21 Anders Carlsson <[email protected]>
+
Simplify context menu handling on Windows
https://bugs.webkit.org/show_bug.cgi?id=150423
Modified: trunk/Source/WebKit/win/WebCoreSupport/WebContextMenuClient.cpp (191421 => 191422)
--- trunk/Source/WebKit/win/WebCoreSupport/WebContextMenuClient.cpp 2015-10-22 00:50:25 UTC (rev 191421)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebContextMenuClient.cpp 2015-10-22 00:50:27 UTC (rev 191422)
@@ -52,11 +52,6 @@
delete this;
}
-std::unique_ptr<ContextMenu> WebContextMenuClient::customizeMenu(std::unique_ptr<ContextMenu> menu)
-{
- return WTF::move(menu);
-}
-
void WebContextMenuClient::contextMenuItemSelected(ContextMenuItem* item, const ContextMenu* parentMenu)
{
ASSERT(item->type() == ActionType || item->type() == CheckableActionType);
Modified: trunk/Source/WebKit/win/WebCoreSupport/WebContextMenuClient.h (191421 => 191422)
--- trunk/Source/WebKit/win/WebCoreSupport/WebContextMenuClient.h 2015-10-22 00:50:25 UTC (rev 191421)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebContextMenuClient.h 2015-10-22 00:50:27 UTC (rev 191422)
@@ -35,7 +35,6 @@
virtual void contextMenuDestroyed();
- virtual std::unique_ptr<WebCore::ContextMenu> customizeMenu(std::unique_ptr<WebCore::ContextMenu>);
virtual void contextMenuItemSelected(WebCore::ContextMenuItem*, const WebCore::ContextMenu*);
virtual void downloadURL(const WebCore::URL&);
Modified: trunk/Source/WebKit2/ChangeLog (191421 => 191422)
--- trunk/Source/WebKit2/ChangeLog 2015-10-22 00:50:25 UTC (rev 191421)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-22 00:50:27 UTC (rev 191422)
@@ -1,3 +1,14 @@
+2015-10-21 Anders Carlsson <[email protected]>
+
+ Get rid of WebContextMenuClient::customizeMenu, it's no longer used
+ https://bugs.webkit.org/show_bug.cgi?id=150427
+
+ Reviewed by Tim Horton.
+
+ * WebProcess/WebCoreSupport/WebContextMenuClient.cpp:
+ (WebKit::WebContextMenuClient::customizeMenu): Deleted.
+ * WebProcess/WebCoreSupport/WebContextMenuClient.h:
+
2015-10-21 Tim Horton <[email protected]>
API-ify the FindMatches client
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.cpp (191421 => 191422)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.cpp 2015-10-22 00:50:25 UTC (rev 191421)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.cpp 2015-10-22 00:50:27 UTC (rev 191422)
@@ -49,13 +49,7 @@
delete this;
}
-#if USE(CROSS_PLATFORM_CONTEXT_MENUS)
-std::unique_ptr<ContextMenu> WebContextMenuClient::customizeMenu(std::unique_ptr<ContextMenu> menu)
-{
- // WebKit2 ignores this client callback and does context menu customization when it is told to show the menu.
- return menu;
-}
-#else
+#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.
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.h (191421 => 191422)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.h 2015-10-22 00:50:25 UTC (rev 191421)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.h 2015-10-22 00:50:27 UTC (rev 191422)
@@ -44,9 +44,7 @@
private:
virtual void contextMenuDestroyed() override;
-#if USE(CROSS_PLATFORM_CONTEXT_MENUS)
- virtual std::unique_ptr<WebCore::ContextMenu> customizeMenu(std::unique_ptr<WebCore::ContextMenu>) override;
-#else
+#if !USE(CROSS_PLATFORM_CONTEXT_MENUS)
virtual WebCore::PlatformMenuDescription getCustomMenuFromDefaultItems(WebCore::ContextMenu*) override;
#endif
virtual void contextMenuItemSelected(WebCore::ContextMenuItem*, const WebCore::ContextMenu*) override;
