Changeset 150240 in webkit

Timestamp:

May 16, 2013 8:28:52 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Add stubs for ContextMenu and ContextMenuItem
​https://bugs.webkit.org/show_bug.cgi?id=116235

Patch by Jesus Sanchez-Palencia <​jesus.palencia@openbossa.org> on 2013-05-16
Reviewed by Antonio Gomes.

No new tests needed, only a refactor.

Add ContextMenuNone.cpp and ContextMenuItemNone.cpp
so ports using ENABLE(CROSS_PLATFORM_CONTEXT_MENU) don't
need to replicate these stubs.

• PlatformEfl.cmake:
• Target.pri:
• platform/ContextMenuNone.cpp: Added.

(WebCore):
(WebCore::ContextMenu::ContextMenu):
(WebCore::ContextMenu::getContextMenuItems):
(WebCore::ContextMenu::createPlatformContextMenuFromItems):
(WebCore::ContextMenu::platformContextMenu):

• platform/ContextMenuItemNone.cpp: Added.

(WebCore):
(WebCore::ContextMenuItem::platformContextMenuItem):

• platform/efl/ContextMenuEfl.cpp: Removed.
• platform/efl/ContextMenuItemEfl.cpp: Removed.
• platform/qt/ContextMenuQt.cpp: Removed.
• platform/qt/ContextMenuItemQt.cpp: Removed.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• PlatformEfl.cmake (modified) (1 diff)
• Target.pri (modified) (1 diff)
• platform/ContextMenuItemNone.cpp (moved) (moved from trunk/Source/WebCore/platform/qt/ContextMenuItemQt.cpp) (5 diffs)
• platform/ContextMenuNone.cpp (moved) (moved from trunk/Source/WebCore/platform/qt/ContextMenuQt.cpp) (4 diffs)
• platform/efl/ContextMenuEfl.cpp (deleted)
• platform/efl/ContextMenuItemEfl.cpp (deleted)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-16  Jesus Sanchez-Palencia  <jesus.palencia@openbossa.org>
+
+        Add stubs for ContextMenu and ContextMenuItem
+        https://bugs.webkit.org/show_bug.cgi?id=116235
+
+        Reviewed by Antonio Gomes.
+
+        No new tests needed, only a refactor.
+
+        Add ContextMenuNone.cpp and ContextMenuItemNone.cpp
+        so ports using ENABLE(CROSS_PLATFORM_CONTEXT_MENU) don't
+        need to replicate these stubs.
+
+        * PlatformEfl.cmake:
+        * Target.pri:
+        * platform/ContextMenuNone.cpp: Added.
+        (WebCore):
+        (WebCore::ContextMenu::ContextMenu):
+        (WebCore::ContextMenu::getContextMenuItems):
+        (WebCore::ContextMenu::createPlatformContextMenuFromItems):
+        (WebCore::ContextMenu::platformContextMenu):
+        * platform/ContextMenuItemNone.cpp: Added.
+        (WebCore):
+        (WebCore::ContextMenuItem::platformContextMenuItem):
+        * platform/efl/ContextMenuEfl.cpp: Removed.
+        * platform/efl/ContextMenuItemEfl.cpp: Removed.
+        * platform/qt/ContextMenuQt.cpp: Removed.
+        * platform/qt/ContextMenuItemQt.cpp: Removed.
+
 2013-05-16  Alexis Menard  <alexis@webkit.org>
 

trunk/Source/WebCore/PlatformEfl.cmake

@@ -54 +54 @@
     platform/efl/BatteryProviderEfl.cpp
     platform/efl/ClipboardEfl.cpp
-    platform/efl/ContextMenuEfl.cpp
-    platform/efl/ContextMenuItemEfl.cpp
+    platform/ContextMenuNone.cpp
+    platform/ContextMenuItemNone.cpp
     platform/efl/CursorEfl.cpp
     platform/efl/DragDataEfl.cpp

trunk/Source/WebCore/Target.pri

@@ -2920 +2920 @@
     platform/ContextMenuItem.cpp \
     platform/qt/ClipboardQt.cpp \
-    platform/qt/ContextMenuItemQt.cpp \
-    platform/qt/ContextMenuQt.cpp \
+    platform/ContextMenuItemNone.cpp \
+    platform/ContextMenuNone.cpp \
     platform/qt/CursorQt.cpp \
     platform/qt/DragDataQt.cpp \

trunk/Source/WebCore/platform/ContextMenuItemNone.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2006 Zack Rusin <zack@kde.org>
- * Copyright (C) 2007 Staikos Computing Services Inc. <info@staikos.net>
+ * Copyright (C) 2013 Nokia Corporation and/or its subsidiary(-ies).
  *
  * Redistribution and use in source and binary forms, with or without
@@ -12 +11 @@
  *    documentation and/or other materials provided with the distribution.
  *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
@@ -26 +25 @@
 
 #include "config.h"
+
+#if ENABLE(CONTEXT_MENUS) && USE(CROSS_PLATFORM_CONTEXT_MENUS)
+
 #include "ContextMenuItem.h"
 
@@ -32 +34 @@
 namespace WebCore {
 
-void* ContextMenuItem::platformContextMenuItem() const
+PlatformContextMenuItem ContextMenuItem::platformContextMenuItem() const
 {
     notImplemented();
@@ -39 +41 @@
 
 }
-// vim: ts=4 sw=4 et
+#endif // ENABLE(CONTEXT_MENUS) && USE(CROSS_PLATFORM_CONTEXT_MENUS)

trunk/Source/WebCore/platform/ContextMenuNone.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2006 Zack Rusin <zack@kde.org>
- * Copyright (C) 2007 Staikos Computing Services Inc. <info@staikos.net>
+ * Copyright (C) 2013 Nokia Corporation and/or its subsidiary(-ies).
  *
  * Redistribution and use in source and binary forms, with or without
@@ -12 +11 @@
  *    documentation and/or other materials provided with the distribution.
  *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
@@ -26 +25 @@
 
 #include "config.h"
+
+#if ENABLE(CONTEXT_MENUS) && USE(CROSS_PLATFORM_CONTEXT_MENUS)
+
 #include "ContextMenu.h"
 
@@ -54 +56 @@
 
 }
-// vim: ts=4 sw=4 et
+#endif // ENABLE(CONTEXT_MENUS) && USE(CROSS_PLATFORM_CONTEXT_MENUS)