Remove WebHistoryItem child usage

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/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) {
+    const blink::WebContextMenuData& data, const PageState& state) {
   ContextMenuParams params;
   params.media_type = data.mediaType;
   params.x = data.mousePosition.x;
   params.y = data.mousePosition.y;
   params.link_url = data.linkURL;
   params.unfiltered_link_url = data.linkURL;
   params.src_url = data.srcURL;
   params.has_image_contents = data.hasImageContents;
   params.page_url = data.pageURL;
   params.keyword_url = data.keywordURL;
@@ skipping 12 matching lines @@
   params.frame_charset = data.frameEncoding.utf8();
   params.referrer_policy = data.referrerPolicy;
 
   for (size_t i = 0; i < data.dictionarySuggestions.size(); ++i)
     params.dictionary_suggestions.push_back(data.dictionarySuggestions[i]);
 
   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 = HistoryItemToPageState(data.frameHistoryItem);
+  params.frame_page_state = state;

[Nate Chapin, 2014/04/25 21:49:21]

I'm not 100% this is safe, since this was serializing only part of the frame
state before, and now it's serializing the state for the whole page. I can't
think of why you'd want only part of the history tree, though.

[Charlie Reis, 2014/04/28 16:29:00]

I'm not sure what it's used for, so it's hard to say.  We're probably going to
have to break PageState down into FrameState eventually, though, since each
frame's state will be stored on a separate FrameNavigationEntry in the browser
process (and each frame may come from a different renderer process).

Looking closer, it appears to be used in Browser::ViewSourceForFrame, which
loads a subframe URL and state at the top-level of a new tab in view-source mode
(see browser.cc).  That's potentially a problem, since we'll now have the
PageState for the entire page rather than the subframe that we're loading in a
new tab.  (You might even be able to test this out manually, but I'm not sure
how it will manifest.)

I wonder if there's a way to get the PageState for just the frame from |data|.

[Nate Chapin, 2014/04/28 17:31:54]

Yep, right-click in iframe - > "View Page Source" shows the parent frame's
content. Maybe we should expose a way to serialize a single WebHistoryItem
without children? I'll play with it.

 
   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();
     }
 
@@ skipping 13 matching lines @@
         &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