Reviewed by Adam.

        Get rid of show() and hide() since they don't do anything.

        * page/ContextMenuController.cpp:
        (WebCore::ContextMenuController::handleContextMenuEvent):
        * platform/ContextMenu.h:
        * platform/mac/ContextMenuMac.mm:


git-svn-id: svn://svn.chromium.org/blink/trunk@18889 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/WebCore/ChangeLog

+2007-01-16  Beth Dakin  <bdakin@apple.com>
+
+        Reviewed by Adam.
+
+        Get rid of show() and hide() since they don't do anything.
+
+        * page/ContextMenuController.cpp:
+        (WebCore::ContextMenuController::handleContextMenuEvent):
+        * platform/ContextMenu.h:
+        * platform/mac/ContextMenuMac.mm:
+
 2007-01-16  Lars Knoll <lars@trolltech.com>
 
         Reviewed by Zack
@@ -109,6 +120,7 @@
         * platform/network/ResourceHandleInternal.h:
         (WebCore::ResourceHandleInternal::ResourceHandleInternal):
 
+>>>>>>> .r18887
 2007-01-15  Eric Seidel  <eric@webkit.org>
 
         Reviewed by hyatt.

third_party/WebKit/WebCore/page/ContextMenuController.cpp

@@ -87,8 +87,6 @@ void ContextMenuController::handleContextMenuEvent(Event* event)
     m_contextMenu->populate();
     PlatformMenuDescription customMenu = m_client->getCustomMenuFromDefaultItems(m_contextMenu.get());
     m_contextMenu->setPlatformDescription(customMenu);
-    m_contextMenu->show();
-
     event->setDefaultHandled();
 }
 

third_party/WebKit/WebCore/platform/ContextMenu.h

@@ -53,9 +53,6 @@ namespace WebCore {
         void populate();
         void checkOrEnableIfNeeded(ContextMenuItem&) const;
 
-        void show();
-        void hide();
-
         void insertItem(unsigned position, ContextMenuItem&);
         void appendItem(ContextMenuItem&);
         

third_party/WebKit/WebCore/platform/mac/ContextMenuMac.mm

@@ -135,12 +135,4 @@ NSMutableArray* ContextMenu::platformDescription() const
     return m_platformDescription.get();
 }
 
-void ContextMenu::show()
-{
-}
-
-void ContextMenu::hide()
-{
-}
-
 }