| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 "chrome/browser/renderer_host/render_widget_helper.h" | 5 #include "chrome/browser/renderer_host/render_widget_helper.h" |
| 6 | 6 |
| 7 #include "base/eintr_wrapper.h" | 7 #include "base/eintr_wrapper.h" |
| 8 #include "base/thread.h" | 8 #include "base/thread.h" |
| 9 #include "chrome/browser/browser_process.h" | 9 #include "chrome/browser/browser_process.h" |
| 10 #include "chrome/browser/renderer_host/render_process_host.h" | 10 #include "chrome/browser/renderer_host/render_process_host.h" |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 | 77 |
| 78 void RenderWidgetHelper::CancelResourceRequests(int render_widget_id) { | 78 void RenderWidgetHelper::CancelResourceRequests(int render_widget_id) { |
| 79 if (g_browser_process->io_thread() && render_process_id_ != -1) { | 79 if (g_browser_process->io_thread() && render_process_id_ != -1) { |
| 80 g_browser_process->io_thread()->message_loop()->PostTask(FROM_HERE, | 80 g_browser_process->io_thread()->message_loop()->PostTask(FROM_HERE, |
| 81 NewRunnableMethod(this, | 81 NewRunnableMethod(this, |
| 82 &RenderWidgetHelper::OnCancelResourceRequests, | 82 &RenderWidgetHelper::OnCancelResourceRequests, |
| 83 render_widget_id)); | 83 render_widget_id)); |
| 84 } | 84 } |
| 85 } | 85 } |
| 86 | 86 |
| 87 void RenderWidgetHelper::CrossSiteClosePageACK(int new_render_process_host_id, | 87 void RenderWidgetHelper::CrossSiteClosePageACK( |
| 88 int new_request_id) { | 88 const ViewMsg_ClosePage_Params& params) { |
| 89 if (g_browser_process->io_thread()) { | 89 if (g_browser_process->io_thread()) { |
| 90 g_browser_process->io_thread()->message_loop()->PostTask(FROM_HERE, | 90 g_browser_process->io_thread()->message_loop()->PostTask(FROM_HERE, |
| 91 NewRunnableMethod(this, | 91 NewRunnableMethod(this, |
| 92 &RenderWidgetHelper::OnCrossSiteClosePageACK, | 92 &RenderWidgetHelper::OnCrossSiteClosePageACK, |
| 93 new_render_process_host_id, | 93 params)); |
| 94 new_request_id)); | |
| 95 } | 94 } |
| 96 } | 95 } |
| 97 | 96 |
| 98 bool RenderWidgetHelper::WaitForPaintMsg(int render_widget_id, | 97 bool RenderWidgetHelper::WaitForPaintMsg(int render_widget_id, |
| 99 const base::TimeDelta& max_delay, | 98 const base::TimeDelta& max_delay, |
| 100 IPC::Message* msg) { | 99 IPC::Message* msg) { |
| 101 base::TimeTicks time_start = base::TimeTicks::Now(); | 100 base::TimeTicks time_start = base::TimeTicks::Now(); |
| 102 | 101 |
| 103 for (;;) { | 102 for (;;) { |
| 104 PaintMsgProxy* proxy = NULL; | 103 PaintMsgProxy* proxy = NULL; |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 189 host->OnMessageReceived(proxy->message); | 188 host->OnMessageReceived(proxy->message); |
| 190 } | 189 } |
| 191 | 190 |
| 192 void RenderWidgetHelper::OnCancelResourceRequests( | 191 void RenderWidgetHelper::OnCancelResourceRequests( |
| 193 int render_widget_id) { | 192 int render_widget_id) { |
| 194 resource_dispatcher_host_->CancelRequestsForRoute( | 193 resource_dispatcher_host_->CancelRequestsForRoute( |
| 195 render_process_id_, render_widget_id); | 194 render_process_id_, render_widget_id); |
| 196 } | 195 } |
| 197 | 196 |
| 198 void RenderWidgetHelper::OnCrossSiteClosePageACK( | 197 void RenderWidgetHelper::OnCrossSiteClosePageACK( |
| 199 int new_render_process_host_id, | 198 ViewMsg_ClosePage_Params params) { |
| 200 int new_request_id) { | 199 resource_dispatcher_host_->OnClosePageACK(params); |
| 201 resource_dispatcher_host_->OnClosePageACK( | |
| 202 new_render_process_host_id, new_request_id); | |
| 203 } | 200 } |
| 204 | 201 |
| 205 void RenderWidgetHelper::CreateNewWindow(int opener_id, | 202 void RenderWidgetHelper::CreateNewWindow(int opener_id, |
| 206 bool user_gesture, | 203 bool user_gesture, |
| 207 base::ProcessHandle render_process, | 204 base::ProcessHandle render_process, |
| 208 int* route_id, | 205 int* route_id, |
| 209 ModalDialogEvent* modal_dialog_event) { | 206 ModalDialogEvent* modal_dialog_event) { |
| 210 *route_id = GetNextRoutingID(); | 207 *route_id = GetNextRoutingID(); |
| 211 | 208 |
| 212 ModalDialogEvent modal_dialog_event_internal; | 209 ModalDialogEvent modal_dialog_event_internal; |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 342 | 339 |
| 343 void RenderWidgetHelper::ClearAllocatedDIBs() { | 340 void RenderWidgetHelper::ClearAllocatedDIBs() { |
| 344 for (std::map<TransportDIB::Id, int>::iterator | 341 for (std::map<TransportDIB::Id, int>::iterator |
| 345 i = allocated_dibs_.begin(); i != allocated_dibs_.end(); ++i) { | 342 i = allocated_dibs_.begin(); i != allocated_dibs_.end(); ++i) { |
| 346 HANDLE_EINTR(close(i->second)); | 343 HANDLE_EINTR(close(i->second)); |
| 347 } | 344 } |
| 348 | 345 |
| 349 allocated_dibs_.clear(); | 346 allocated_dibs_.clear(); |
| 350 } | 347 } |
| 351 #endif | 348 #endif |
| OLD | NEW |