Merge webkit.org at r51976 : Initial merge by git.

Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43

1 files changed, 9 insertions, 5 deletions

diff --git a/WebCore/platform/chromium/ContextMenuChromium.cpp b/WebCore/platform/chromium/ContextMenuChromium.cpp
index 0614e3e..93c0ec4 100644
--- a/WebCore/platform/chromium/ContextMenuChromium.cpp
+++ b/WebCore/platform/chromium/ContextMenuChromium.cpp
@@ -38,13 +38,11 @@ namespace WebCore {
 
 ContextMenu::ContextMenu(const HitTestResult& result)
     : m_hitTestResult(result)
-    , m_platformDescription(0)
 {
 }
 
 ContextMenu::ContextMenu(const HitTestResult& result, const PlatformMenuDescription menu)
     : m_hitTestResult(result)
-    , m_platformDescription(0)
 {
 }
 
@@ -54,25 +52,31 @@ ContextMenu::~ContextMenu()
 
 unsigned ContextMenu::itemCount() const
 {
-    return 0;
+    return m_items.size();
 }
 
 void ContextMenu::insertItem(unsigned position, ContextMenuItem& item)
 {
+    m_items.insert(position, item);
 }
 
 void ContextMenu::appendItem(ContextMenuItem& item)
 {
+    m_items.append(item);
 }
 
 ContextMenuItem* ContextMenu::itemWithAction(unsigned action)
 {
+    for (size_t i = 0; i < m_items.size(); ++i) {
+        if (m_items[i].action() == static_cast<ContextMenuAction>(action))
+            return &m_items[i];
+    }
     return 0;
 }
 
 ContextMenuItem* ContextMenu::itemAtIndex(unsigned index, const PlatformMenuDescription platformDescription)
 {
-    return 0;
+    return &m_items[index];
 }
 
 void ContextMenu::setPlatformDescription(PlatformMenuDescription menu)
@@ -81,7 +85,7 @@ void ContextMenu::setPlatformDescription(PlatformMenuDescription menu)
 
 PlatformMenuDescription ContextMenu::platformDescription() const
 {
-    return m_platformDescription;
+    return 0;
 }
 
 PlatformMenuDescription ContextMenu::releasePlatformDescription()