Unify frame IDs with RenderFrameHost routing IDs.

content/common/frame_messages.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.
 
 // IPC messages for interacting with frames.
 // Multiply-included message file, hence no include guard.
 
 #include "content/common/content_export.h"
 #include "content/common/content_param_traits.h"
 #include "content/common/frame_message_enums.h"
@@ skipping 274 matching lines @@
                     content::CustomContextMenuContext /* custom_context */,
                     unsigned /* action */)
 
 // Tells the renderer to perform the specified navigation, interrupting any
 // existing navigation.
 IPC_MESSAGE_ROUTED1(FrameMsg_Navigate, FrameMsg_Navigate_Params)
 
 // -----------------------------------------------------------------------------
 // Messages sent from the renderer to the browser.
 
-// Sent by the renderer when a child frame is created in the renderer. The
-// |parent_frame_id| and |frame_id| are NOT routing ids. They are
-// renderer-allocated identifiers used for tracking a frame's creation.
+// Sent by the renderer when a child frame is created in the renderer.
 //
 // Each of these messages will have a corresponding FrameHostMsg_Detach message
 // sent when the frame is detached from the DOM.
-//
-// TOOD(ajwong): replace parent_render_frame_id and frame_id with just the
-// routing ids.
-IPC_SYNC_MESSAGE_CONTROL4_1(FrameHostMsg_CreateChildFrame,
-                            int32 /* parent_render_frame_id */,
-                            int64 /* parent_frame_id */,
-                            int64 /* frame_id */,
+IPC_SYNC_MESSAGE_CONTROL2_1(FrameHostMsg_CreateChildFrame,
+                            int32 /* parent_routing_id */,
                             std::string /* frame_name */,
-                            int /* new_render_frame_id */)
+                            int /* new_routing_id */)

[dcheng, 2014/02/20 01:28:03]

Nit: I think it'd look a little better we used identical typenames to refer to
both routing IDs here.

[Charlie Reis, 2014/02/20 01:49:08]

Done.

 
 // Sent by the renderer to the parent RenderFrameHost when a child frame is
 // detached from the DOM.
-IPC_MESSAGE_ROUTED2(FrameHostMsg_Detach,
-                    int64 /* parent_frame_id */,
-                    int64 /* frame_id */)
+IPC_MESSAGE_ROUTED0(FrameHostMsg_Detach)
 
 // Sent when the renderer starts a provisional load for a frame.
 IPC_MESSAGE_ROUTED4(FrameHostMsg_DidStartProvisionalLoadForFrame,
                     int64 /* frame_id */,

[dcheng, 2014/02/20 01:28:03]

These are just routing IDs too now right? Do we want to make our terminology
(and typenames) consistent? For example, should WebFrame::identifier() return a
32-bit integer now?

[Charlie Reis, 2014/02/20 01:49:08]

Technically yes, but I'd rather take another pass and just remove all the
frame_ids from FrameHostMsgs, since they're now redundant with the routing ID on
the message.

                     int64 /* parent_frame_id */,
                     bool /* true if it is the main frame */,
                     GURL /* url */)
 
 // Sent when the renderer fails a provisional load with an error.
 IPC_MESSAGE_ROUTED1(FrameHostMsg_DidFailProvisionalLoadWithError,
                     FrameHostMsg_DidFailProvisionalLoadWithError_Params)
 
 // Sent when a provisional load on the main frame redirects.
 IPC_MESSAGE_ROUTED3(FrameHostMsg_DidRedirectProvisionalLoad,
@@ skipping 99 matching lines @@
 // Instructs the frame to swap out for a cross-site transition, including
 // running the unload event handler. Expects a SwapOut_ACK message when
 // finished.
 IPC_MESSAGE_ROUTED0(FrameMsg_SwapOut)
 
 // Used to tell the parent that the user right clicked on an area of the
 // content area, and a context menu should be shown for it. The params
 // object contains information about the node(s) that were selected when the
 // user right clicked.
 IPC_MESSAGE_ROUTED1(FrameHostMsg_ContextMenu, content::ContextMenuParams)