2011-03-10 Gyuyoung Kim <gyuyoung.kim@samsung.com>
authorgyuyoung.kim@samsung.com <gyuyoung.kim@samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 11 Mar 2011 00:56:09 +0000 (00:56 +0000)
committergyuyoung.kim@samsung.com <gyuyoung.kim@samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 11 Mar 2011 00:56:09 +0000 (00:56 +0000)
        Unreviewed build fix.

        [EFL] Fix build break when CROSS_PLATFORM_CONTEXT_MENUS is disabled.
        https://bugs.webkit.org/show_bug.cgi?id=56005

        There are build breaks when CROSS_PLATFORM_CONTEXT_MENUS is disabled.

        * platform/efl/ContextMenuEfl.cpp:
        (WebCore::ContextMenu::ContextMenu):
        * platform/efl/ContextMenuItemEfl.cpp:

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

Source/WebCore/ChangeLog
Source/WebCore/platform/efl/ContextMenuEfl.cpp
Source/WebCore/platform/efl/ContextMenuItemEfl.cpp

index 6193fd763064fc8fc1e16503487e80f5788f5f57..ed9e5aecdec029c645e031216c7d6de9221bb18a 100644 (file)
@@ -1,3 +1,16 @@
+2011-03-10  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        Unreviewed build fix.
+
+        [EFL] Fix build break when CROSS_PLATFORM_CONTEXT_MENUS is disabled.
+        https://bugs.webkit.org/show_bug.cgi?id=56005
+
+        There are build breaks when CROSS_PLATFORM_CONTEXT_MENUS is disabled.
+
+        * platform/efl/ContextMenuEfl.cpp:
+        (WebCore::ContextMenu::ContextMenu):
+        * platform/efl/ContextMenuItemEfl.cpp:
+
 2011-03-10  Ryosuke Niwa  <rniwa@webkit.org>
 
         Reviewed by Tony Chang.
 2011-03-10  Ryosuke Niwa  <rniwa@webkit.org>
 
         Reviewed by Tony Chang.
index a5c6524409654634c6e128d8c0c053b0e1fe098a..fc5799dd4bc739688b82e596edb48aea0d7e4b57 100644 (file)
@@ -28,7 +28,9 @@ namespace WebCore {
 
 ContextMenu::ContextMenu(void* menu)
 {
 
 ContextMenu::ContextMenu(void* menu)
 {
+#if USE(CROSS_PLATFORM_CONTEXT_MENUS)
     getContextMenuItems(menu, m_items);
     getContextMenuItems(menu, m_items);
+#endif
 }
 
 ContextMenu::ContextMenu()
 }
 
 ContextMenu::ContextMenu()
@@ -36,6 +38,7 @@ ContextMenu::ContextMenu()
     notImplemented();
 }
 
     notImplemented();
 }
 
+#if USE(CROSS_PLATFORM_CONTEXT_MENUS)
 void ContextMenu::getContextMenuItems(void* menu, Vector<ContextMenuItem>& items)
 {
     notImplemented();
 void ContextMenu::getContextMenuItems(void* menu, Vector<ContextMenuItem>& items)
 {
     notImplemented();
@@ -51,5 +54,6 @@ void* ContextMenu::nativeMenu() const
 {
     return createNativeMenuFromItems(m_items);
 }
 {
     return createNativeMenuFromItems(m_items);
 }
+#endif
 
 }
 
 }
index 5ce8fabb5c4113e68e663d372b411acd600c0ec3..48ac253b056889447406413c78eff3fcff819fa6 100644 (file)
 
 namespace WebCore {
 
 
 namespace WebCore {
 
-ContextMenuItem::ContextMenuItem(void* const&)
-{
-    notImplemented();
-}
-
 ContextMenuItem::ContextMenuItem(ContextMenuItemType, ContextMenuAction, const String&, ContextMenu*)
 {
     notImplemented();
 ContextMenuItem::ContextMenuItem(ContextMenuItemType, ContextMenuAction, const String&, ContextMenu*)
 {
     notImplemented();
@@ -49,11 +44,13 @@ ContextMenuItem::~ContextMenuItem()
     notImplemented();
 }
 
     notImplemented();
 }
 
+#if USE(CROSS_PLATFORM_CONTEXT_MENUS)
 void* ContextMenuItem::nativeMenuItem() const
 {
     notImplemented();
     return 0;
 }
 void* ContextMenuItem::nativeMenuItem() const
 {
     notImplemented();
     return 0;
 }
+#endif
 
 ContextMenuItemType ContextMenuItem::type() const
 {
 
 ContextMenuItemType ContextMenuItem::type() const
 {