| commit | 8936121054d9ccfceed16e3b9a01e403cb672d02 | [log] [tgz] |
|---|---|---|
| author | Dmitry Gozman <[email protected]> | Tue Feb 13 16:10:44 2018 |
| committer | Commit Bot <[email protected]> | Tue Feb 13 16:10:44 2018 |
| tree | 9ab06f2b49c789dbcf5d495eff0f1854ec452d58 | |
| parent | cee58ae0922097a9f85623f27c4bec26a71ba9c6 [diff] [blame] |
[DevTools] Show OOPIFs as children of local frames in navigator - Plumb devtools_frame_token to remote parent frame in child frame process. - Report remote parent frame id over protocol. - Introduce ResourceTreeFrame.crossTargetParentFrame(). - Update NavigatorView to account for remote parent frames. Bug: none Change-Id: Ief2327740e16352be4052d0955ca31f9ad80791b Reviewed-on: https://chromium-review.googlesource.com/910449 Reviewed-by: Pavel Feldman <[email protected]> Reviewed-by: Daniel Cheng <[email protected]> Commit-Queue: Dmitry Gozman <[email protected]> Cr-Commit-Position: refs/heads/master@{#536367}
diff --git a/content/renderer/render_frame_proxy.h b/content/renderer/render_frame_proxy.h index 23a98bf7..656d3f39 100644 --- a/content/renderer/render_frame_proxy.h +++ b/content/renderer/render_frame_proxy.h
@@ -106,7 +106,8 @@ int render_view_routing_id, blink::WebFrame* opener, int parent_routing_id, - const FrameReplicationState& replicated_state); + const FrameReplicationState& replicated_state, + const base::UnguessableToken& devtools_frame_token); // Returns the RenderFrameProxy for the given routing ID. static RenderFrameProxy* FromRoutingID(int routing_id);