| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 209 | 209 |
| 210 void WebEmbeddedWorkerImpl::ReattachDevTools(const WebString& host_id, | 210 void WebEmbeddedWorkerImpl::ReattachDevTools(const WebString& host_id, |
| 211 int session_id, | 211 int session_id, |
| 212 const WebString& saved_state) { | 212 const WebString& saved_state) { |
| 213 WebDevToolsAgent* devtools_agent = main_frame_->DevToolsAgent(); | 213 WebDevToolsAgent* devtools_agent = main_frame_->DevToolsAgent(); |
| 214 if (devtools_agent) | 214 if (devtools_agent) |
| 215 devtools_agent->Reattach(host_id, session_id, saved_state); | 215 devtools_agent->Reattach(host_id, session_id, saved_state); |
| 216 ResumeStartup(); | 216 ResumeStartup(); |
| 217 } | 217 } |
| 218 | 218 |
| 219 void WebEmbeddedWorkerImpl::DetachDevTools() { | 219 void WebEmbeddedWorkerImpl::DetachDevTools(int session_id) { |
| 220 WebDevToolsAgent* devtools_agent = main_frame_->DevToolsAgent(); | 220 WebDevToolsAgent* devtools_agent = main_frame_->DevToolsAgent(); |
| 221 if (devtools_agent) | 221 if (devtools_agent) |
| 222 devtools_agent->Detach(); | 222 devtools_agent->Detach(session_id); |
| 223 } | 223 } |
| 224 | 224 |
| 225 void WebEmbeddedWorkerImpl::DispatchDevToolsMessage(int session_id, | 225 void WebEmbeddedWorkerImpl::DispatchDevToolsMessage(int session_id, |
| 226 int call_id, | 226 int call_id, |
| 227 const WebString& method, | 227 const WebString& method, |
| 228 const WebString& message) { | 228 const WebString& message) { |
| 229 if (asked_to_terminate_) | 229 if (asked_to_terminate_) |
| 230 return; | 230 return; |
| 231 WebDevToolsAgent* devtools_agent = main_frame_->DevToolsAgent(); | 231 WebDevToolsAgent* devtools_agent = main_frame_->DevToolsAgent(); |
| 232 if (devtools_agent) | 232 if (devtools_agent) |
| (...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 473 // populate the task runners with null document not to confuse the frame | 473 // populate the task runners with null document not to confuse the frame |
| 474 // scheduler (which will end up using the thread's default task runner). | 474 // scheduler (which will end up using the thread's default task runner). |
| 475 worker_thread_->Start(std::move(startup_data), | 475 worker_thread_->Start(std::move(startup_data), |
| 476 ParentFrameTaskRunners::Create(nullptr)); | 476 ParentFrameTaskRunners::Create(nullptr)); |
| 477 | 477 |
| 478 worker_inspector_proxy_->WorkerThreadCreated(document, worker_thread_.get(), | 478 worker_inspector_proxy_->WorkerThreadCreated(document, worker_thread_.get(), |
| 479 script_url); | 479 script_url); |
| 480 } | 480 } |
| 481 | 481 |
| 482 } // namespace blink | 482 } // namespace blink |
| OLD | NEW |