Explicitly indicate widget_route_id for widget showing.
ViewHostMsg_ShowWidget and ViewHostMsg_ShowFullscreenWidgetresult in
a ViewMsg_SetBounds_ACK message sent to the shown widget. However
these messages are handled by RenderViewHostImpl with the routing_id
of the widget taken as a data parameter. Since it's easy to get
confused about which routing ID is going where this CL renames
the local variables to widget_route_id making it clearer which object
is being targeted by each message.
Bug: 545684
Change-Id: Iba00a3bf8bcd52b43a42a6b49be4275a22ff54f9
Reviewed-on: https://chromium-review.googlesource.com/1228988
Reviewed-by: danakj <[email protected]>
Reviewed-by: Nasko Oskov <[email protected]>
Commit-Queue: Albert J. Wong <[email protected]>
Cr-Commit-Position: refs/heads/master@{#592046}diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 5d4b922..3addb11e 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -2750,16 +2750,16 @@
}
void WebContentsImpl::CreateNewWidget(int32_t render_process_id,
- int32_t route_id,
+ int32_t widget_route_id,
mojom::WidgetPtr widget) {
- CreateNewWidget(render_process_id, route_id, /*is_fullscreen=*/false,
+ CreateNewWidget(render_process_id, widget_route_id, /*is_fullscreen=*/false,
std::move(widget));
}
void WebContentsImpl::CreateNewFullscreenWidget(int32_t render_process_id,
- int32_t route_id,
+ int32_t widget_route_id,
mojom::WidgetPtr widget) {
- CreateNewWidget(render_process_id, route_id, /*is_fullscreen=*/true,
+ CreateNewWidget(render_process_id, widget_route_id, /*is_fullscreen=*/true,
std::move(widget));
}
@@ -2824,14 +2824,14 @@
}
void WebContentsImpl::ShowCreatedWidget(int process_id,
- int route_id,
+ int widget_route_id,
const gfx::Rect& initial_rect) {
- ShowCreatedWidget(process_id, route_id, false, initial_rect);
+ ShowCreatedWidget(process_id, widget_route_id, false, initial_rect);
}
void WebContentsImpl::ShowCreatedFullscreenWidget(int process_id,
- int route_id) {
- ShowCreatedWidget(process_id, route_id, true, gfx::Rect());
+ int widget_route_id) {
+ ShowCreatedWidget(process_id, widget_route_id, true, gfx::Rect());
}
void WebContentsImpl::ShowCreatedWidget(int process_id,
