Content API changes to improve DOM stitching in ThreatDetails code.

content/renderer/render_frame_impl.cc

 // Copyright 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/render_frame_impl.h"
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 1044 matching lines @@
 // static
 void RenderFrame::ForEach(RenderFrameVisitor* visitor) {
   FrameMap* frames = g_frame_map.Pointer();
   for (FrameMap::iterator it = frames->begin(); it != frames->end(); ++it) {
     if (!visitor->Visit(it->second))
       return;
   }
 }
 
 // static
+int RenderFrame::GetRoutingIdForWebFrame(blink::WebFrame* web_frame) {

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

Do you need this if it's just a one-liner?

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

GetRoutingIdForFrameOrProxy is from web_frame_utils, which isn't public, so I'm
exposing it through this method.
Or did you mean that I should just inline it in the header? In which case that
seems inconsistent with the rest of the code here - there are a bunch of
1-liners in this file and no code in render_frame.h

[dmazzoni, 2017/05/05 17:32:28]

No preference, just curious if there's some way to have just one
function to do the same thing. Could it be added to render_frame.h
and then deleted from web_frame_utils, so that everyone could just
call RenderFrame::GetRoutingIdForWebFrame?

If not, this is fine.

[lpz, 2017/05/10 14:21:08]

Will defer to creis@ - any preference on this?

[Charlie Reis, 2017/05/10 22:17:49]

With the new API, it's a little less immediately obvious within implementation
code that the routing ID could be for a frame or proxy, but I think that's
probably ok.  I'm fine with Dominic's suggestion to just replace
GetRoutingIdForFrameOrProxy with RenderFrame::GetRoutingIdForWebFrame.

[lpz, 2017/05/16 15:19:57]

Done.

+  return GetRoutingIdForFrameOrProxy(web_frame);
+}
+
+// static
 RenderFrameImpl* RenderFrameImpl::FromWebFrame(blink::WebFrame* web_frame) {
   FrameMap::iterator iter = g_frame_map.Get().find(web_frame);
   if (iter != g_frame_map.Get().end())
     return iter->second;
   return NULL;
 }
 
 // static
 void RenderFrameImpl::InstallCreateHook(
     CreateRenderFrameImplFunction create_render_frame_impl) {
@@ skipping 5921 matching lines @@
       policy(info.default_policy),
       replaces_current_history_item(info.replaces_current_history_item),
       history_navigation_in_new_child_frame(
           info.is_history_navigation_in_new_child_frame),
       client_redirect(info.is_client_redirect),
       cache_disabled(info.is_cache_disabled),
       form(info.form),
       source_location(info.source_location) {}
 
 }  // namespace content