Recommit r191428.
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 22 Oct 2015 03:17:06 +0000 (03:17 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 22 Oct 2015 03:17:06 +0000 (03:17 +0000)
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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@191432 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/loader/EmptyClients.h

index ac2a0f4..de4a14a 100644 (file)
@@ -1,3 +1,13 @@
+2015-10-21  Alex Christensen  <achristensen@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.kim@webkit.org>
 
         [EFL][GTK][WK2] Fix build break since r191402, r191401
index 3635b86..ea01109 100644 (file)
@@ -549,9 +549,7 @@ public:
     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 { }