Chromium Code Reviews| OLD | NEW |
|---|---|
| 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_version.h" | 5 #include "content/browser/service_worker/service_worker_version.h" |
| 6 | 6 |
| 7 #include "base/stl_util.h" | 7 #include "base/stl_util.h" |
| 8 #include "content/browser/service_worker/embedded_worker_instance.h" | 8 #include "content/browser/service_worker/embedded_worker_instance.h" |
| 9 #include "content/browser/service_worker/embedded_worker_registry.h" | 9 #include "content/browser/service_worker/embedded_worker_registry.h" |
| 10 #include "content/browser/service_worker/service_worker_context_core.h" | 10 #include "content/browser/service_worker/service_worker_context_core.h" |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 70 << message.type(); | 70 << message.type(); |
| 71 callback.Run(SERVICE_WORKER_ERROR_FAILED); | 71 callback.Run(SERVICE_WORKER_ERROR_FAILED); |
| 72 return; | 72 return; |
| 73 } | 73 } |
| 74 callback.Run(SERVICE_WORKER_OK); | 74 callback.Run(SERVICE_WORKER_OK); |
| 75 } | 75 } |
| 76 | 76 |
| 77 void HandleFetchResponse(const ServiceWorkerVersion::FetchCallback& callback, | 77 void HandleFetchResponse(const ServiceWorkerVersion::FetchCallback& callback, |
| 78 ServiceWorkerStatusCode status, | 78 ServiceWorkerStatusCode status, |
| 79 const IPC::Message& message) { | 79 const IPC::Message& message) { |
| 80 Tuple1<ServiceWorkerFetchResponse> response; | 80 ServiceWorkerFetchEventResult result; |
|
michaeln
2014/03/07 02:48:00
initialize this value to something since its passe
falken
2014/03/07 04:40:25
Done. I also realized we should initialize status_
| |
| 81 ServiceWorkerResponse response; | |
| 81 if (message.type() != ServiceWorkerHostMsg_FetchEventFinished::ID) { | 82 if (message.type() != ServiceWorkerHostMsg_FetchEventFinished::ID) { |
| 82 NOTREACHED() << "Got unexpected response for FetchEvent: " | 83 NOTREACHED() << "Got unexpected response for FetchEvent: " |
| 83 << message.type(); | 84 << message.type(); |
| 84 callback.Run(SERVICE_WORKER_ERROR_FAILED, response.a); | 85 callback.Run(SERVICE_WORKER_ERROR_FAILED, result, response); |
| 85 return; | 86 return; |
| 86 } | 87 } |
| 87 ServiceWorkerHostMsg_FetchEventFinished::Read(&message, &response); | 88 ServiceWorkerHostMsg_FetchEventFinished::Read(&message, &result, &response); |
| 88 callback.Run(status, response.a); | 89 callback.Run(status, result, response); |
| 89 } | 90 } |
| 90 | 91 |
| 91 } // namespace | 92 } // namespace |
| 92 | 93 |
| 93 ServiceWorkerVersion::ServiceWorkerVersion( | 94 ServiceWorkerVersion::ServiceWorkerVersion( |
| 94 ServiceWorkerRegistration* registration, | 95 ServiceWorkerRegistration* registration, |
| 95 EmbeddedWorkerRegistry* worker_registry, | 96 EmbeddedWorkerRegistry* worker_registry, |
| 96 int64 version_id) | 97 int64 version_id) |
| 97 : version_id_(version_id), | 98 : version_id_(version_id), |
| 98 is_shutdown_(false), | 99 is_shutdown_(false), |
| (...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 258 if (callback) { | 259 if (callback) { |
| 259 callback->Run(SERVICE_WORKER_OK, message); | 260 callback->Run(SERVICE_WORKER_OK, message); |
| 260 message_callbacks_.Remove(request_id); | 261 message_callbacks_.Remove(request_id); |
| 261 return; | 262 return; |
| 262 } | 263 } |
| 263 NOTREACHED() << "Got unexpected message: " << request_id | 264 NOTREACHED() << "Got unexpected message: " << request_id |
| 264 << " " << message.type(); | 265 << " " << message.type(); |
| 265 } | 266 } |
| 266 | 267 |
| 267 } // namespace content | 268 } // namespace content |
| OLD | NEW |