| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/renderer/service_worker/service_worker_context_client.h" | 5 #include "content/renderer/service_worker/service_worker_context_client.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/lazy_instance.h" | 9 #include "base/lazy_instance.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 #include "content/child/service_worker/web_service_worker_impl.h" | 24 #include "content/child/service_worker/web_service_worker_impl.h" |
| 25 #include "content/child/service_worker/web_service_worker_provider_impl.h" | 25 #include "content/child/service_worker/web_service_worker_provider_impl.h" |
| 26 #include "content/child/service_worker/web_service_worker_registration_impl.h" | 26 #include "content/child/service_worker/web_service_worker_registration_impl.h" |
| 27 #include "content/child/thread_safe_sender.h" | 27 #include "content/child/thread_safe_sender.h" |
| 28 #include "content/child/webmessageportchannel_impl.h" | 28 #include "content/child/webmessageportchannel_impl.h" |
| 29 #include "content/common/devtools_messages.h" | 29 #include "content/common/devtools_messages.h" |
| 30 #include "content/common/message_port_messages.h" | 30 #include "content/common/message_port_messages.h" |
| 31 #include "content/common/mojo/service_registry_impl.h" | 31 #include "content/common/mojo/service_registry_impl.h" |
| 32 #include "content/common/service_worker/embedded_worker_messages.h" | 32 #include "content/common/service_worker/embedded_worker_messages.h" |
| 33 #include "content/common/service_worker/service_worker_messages.h" | 33 #include "content/common/service_worker/service_worker_messages.h" |
| 34 #include "content/public/child/url_conversion.h" |
| 34 #include "content/public/common/referrer.h" | 35 #include "content/public/common/referrer.h" |
| 35 #include "content/public/renderer/content_renderer_client.h" | 36 #include "content/public/renderer/content_renderer_client.h" |
| 36 #include "content/public/renderer/document_state.h" | 37 #include "content/public/renderer/document_state.h" |
| 37 #include "content/renderer/background_sync/background_sync_client_impl.h" | 38 #include "content/renderer/background_sync/background_sync_client_impl.h" |
| 38 #include "content/renderer/devtools/devtools_agent.h" | 39 #include "content/renderer/devtools/devtools_agent.h" |
| 39 #include "content/renderer/render_thread_impl.h" | 40 #include "content/renderer/render_thread_impl.h" |
| 40 #include "content/renderer/service_worker/embedded_worker_dispatcher.h" | 41 #include "content/renderer/service_worker/embedded_worker_dispatcher.h" |
| 41 #include "content/renderer/service_worker/service_worker_type_util.h" | 42 #include "content/renderer/service_worker/service_worker_type_util.h" |
| 42 #include "ipc/ipc_message.h" | 43 #include "ipc/ipc_message.h" |
| 43 #include "ipc/ipc_message_macros.h" | 44 #include "ipc/ipc_message_macros.h" |
| (...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 440 base::Bind(&CallWorkerContextDestroyedOnMainThread, | 441 base::Bind(&CallWorkerContextDestroyedOnMainThread, |
| 441 embedded_worker_id_)); | 442 embedded_worker_id_)); |
| 442 } | 443 } |
| 443 | 444 |
| 444 void ServiceWorkerContextClient::reportException( | 445 void ServiceWorkerContextClient::reportException( |
| 445 const blink::WebString& error_message, | 446 const blink::WebString& error_message, |
| 446 int line_number, | 447 int line_number, |
| 447 int column_number, | 448 int column_number, |
| 448 const blink::WebString& source_url) { | 449 const blink::WebString& source_url) { |
| 449 Send(new EmbeddedWorkerHostMsg_ReportException( | 450 Send(new EmbeddedWorkerHostMsg_ReportException( |
| 450 embedded_worker_id_, | 451 embedded_worker_id_, error_message, line_number, column_number, |
| 451 error_message, | 452 WebStringToGURL(source_url))); |
| 452 line_number, | |
| 453 column_number, GURL(source_url))); | |
| 454 } | 453 } |
| 455 | 454 |
| 456 void ServiceWorkerContextClient::reportConsoleMessage( | 455 void ServiceWorkerContextClient::reportConsoleMessage( |
| 457 int source, | 456 int source, |
| 458 int level, | 457 int level, |
| 459 const blink::WebString& message, | 458 const blink::WebString& message, |
| 460 int line_number, | 459 int line_number, |
| 461 const blink::WebString& source_url) { | 460 const blink::WebString& source_url) { |
| 462 EmbeddedWorkerHostMsg_ReportConsoleMessage_Params params; | 461 EmbeddedWorkerHostMsg_ReportConsoleMessage_Params params; |
| 463 params.source_identifier = source; | 462 params.source_identifier = source; |
| 464 params.message_level = level; | 463 params.message_level = level; |
| 465 params.message = message; | 464 params.message = message; |
| 466 params.line_number = line_number; | 465 params.line_number = line_number; |
| 467 params.source_url = GURL(source_url); | 466 params.source_url = WebStringToGURL(source_url); |
| 468 | 467 |
| 469 Send(new EmbeddedWorkerHostMsg_ReportConsoleMessage( | 468 Send(new EmbeddedWorkerHostMsg_ReportConsoleMessage( |
| 470 embedded_worker_id_, params)); | 469 embedded_worker_id_, params)); |
| 471 } | 470 } |
| 472 | 471 |
| 473 void ServiceWorkerContextClient::sendDevToolsMessage( | 472 void ServiceWorkerContextClient::sendDevToolsMessage( |
| 474 int session_id, | 473 int session_id, |
| 475 int call_id, | 474 int call_id, |
| 476 const blink::WebString& message, | 475 const blink::WebString& message, |
| 477 const blink::WebString& state_cookie) { | 476 const blink::WebString& state_cookie) { |
| (...skipping 506 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 984 } | 983 } |
| 985 | 984 |
| 986 base::WeakPtr<ServiceWorkerContextClient> | 985 base::WeakPtr<ServiceWorkerContextClient> |
| 987 ServiceWorkerContextClient::GetWeakPtr() { | 986 ServiceWorkerContextClient::GetWeakPtr() { |
| 988 DCHECK(worker_task_runner_->RunsTasksOnCurrentThread()); | 987 DCHECK(worker_task_runner_->RunsTasksOnCurrentThread()); |
| 989 DCHECK(context_); | 988 DCHECK(context_); |
| 990 return context_->weak_factory.GetWeakPtr(); | 989 return context_->weak_factory.GetWeakPtr(); |
| 991 } | 990 } |
| 992 | 991 |
| 993 } // namespace content | 992 } // namespace content |
| OLD | NEW |