Changeset 191432 in webkit

Timestamp:

Oct 21, 2015, 8:17:06 PM (10 years ago)

Author:

achristensen@apple.com

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.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/EmptyClients.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebCore/loader/EmptyClients.h

@@ -550 +550 @@
     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