OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/browser/renderer_host/render_widget_helper.h" | 5 #include "content/browser/renderer_host/render_widget_helper.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
9 #include "base/eintr_wrapper.h" | 9 #include "base/eintr_wrapper.h" |
10 #include "base/threading/thread.h" | 10 #include "base/threading/thread.h" |
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
208 void RenderWidgetHelper::OnCrossSiteSwapOutACK( | 208 void RenderWidgetHelper::OnCrossSiteSwapOutACK( |
209 const ViewMsg_SwapOut_Params& params) { | 209 const ViewMsg_SwapOut_Params& params) { |
210 resource_dispatcher_host_->OnSwapOutACK(params); | 210 resource_dispatcher_host_->OnSwapOutACK(params); |
211 } | 211 } |
212 | 212 |
213 void RenderWidgetHelper::CreateNewWindow( | 213 void RenderWidgetHelper::CreateNewWindow( |
214 const ViewHostMsg_CreateWindow_Params& params, | 214 const ViewHostMsg_CreateWindow_Params& params, |
215 base::ProcessHandle render_process, | 215 base::ProcessHandle render_process, |
216 int* route_id, | 216 int* route_id, |
217 int* surface_id) { | 217 int* surface_id) { |
218 *route_id = GetNextRoutingID(); | 218 if (params.opener_suppressed) { |
219 *surface_id = GpuSurfaceTracker::Get()->AddSurfaceForRenderer( | 219 // If the opener is supppressed, we should open the window in a new |
220 render_process_id_, *route_id); | 220 // BrowsingInstance, and thus a new process. That means the current |
221 // Block resource requests until the view is created, since the HWND might be | 221 // renderer process will not be able to route messages to it. Because of |
222 // needed if a response ends up creating a plugin. | 222 // this, we will immediately show and navigate the window in |
223 resource_dispatcher_host_->BlockRequestsForRoute( | 223 // OnCreateWindowOnUI, using the params provided here. |
224 render_process_id_, *route_id); | 224 *route_id = MSG_ROUTING_NONE; |
| 225 *surface_id = 0; |
| 226 } else { |
| 227 *route_id = GetNextRoutingID(); |
| 228 *surface_id = GpuSurfaceTracker::Get()->AddSurfaceForRenderer( |
| 229 render_process_id_, *route_id); |
| 230 // Block resource requests until the view is created, since the HWND might |
| 231 // be needed if a response ends up creating a plugin. |
| 232 resource_dispatcher_host_->BlockRequestsForRoute( |
| 233 render_process_id_, *route_id); |
| 234 } |
225 | 235 |
226 BrowserThread::PostTask( | 236 BrowserThread::PostTask( |
227 BrowserThread::UI, FROM_HERE, | 237 BrowserThread::UI, FROM_HERE, |
228 base::Bind(&RenderWidgetHelper::OnCreateWindowOnUI, | 238 base::Bind(&RenderWidgetHelper::OnCreateWindowOnUI, |
229 this, params, *route_id)); | 239 this, params, *route_id)); |
230 } | 240 } |
231 | 241 |
232 void RenderWidgetHelper::OnCreateWindowOnUI( | 242 void RenderWidgetHelper::OnCreateWindowOnUI( |
233 const ViewHostMsg_CreateWindow_Params& params, | 243 const ViewHostMsg_CreateWindow_Params& params, |
234 int route_id) { | 244 int route_id) { |
235 RenderViewHostImpl* host = | 245 RenderViewHostImpl* host = |
236 RenderViewHostImpl::FromID(render_process_id_, params.opener_id); | 246 RenderViewHostImpl::FromID(render_process_id_, params.opener_id); |
237 if (host) | 247 if (host) |
238 host->CreateNewWindow(route_id, params); | 248 host->CreateNewWindow(route_id, params); |
239 | 249 |
240 BrowserThread::PostTask( | 250 // We only need to resume blocked requests if we used a valid route_id. |
241 BrowserThread::IO, FROM_HERE, | 251 // See CreateNewWindow. |
242 base::Bind(&RenderWidgetHelper::OnCreateWindowOnIO, this, route_id)); | 252 if (route_id != MSG_ROUTING_NONE) { |
| 253 BrowserThread::PostTask( |
| 254 BrowserThread::IO, FROM_HERE, |
| 255 base::Bind(&RenderWidgetHelper::OnCreateWindowOnIO, this, route_id)); |
| 256 } |
243 } | 257 } |
244 | 258 |
245 void RenderWidgetHelper::OnCreateWindowOnIO(int route_id) { | 259 void RenderWidgetHelper::OnCreateWindowOnIO(int route_id) { |
246 resource_dispatcher_host_->ResumeBlockedRequestsForRoute( | 260 resource_dispatcher_host_->ResumeBlockedRequestsForRoute( |
247 render_process_id_, route_id); | 261 render_process_id_, route_id); |
248 } | 262 } |
249 | 263 |
250 void RenderWidgetHelper::CreateNewWidget(int opener_id, | 264 void RenderWidgetHelper::CreateNewWidget(int opener_id, |
251 WebKit::WebPopupType popup_type, | 265 WebKit::WebPopupType popup_type, |
252 int* route_id, | 266 int* route_id, |
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
339 void RenderWidgetHelper::ClearAllocatedDIBs() { | 353 void RenderWidgetHelper::ClearAllocatedDIBs() { |
340 for (std::map<TransportDIB::Id, int>::iterator | 354 for (std::map<TransportDIB::Id, int>::iterator |
341 i = allocated_dibs_.begin(); i != allocated_dibs_.end(); ++i) { | 355 i = allocated_dibs_.begin(); i != allocated_dibs_.end(); ++i) { |
342 if (HANDLE_EINTR(close(i->second)) < 0) | 356 if (HANDLE_EINTR(close(i->second)) < 0) |
343 PLOG(ERROR) << "close: " << i->first; | 357 PLOG(ERROR) << "close: " << i->first; |
344 } | 358 } |
345 | 359 |
346 allocated_dibs_.clear(); | 360 allocated_dibs_.clear(); |
347 } | 361 } |
348 #endif | 362 #endif |
OLD | NEW |