Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(215)

Side by Side Diff: content/browser/service_worker/service_worker_dispatcher_host.cc

Issue 697593002: ServiceWorker: Registering a malformed script should fail [2/3] (Closed) Base URL: http://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/service_worker/service_worker_dispatcher_host.h" 5 #include "content/browser/service_worker/service_worker_dispatcher_host.h"
6 6
7 #include "base/debug/trace_event.h" 7 #include "base/debug/trace_event.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "content/browser/message_port_message_filter.h" 10 #include "content/browser/message_port_message_filter.h"
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 IPC_MESSAGE_HANDLER(ServiceWorkerHostMsg_SetVersionId, 157 IPC_MESSAGE_HANDLER(ServiceWorkerHostMsg_SetVersionId,
158 OnSetHostedVersionId) 158 OnSetHostedVersionId)
159 IPC_MESSAGE_HANDLER(ServiceWorkerHostMsg_PostMessageToWorker, 159 IPC_MESSAGE_HANDLER(ServiceWorkerHostMsg_PostMessageToWorker,
160 OnPostMessageToWorker) 160 OnPostMessageToWorker)
161 IPC_MESSAGE_HANDLER(EmbeddedWorkerHostMsg_WorkerReadyForInspection, 161 IPC_MESSAGE_HANDLER(EmbeddedWorkerHostMsg_WorkerReadyForInspection,
162 OnWorkerReadyForInspection) 162 OnWorkerReadyForInspection)
163 IPC_MESSAGE_HANDLER(EmbeddedWorkerHostMsg_WorkerScriptLoaded, 163 IPC_MESSAGE_HANDLER(EmbeddedWorkerHostMsg_WorkerScriptLoaded,
164 OnWorkerScriptLoaded) 164 OnWorkerScriptLoaded)
165 IPC_MESSAGE_HANDLER(EmbeddedWorkerHostMsg_WorkerScriptLoadFailed, 165 IPC_MESSAGE_HANDLER(EmbeddedWorkerHostMsg_WorkerScriptLoadFailed,
166 OnWorkerScriptLoadFailed) 166 OnWorkerScriptLoadFailed)
167 IPC_MESSAGE_HANDLER(EmbeddedWorkerHostMsg_WorkerScriptEvaluated,
168 OnWorkerScriptEvaluated)
167 IPC_MESSAGE_HANDLER(EmbeddedWorkerHostMsg_WorkerStarted, 169 IPC_MESSAGE_HANDLER(EmbeddedWorkerHostMsg_WorkerStarted,
168 OnWorkerStarted) 170 OnWorkerStarted)
169 IPC_MESSAGE_HANDLER(EmbeddedWorkerHostMsg_WorkerStopped, 171 IPC_MESSAGE_HANDLER(EmbeddedWorkerHostMsg_WorkerStopped,
170 OnWorkerStopped) 172 OnWorkerStopped)
171 IPC_MESSAGE_HANDLER(EmbeddedWorkerHostMsg_DidPauseAfterDownload, 173 IPC_MESSAGE_HANDLER(EmbeddedWorkerHostMsg_DidPauseAfterDownload,
172 OnPausedAfterDownload) 174 OnPausedAfterDownload)
173 IPC_MESSAGE_HANDLER(EmbeddedWorkerHostMsg_ReportException, 175 IPC_MESSAGE_HANDLER(EmbeddedWorkerHostMsg_ReportException,
174 OnReportException) 176 OnReportException)
175 IPC_MESSAGE_HANDLER(EmbeddedWorkerHostMsg_ReportConsoleMessage, 177 IPC_MESSAGE_HANDLER(EmbeddedWorkerHostMsg_ReportConsoleMessage,
176 OnReportConsoleMessage) 178 OnReportConsoleMessage)
(...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after
608 TRACE_EVENT0("ServiceWorker", 610 TRACE_EVENT0("ServiceWorker",
609 "ServiceWorkerDispatcherHost::OnWorkerScriptLoadFailed"); 611 "ServiceWorkerDispatcherHost::OnWorkerScriptLoadFailed");
610 if (!GetContext()) 612 if (!GetContext())
611 return; 613 return;
612 EmbeddedWorkerRegistry* registry = GetContext()->embedded_worker_registry(); 614 EmbeddedWorkerRegistry* registry = GetContext()->embedded_worker_registry();
613 if (!registry->CanHandle(embedded_worker_id)) 615 if (!registry->CanHandle(embedded_worker_id))
614 return; 616 return;
615 registry->OnWorkerScriptLoadFailed(render_process_id_, embedded_worker_id); 617 registry->OnWorkerScriptLoadFailed(render_process_id_, embedded_worker_id);
616 } 618 }
617 619
620 void ServiceWorkerDispatcherHost::OnWorkerScriptEvaluated(
621 int embedded_worker_id, bool success) {
nasko 2014/11/05 17:40:23 nit: each parameter on new line
nhiroki 2014/11/06 03:04:40 Done.
622 TRACE_EVENT0("ServiceWorker",
623 "ServiceWorkerDispatcherHost::OnWorkerScriptEvaluated");
624 if (!GetContext())
625 return;
626 EmbeddedWorkerRegistry* registry = GetContext()->embedded_worker_registry();
627 if (!registry->CanHandle(embedded_worker_id))
628 return;
629 registry->OnWorkerScriptEvaluated(
630 render_process_id_, embedded_worker_id, success);
631 }
632
618 void ServiceWorkerDispatcherHost::OnWorkerStarted(int embedded_worker_id) { 633 void ServiceWorkerDispatcherHost::OnWorkerStarted(int embedded_worker_id) {
619 TRACE_EVENT0("ServiceWorker", 634 TRACE_EVENT0("ServiceWorker",
620 "ServiceWorkerDispatcherHost::OnWorkerStarted"); 635 "ServiceWorkerDispatcherHost::OnWorkerStarted");
621 if (!GetContext()) 636 if (!GetContext())
622 return; 637 return;
623 EmbeddedWorkerRegistry* registry = GetContext()->embedded_worker_registry(); 638 EmbeddedWorkerRegistry* registry = GetContext()->embedded_worker_registry();
624 if (!registry->CanHandle(embedded_worker_id)) 639 if (!registry->CanHandle(embedded_worker_id))
625 return; 640 return;
626 registry->OnWorkerStarted(render_process_id_, embedded_worker_id); 641 registry->OnWorkerStarted(render_process_id_, embedded_worker_id);
627 } 642 }
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
823 status, &error_type, &error_message); 838 status, &error_type, &error_message);
824 Send(new ServiceWorkerMsg_ServiceWorkerGetRegistrationError( 839 Send(new ServiceWorkerMsg_ServiceWorkerGetRegistrationError(
825 thread_id, request_id, error_type, error_message)); 840 thread_id, request_id, error_type, error_message));
826 } 841 }
827 842
828 ServiceWorkerContextCore* ServiceWorkerDispatcherHost::GetContext() { 843 ServiceWorkerContextCore* ServiceWorkerDispatcherHost::GetContext() {
829 return context_wrapper_->context(); 844 return context_wrapper_->context();
830 } 845 }
831 846
832 } // namespace content 847 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698