Use ContextMenu code path that was guarded by CROSS_PLATFORM_CONTEXT_MENU

Source/WebKit/chromium/src/ContextMenuClientImpl.cpp

 /*
  * Copyright (C) 2009, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 160 matching lines @@
         selectedFrame->selection()->setSelection(selection, WordGranularity);
         selectionRange = selection.toNormalizedRange();
     }
 
     if (markerRange->text().stripWhiteSpace(&IsWhiteSpaceOrPunctuation) != selectionRange->text().stripWhiteSpace(&IsWhiteSpaceOrPunctuation))
         return String();
 
     return markerRange->text();
 }
 
-PlatformMenuDescription ContextMenuClientImpl::getCustomMenuFromDefaultItems(
-    ContextMenu* defaultMenu)
+PassOwnPtr<WebCore::ContextMenu> ContextMenuClientImpl::customizeMenu(PassOwnPtr<WebCore::ContextMenu> defaultMenu)
 {
     // Displaying the context menu in this function is a big hack as we don't
     // have context, i.e. whether this is being invoked via a script or in
     // response to user input (Mouse event WM_RBUTTONDOWN,
     // Keyboard events KeyVK_APPS, Shift+F10). Check if this is being invoked
     // in response to the above input events before popping up the context menu.
     if (!m_webView->contextMenuAllowed())
-        return 0;
+        return defaultMenu;
 
     HitTestResult r = m_webView->page()->contextMenuController()->hitTestResult();
     Frame* selectedFrame = r.innerNodeFrame();
 
     WebContextMenuData data;
     data.mousePosition = selectedFrame->view()->contentsToWindow(r.roundedPointInInnerNodeFrame());
 
     // Compute edit flags.
     data.editFlags = WebContextMenuData::CanDoNone;
     if (m_webView->focusedWebCoreFrame()->editor()->canUndo())
@@ skipping 118 matching lines @@
                 data.dictionarySuggestions = suggestions;
             } else if (m_webView->spellCheckClient()) {
                 int misspelledOffset, misspelledLength;
                 m_webView->spellCheckClient()->spellCheck(data.misspelledWord, misspelledOffset, misspelledLength, &data.dictionarySuggestions);
             }
         } else {
             data.isSpellCheckingEnabled = 
                 m_webView->focusedWebCoreFrame()->editor()->isContinuousSpellCheckingEnabled();
             // Spellchecking might be enabled for the field, but could be disabled on the node.
             if (m_webView->focusedWebCoreFrame()->editor()->isSpellCheckingEnabledInFocusedNode()) {
-                data.misspelledWord = selectMisspelledWord(defaultMenu, selectedFrame);
+                data.misspelledWord = selectMisspelledWord(defaultMenu.get(), selectedFrame);
                 if (m_webView->spellCheckClient()) {
                     int misspelledOffset, misspelledLength;
                     m_webView->spellCheckClient()->spellCheck(
                         data.misspelledWord, misspelledOffset, misspelledLength,
                         &data.dictionarySuggestions);
                     if (!misspelledLength)
                         data.misspelledWord.reset();
                 }
             }
         }
@@ skipping 17 matching lines @@
 
     // Now retrieve the security info.
     DocumentLoader* dl = selectedFrame->loader()->documentLoader();
     WebDataSource* ds = WebDataSourceImpl::fromDocumentLoader(dl);
     if (ds)
         data.securityInfo = ds->response().securityInfo();
 
     data.referrerPolicy = static_cast<WebReferrerPolicy>(selectedFrame->document()->referrerPolicy());
 
     // Filter out custom menu elements and add them into the data.
-    populateCustomMenuItems(defaultMenu, &data);
+    populateCustomMenuItems(defaultMenu.get(), &data);
 
     data.node = r.innerNonSharedNode();
 
     WebFrame* selected_web_frame = WebFrameImpl::fromFrame(selectedFrame);
     if (m_webView->client())
         m_webView->client()->showContextMenu(selected_web_frame, data);
 
-    return 0;
+    return defaultMenu;
 }
 
-static void populateSubMenuItems(PlatformMenuDescription inputMenu, WebVector<WebMenuItemInfo>& subMenuItems)
+static void populateSubMenuItems(const Vector<ContextMenuItem>& inputMenu, WebVector<WebMenuItemInfo>& subMenuItems)
 {
     Vector<WebMenuItemInfo> subItems;
-    for (size_t i = 0; i < inputMenu->size(); ++i) {
-        const ContextMenuItem* inputItem = &inputMenu->at(i);
+    for (size_t i = 0; i < inputMenu.size(); ++i) {
+        const ContextMenuItem* inputItem = &inputMenu.at(i);
         if (inputItem->action() < ContextMenuItemBaseCustomTag || inputItem->action() > ContextMenuItemLastCustomTag)
             continue;
 
         WebMenuItemInfo outputItem;
         outputItem.label = inputItem->title();
         outputItem.enabled = inputItem->enabled();
         outputItem.checked = inputItem->checked();
         outputItem.action = static_cast<unsigned>(inputItem->action() - ContextMenuItemBaseCustomTag);
         switch (inputItem->type()) {
         case ActionType:
             outputItem.type = WebMenuItemInfo::Option;
             break;
         case CheckableActionType:
             outputItem.type = WebMenuItemInfo::CheckableOption;
             break;
         case SeparatorType:
             outputItem.type = WebMenuItemInfo::Separator;
             break;
         case SubmenuType:
             outputItem.type = WebMenuItemInfo::SubMenu;
-            populateSubMenuItems(inputItem->platformSubMenu(), outputItem.subMenuItems);
+            populateSubMenuItems(inputItem->subMenuItems(), outputItem.subMenuItems);
             break;
         }
         subItems.append(outputItem);
     }
 
     WebVector<WebMenuItemInfo> outputItems(subItems.size());
     for (size_t i = 0; i < subItems.size(); ++i)
         outputItems[i] = subItems[i];
     subMenuItems.swap(outputItems);
 }
 
 void ContextMenuClientImpl::populateCustomMenuItems(WebCore::ContextMenu* defaultMenu, WebContextMenuData* data)
 {
-    populateSubMenuItems(defaultMenu->platformDescription(), data->customItems);
+    populateSubMenuItems(defaultMenu->items(), data->customItems);
 }
 
 } // namespace WebKit