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

Unified Diff: content/browser/service_worker/service_worker_version.cc

Issue 871853002: ServiceWorker: add ServiceWorkerClients.claim() support (2/3). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove assignment within conditional expression Created 5 years, 10 months 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/service_worker/service_worker_version.cc
diff --git a/content/browser/service_worker/service_worker_version.cc b/content/browser/service_worker/service_worker_version.cc
index 94dce9ae31180c588055f7453e524f9351cd5433..bb6ba5b2f0772640ff60a985f1a012fbc258ac89 100644
--- a/content/browser/service_worker/service_worker_version.cc
+++ b/content/browser/service_worker/service_worker_version.cc
@@ -8,6 +8,7 @@
#include "base/memory/ref_counted.h"
#include "base/stl_util.h"
#include "base/strings/string16.h"
+#include "base/strings/utf_string_conversions.h"
#include "content/browser/message_port_message_filter.h"
#include "content/browser/message_port_service.h"
#include "content/browser/service_worker/embedded_worker_instance.h"
@@ -71,6 +72,12 @@ const int64 kStopDoomedWorkerDelay = 5; // 5 secs.
// Default delay for scheduled update.
const int kUpdateDelaySeconds = 1;
+const char kClaimClientsStateErrorMesage[] =
+ "Only the active worker can claim clients.";
+
+const char kClaimClientsShutdownErrorMesage[] =
+ "Failed to claim clients due to Service Worker system shutdown.";
+
void RunSoon(const base::Closure& callback) {
if (!callback.is_null())
base::MessageLoop::current()->PostTask(FROM_HERE, callback);
@@ -800,6 +807,8 @@ bool ServiceWorkerVersion::OnMessageReceived(const IPC::Message& message) {
OnGetClientInfoError)
IPC_MESSAGE_HANDLER(ServiceWorkerHostMsg_SkipWaiting,
OnSkipWaiting)
+ IPC_MESSAGE_HANDLER(ServiceWorkerHostMsg_ClaimClients,
+ OnClaimClients)
IPC_MESSAGE_UNHANDLED(handled = false)
IPC_END_MESSAGE_MAP()
return handled;
@@ -1105,6 +1114,45 @@ void ServiceWorkerVersion::DidSkipWaiting(int request_id) {
embedded_worker_->SendMessage(ServiceWorkerMsg_DidSkipWaiting(request_id));
}
+void ServiceWorkerVersion::OnClaimClients(int request_id) {
+ StatusCallback callback = base::Bind(&ServiceWorkerVersion::DidClaimClients,
+ weak_factory_.GetWeakPtr(), request_id);
+ if (status_ != ACTIVATING && status_ != ACTIVATED) {
+ callback.Run(SERVICE_WORKER_ERROR_STATE);
+ return;
+ }
+ if (!context_) {
+ callback.Run(SERVICE_WORKER_ERROR_ABORT);
+ return;
+ }
+
+ ServiceWorkerRegistration* registration =
+ context_->GetLiveRegistration(registration_id_);
+ if (!registration) {
+ callback.Run(SERVICE_WORKER_ERROR_ABORT);
+ return;
+ }
+ registration->ClaimClients(callback);
+}
+
+void ServiceWorkerVersion::DidClaimClients(
+ int request_id, ServiceWorkerStatusCode status) {
+ if (status == SERVICE_WORKER_ERROR_STATE) {
+ embedded_worker_->SendMessage(ServiceWorkerMsg_ClaimClientsError(
+ request_id, blink::WebServiceWorkerError::ErrorTypeState,
+ base::ASCIIToUTF16(kClaimClientsStateErrorMesage)));
+ return;
+ }
+ if (status == SERVICE_WORKER_ERROR_ABORT) {
+ embedded_worker_->SendMessage(ServiceWorkerMsg_ClaimClientsError(
+ request_id, blink::WebServiceWorkerError::ErrorTypeAbort,
+ base::ASCIIToUTF16(kClaimClientsShutdownErrorMesage)));
+ return;
+ }
+ DCHECK(status == SERVICE_WORKER_OK);
+ embedded_worker_->SendMessage(ServiceWorkerMsg_DidClaimClients(request_id));
+}
+
void ServiceWorkerVersion::DidGetClientInfo(
int client_id,
scoped_refptr<GetClientDocumentsCallback> callback,
« no previous file with comments | « content/browser/service_worker/service_worker_version.h ('k') | content/child/service_worker/service_worker_dispatcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698