Content API changes to improve DOM stitching in ThreatDetails code.

content/public/browser/render_frame_host.h

 // 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.
 
 #ifndef CONTENT_PUBLIC_BROWSER_RENDER_FRAME_HOST_H_
 #define CONTENT_PUBLIC_BROWSER_RENDER_FRAME_HOST_H_
 
 #include <string>
 
 #include "base/callback_forward.h"
@@ skipping 31 matching lines @@
 class RenderProcessHost;
 class RenderViewHost;
 class RenderWidgetHostView;
 class SiteInstance;
 struct FileChooserFileInfo;
 
 // The interface provides a communication conduit with a frame in the renderer.
 class CONTENT_EXPORT RenderFrameHost : public IPC::Listener,
                                        public IPC::Sender {
  public:
+  // Constant used to denote that a lookup of a FrameTreeNodeId has failed.

[Charlie Reis, 2017/05/05 21:03:08]

nit: FrameTreeNode ID

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

Done.

+  static const int kNoFrameTreeNodeId = -1;
+
   // Returns the RenderFrameHost given its ID and the ID of its render process.
   // Returns nullptr if the IDs do not correspond to a live RenderFrameHost.
   static RenderFrameHost* FromID(int render_process_id, int render_frame_id);
 
 #if defined(OS_ANDROID)
   // Globally allows for injecting JavaScript into the main world. This feature
   // is present only to support Android WebView and must not be used in other
   // configurations.
   static void AllowInjectingJavaScriptForAndroidWebView();
 #endif
 
   // Returns a RenderFrameHost given its accessibility tree ID.
   static RenderFrameHost* FromAXTreeID(int ax_tree_id);
 
+  // Returns the FrameTreeNodeId of either the RenderFrameHost or the

[Charlie Reis, 2017/05/05 21:03:08]

nit: FrameTreeNode ID

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

Done.

+  // RenderFrameProxyHost related to the specified |process_id| and |routing_id|
+  // pair, depending on whether they identify a local or remote frame.

[Charlie Reis, 2017/05/05 21:03:08]

Let's rephrase, because RenderFrameProxyHost isn't part of the public API and
the term "remote frame" isn't meaningful in the browser process.  Something
like:

Returns the FrameTreeNode ID corresponding to the specified |process_id| and
|routing_id|. This routing ID pair may represent a placeholder for frame that is
currently rendered in a different process than |process_id|.

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

Done, and also changed to return a RenderFrameHost* instead of int as per
dmazonni's suggestion.

+  static int GetFrameTreeNodeIdForRoutingId(int process_id, int routing_id);
+
   ~RenderFrameHost() override {}
 
   // Returns the route id for this frame.
   virtual int GetRoutingID() = 0;
 
   // Returns the accessibility tree ID for this RenderFrameHost.
   virtual int GetAXTreeID() = 0;
 
   // Returns the SiteInstance grouping all RenderFrameHosts that have script
   // access to this RenderFrameHost, and must therefore live in the same
@@ skipping 179 matching lines @@
 
  private:
   // This interface should only be implemented inside content.
   friend class RenderFrameHostImpl;
   RenderFrameHost() {}
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_RENDER_FRAME_HOST_H_