| Index: content/browser/renderer_host/render_message_filter.cc
|
| diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc
|
| index 113fcaeb95c0eb9b1ea37b75f3df23f07a2cfdef..0bcbf6af337fe2dc21a1a3c4fe16e0acc99d71b4 100644
|
| --- a/content/browser/renderer_host/render_message_filter.cc
|
| +++ b/content/browser/renderer_host/render_message_filter.cc
|
| @@ -397,11 +397,14 @@ bool RenderMessageFilter::OffTheRecord() const {
|
|
|
| void RenderMessageFilter::OnMsgCreateWindow(
|
| const ViewHostMsg_CreateWindow_Params& params,
|
| - int* route_id, int64* cloned_session_storage_namespace_id) {
|
| + int* route_id,
|
| + int* surface_id,
|
| + int64* cloned_session_storage_namespace_id) {
|
| if (!content::GetContentClient()->browser()->CanCreateWindow(
|
| GURL(params.opener_security_origin), params.window_container_type,
|
| resource_context_, render_process_id_)) {
|
| *route_id = MSG_ROUTING_NONE;
|
| + *surface_id = 0;
|
| return;
|
| }
|
|
|
| @@ -410,18 +413,23 @@ void RenderMessageFilter::OnMsgCreateWindow(
|
| params.session_storage_namespace_id);
|
| render_widget_helper_->CreateNewWindow(params,
|
| peer_handle(),
|
| - route_id);
|
| + route_id,
|
| + surface_id);
|
| }
|
|
|
| void RenderMessageFilter::OnMsgCreateWidget(int opener_id,
|
| WebKit::WebPopupType popup_type,
|
| - int* route_id) {
|
| - render_widget_helper_->CreateNewWidget(opener_id, popup_type, route_id);
|
| + int* route_id,
|
| + int* surface_id) {
|
| + render_widget_helper_->CreateNewWidget(
|
| + opener_id, popup_type, route_id, surface_id);
|
| }
|
|
|
| void RenderMessageFilter::OnMsgCreateFullscreenWidget(int opener_id,
|
| - int* route_id) {
|
| - render_widget_helper_->CreateNewFullscreenWidget(opener_id, route_id);
|
| + int* route_id,
|
| + int* surface_id) {
|
| + render_widget_helper_->CreateNewFullscreenWidget(
|
| + opener_id, route_id, surface_id);
|
| }
|
|
|
| void RenderMessageFilter::OnSetCookie(const IPC::Message& message,
|
|
|