Make <a ping> work for context menus.

content/renderer/context_menu_params_builder.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/context_menu_params_builder.h"
 
 #include "base/logging.h"
 #include "content/common/ssl_status_serialization.h"
 #include "content/public/common/context_menu_params.h"
+#include "content/renderer/dom_utils.h"
 #include "content/renderer/history_serialization.h"
 #include "content/renderer/menu_item_builder.h"
 #include "third_party/WebKit/public/web/WebElement.h"
 #include "third_party/WebKit/public/web/WebNode.h"
 
 namespace content {
 
 // static
 ContextMenuParams ContextMenuParamsBuilder::Build(
     const blink::WebContextMenuData& data) {
@@ skipping 28 matching lines @@
   params.custom_context.is_pepper_menu = false;
   for (size_t i = 0; i < data.customItems.size(); ++i)
     params.custom_items.push_back(MenuItemBuilder::Build(data.customItems[i]));
 
   if (!data.frameHistoryItem.isNull()) {
     params.frame_page_state =
         SingleHistoryItemToPageState(data.frameHistoryItem);
   }
 
   if (!params.link_url.is_empty()) {
-    blink::WebNode selectedNode = data.node;
-
-    // If there are other embedded tags (like <a ..>Some <b>text</b></a>)
-    // we need to extract the parent <a/> node.
-    while (!selectedNode.isLink() && !selectedNode.parentNode().isNull()) {
-      selectedNode = selectedNode.parentNode();
-    }
-
+    blink::WebNode selectedNode = DomUtils::ExtractParentAnchorNode(data.node);
     blink::WebElement selectedElement = selectedNode.to<blink::WebElement>();
     if (selectedNode.isLink() && !selectedElement.isNull()) {
       params.link_text = selectedElement.innerText();
     } else {
       LOG(ERROR) << "Creating a ContextMenuParams for a node that has a link"
                  << "url but is not an ElementNode or does not have an"
                  << "ancestor that is a link.";
     }
   }
 
   // Deserialize the SSL info.
   if (!data.securityInfo.isEmpty()) {
     DeserializeSecurityInfo(data.securityInfo,
         &params.security_info.cert_id, &params.security_info.cert_status,
         &params.security_info.security_bits,
         &params.security_info.connection_status,
         &params.security_info.signed_certificate_timestamp_ids);
   }
 
   return params;
 }
 
 }  // namespace content