diff options
author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebCore/platform/efl/ContextMenuEfl.cpp | |
parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebCore/platform/efl/ContextMenuEfl.cpp')
-rw-r--r-- | Source/WebCore/platform/efl/ContextMenuEfl.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
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<ContextMenuItem>& items) { notImplemented(); @@ -51,5 +47,11 @@ void* ContextMenu::nativeMenu() const { return createNativeMenuFromItems(m_items); } +#else +ContextMenu::ContextMenu() +{ + notImplemented(); +} +#endif } |