| 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 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 225 | 225 |
| 226 BrowserThread::PostTask( | 226 BrowserThread::PostTask( |
| 227 BrowserThread::UI, FROM_HERE, | 227 BrowserThread::UI, FROM_HERE, |
| 228 base::Bind(&RenderWidgetHelper::OnCreateWindowOnUI, | 228 base::Bind(&RenderWidgetHelper::OnCreateWindowOnUI, |
| 229 this, params, *route_id)); | 229 this, params, *route_id)); |
| 230 } | 230 } |
| 231 | 231 |
| 232 void RenderWidgetHelper::OnCreateWindowOnUI( | 232 void RenderWidgetHelper::OnCreateWindowOnUI( |
| 233 const ViewHostMsg_CreateWindow_Params& params, | 233 const ViewHostMsg_CreateWindow_Params& params, |
| 234 int route_id) { | 234 int route_id) { |
| 235 RenderViewHost* host = | 235 RenderViewHostImpl* host = |
| 236 RenderViewHost::FromID(render_process_id_, params.opener_id); | 236 RenderViewHostImpl::FromID(render_process_id_, params.opener_id); |
| 237 if (host) | 237 if (host) |
| 238 host->CreateNewWindow(route_id, params); | 238 host->CreateNewWindow(route_id, params); |
| 239 | 239 |
| 240 BrowserThread::PostTask( | 240 BrowserThread::PostTask( |
| 241 BrowserThread::IO, FROM_HERE, | 241 BrowserThread::IO, FROM_HERE, |
| 242 base::Bind(&RenderWidgetHelper::OnCreateWindowOnIO, this, route_id)); | 242 base::Bind(&RenderWidgetHelper::OnCreateWindowOnIO, this, route_id)); |
| 243 } | 243 } |
| 244 | 244 |
| 245 void RenderWidgetHelper::OnCreateWindowOnIO(int route_id) { | 245 void RenderWidgetHelper::OnCreateWindowOnIO(int route_id) { |
| 246 resource_dispatcher_host_->ResumeBlockedRequestsForRoute( | 246 resource_dispatcher_host_->ResumeBlockedRequestsForRoute( |
| (...skipping 22 matching lines...) Expand all Loading... |
| 269 render_process_id_, *route_id); | 269 render_process_id_, *route_id); |
| 270 BrowserThread::PostTask( | 270 BrowserThread::PostTask( |
| 271 BrowserThread::UI, FROM_HERE, | 271 BrowserThread::UI, FROM_HERE, |
| 272 base::Bind( | 272 base::Bind( |
| 273 &RenderWidgetHelper::OnCreateFullscreenWidgetOnUI, this, | 273 &RenderWidgetHelper::OnCreateFullscreenWidgetOnUI, this, |
| 274 opener_id, *route_id)); | 274 opener_id, *route_id)); |
| 275 } | 275 } |
| 276 | 276 |
| 277 void RenderWidgetHelper::OnCreateWidgetOnUI( | 277 void RenderWidgetHelper::OnCreateWidgetOnUI( |
| 278 int opener_id, int route_id, WebKit::WebPopupType popup_type) { | 278 int opener_id, int route_id, WebKit::WebPopupType popup_type) { |
| 279 RenderViewHost* host = RenderViewHost::FromID(render_process_id_, opener_id); | 279 RenderViewHostImpl* host = RenderViewHostImpl::FromID( |
| 280 render_process_id_, opener_id); |
| 280 if (host) | 281 if (host) |
| 281 host->CreateNewWidget(route_id, popup_type); | 282 host->CreateNewWidget(route_id, popup_type); |
| 282 } | 283 } |
| 283 | 284 |
| 284 void RenderWidgetHelper::OnCreateFullscreenWidgetOnUI(int opener_id, | 285 void RenderWidgetHelper::OnCreateFullscreenWidgetOnUI(int opener_id, |
| 285 int route_id) { | 286 int route_id) { |
| 286 RenderViewHost* host = RenderViewHost::FromID(render_process_id_, opener_id); | 287 RenderViewHostImpl* host = RenderViewHostImpl::FromID( |
| 288 render_process_id_, opener_id); |
| 287 if (host) | 289 if (host) |
| 288 host->CreateNewFullscreenWidget(route_id); | 290 host->CreateNewFullscreenWidget(route_id); |
| 289 } | 291 } |
| 290 | 292 |
| 291 #if defined(OS_MACOSX) | 293 #if defined(OS_MACOSX) |
| 292 TransportDIB* RenderWidgetHelper::MapTransportDIB(TransportDIB::Id dib_id) { | 294 TransportDIB* RenderWidgetHelper::MapTransportDIB(TransportDIB::Id dib_id) { |
| 293 base::AutoLock locked(allocated_dibs_lock_); | 295 base::AutoLock locked(allocated_dibs_lock_); |
| 294 | 296 |
| 295 const std::map<TransportDIB::Id, int>::iterator | 297 const std::map<TransportDIB::Id, int>::iterator |
| 296 i = allocated_dibs_.find(dib_id); | 298 i = allocated_dibs_.find(dib_id); |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 337 void RenderWidgetHelper::ClearAllocatedDIBs() { | 339 void RenderWidgetHelper::ClearAllocatedDIBs() { |
| 338 for (std::map<TransportDIB::Id, int>::iterator | 340 for (std::map<TransportDIB::Id, int>::iterator |
| 339 i = allocated_dibs_.begin(); i != allocated_dibs_.end(); ++i) { | 341 i = allocated_dibs_.begin(); i != allocated_dibs_.end(); ++i) { |
| 340 if (HANDLE_EINTR(close(i->second)) < 0) | 342 if (HANDLE_EINTR(close(i->second)) < 0) |
| 341 PLOG(ERROR) << "close: " << i->first; | 343 PLOG(ERROR) << "close: " << i->first; |
| 342 } | 344 } |
| 343 | 345 |
| 344 allocated_dibs_.clear(); | 346 allocated_dibs_.clear(); |
| 345 } | 347 } |
| 346 #endif | 348 #endif |
| OLD | NEW |