Content API changes to improve DOM stitching in ThreatDetails code.

components/safe_browsing/renderer/threat_dom_details.cc

 // Copyright (c) 2012 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 "components/safe_browsing/renderer/threat_dom_details.h"
 
 #include <algorithm>
 #include <map>
 #include <unordered_set>
 
@@ skipping 128 matching lines @@
   const GURL& child_url = GURL(full_url);
   if (!child_url.is_empty() && child_url.is_valid()) {
     summary_node->children.push_back(child_url);
   }
 
   SafeBrowsingHostMsg_ThreatDOMDetails_Node child_node;
   child_node.url = child_url;
   child_node.tag_name = element.TagName().Utf8();
   child_node.parent = summary_node->url;
 
+  // The body of an iframe will be in a different renderer. Look up the
+  // routing_id of that renderer and store it with the iframe node.
+  if (child_node.tag_name == "IFRAME" || child_node.tag_name == "FRAME") {

[dmazzoni, 2017/05/01 20:10:07]

Checking the tag name seems brittle to me, even though it
should work. I'd just call WebFrame::FromFrameOwnerElement,
since it will just return nullptr if you pass it something
that's not a frame.

[lpz, 2017/05/02 19:36:24]

Thanks, done.

+    blink::WebFrame* subwebframe =
+        blink::WebFrame::FromFrameOwnerElement(element);
+    child_node.other_frame_routing_id =
+        content::RenderFrame::GetRoutingIdForWebFrame(subwebframe);
+  }
+
   // Populate the element's attributes, but only collect the ones that are
   // configured in the finch study.
   const auto& tag_attribute_iter = std::find_if(
       tag_and_attributes_list.begin(), tag_and_attributes_list.end(),
       TagNameIs(base::ToLowerASCII(child_node.tag_name)));
   if (tag_attribute_iter != tag_and_attributes_list.end()) {
     const std::vector<std::string> attributes_to_collect =
         tag_attribute_iter->attributes;
     for (const std::string& attribute : attributes_to_collect) {
       blink::WebString attr_webstring = blink::WebString::FromASCII(attribute);
@@ skipping 139 matching lines @@
     }
   }
   resources->push_back(details_node);
 }
 
 void ThreatDOMDetails::OnDestruct() {
   delete this;
 }
 
 }  // namespace safe_browsing