From 2bde8e466a4451c7319e3a072d118917957d6554 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 25 May 2011 19:08:45 +0100 Subject: Merge WebKit at r82507: Initial merge by git Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e --- Source/WebCore/platform/efl/ContextMenuEfl.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'Source/WebCore/platform/efl/ContextMenuEfl.cpp') diff --git a/Source/WebCore/platform/efl/ContextMenuEfl.cpp b/Source/WebCore/platform/efl/ContextMenuEfl.cpp index a5c6524..45d1758 100644 --- a/Source/WebCore/platform/efl/ContextMenuEfl.cpp +++ b/Source/WebCore/platform/efl/ContextMenuEfl.cpp @@ -2,7 +2,7 @@ * Copyright (C) 2007 Holger Hans Peter Freyther * Copyright (C) 2008 INdT - Instituto Nokia de Tecnologia * Copyright (C) 2009-2010 ProFUSION embedded systems - * Copyright (C) 2009-2010 Samsung Electronics + * Copyright (C) 2011 Samsung Electronics * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -26,16 +26,12 @@ namespace WebCore { +#if USE(CROSS_PLATFORM_CONTEXT_MENUS) ContextMenu::ContextMenu(void* menu) { getContextMenuItems(menu, m_items); } -ContextMenu::ContextMenu() -{ - notImplemented(); -} - void ContextMenu::getContextMenuItems(void* menu, Vector& items) { notImplemented(); @@ -51,5 +47,11 @@ void* ContextMenu::nativeMenu() const { return createNativeMenuFromItems(m_items); } +#else +ContextMenu::ContextMenu() +{ + notImplemented(); +} +#endif } -- cgit v1.1