Title: [191432] trunk/Source/WebCore
- Revision
- 191432
- Author
- achristen...@apple.com
- Date
- 2015-10-21 20:17:06 -0700 (Wed, 21 Oct 2015)
Log Message
Recommit r191428.
I don't think it was supposed to be reverted in r191429, and it really does fix the build.
* loader/EmptyClients.h:
(WebCore::EmptyContextMenuClient::~EmptyContextMenuClient):
Remove customizeMenu again.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (191431 => 191432)
--- trunk/Source/WebCore/ChangeLog 2015-10-22 02:55:16 UTC (rev 191431)
+++ trunk/Source/WebCore/ChangeLog 2015-10-22 03:17:06 UTC (rev 191432)
@@ -1,3 +1,13 @@
+2015-10-21 Alex Christensen <achristen...@webkit.org>
+
+ Recommit r191428.
+
+ I don't think it was supposed to be reverted in r191429, and it really does fix the build.
+
+ * loader/EmptyClients.h:
+ (WebCore::EmptyContextMenuClient::~EmptyContextMenuClient):
+ Remove customizeMenu again.
+
2015-10-21 Gyuyoung Kim <gyuyoung....@webkit.org>
[EFL][GTK][WK2] Fix build break since r191402, r191401
Modified: trunk/Source/WebCore/loader/EmptyClients.h (191431 => 191432)
--- trunk/Source/WebCore/loader/EmptyClients.h 2015-10-22 02:55:16 UTC (rev 191431)
+++ trunk/Source/WebCore/loader/EmptyClients.h 2015-10-22 03:17:06 UTC (rev 191432)
@@ -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 { return nullptr; }
-#else
+#if !USE(CROSS_PLATFORM_CONTEXT_MENUS)
virtual PlatformMenuDescription getCustomMenuFromDefaultItems(ContextMenu*) override { return nullptr; }
#endif
virtual void contextMenuItemSelected(ContextMenuItem*, const ContextMenu*) override { }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
