add error IPC handling to dispatcher

content/child/service_worker/service_worker_dispatcher.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/child/service_worker/service_worker_dispatcher.h"
 
 #include "base/lazy_instance.h"
 #include "base/threading/thread_local.h"
 #include "content/child/service_worker/web_service_worker_impl.h"
 #include "content/child/thread_safe_sender.h"
@@ skipping 18 matching lines @@
   g_dispatcher_tls.Pointer()->Set(this);
 }
 
 ServiceWorkerDispatcher::~ServiceWorkerDispatcher() {
   g_dispatcher_tls.Pointer()->Set(kHasBeenDeleted);
 }
 
 void ServiceWorkerDispatcher::OnMessageReceived(const IPC::Message& msg) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(ServiceWorkerDispatcher, msg)
-    IPC_MESSAGE_HANDLER(ServiceWorkerMsg_ServiceWorkerRegistered,
-                        OnServiceWorkerRegistered)
+    IPC_MESSAGE_HANDLER(ServiceWorkerMsg_ServiceWorkerRegistered, OnRegistered)
     IPC_MESSAGE_HANDLER(ServiceWorkerMsg_ServiceWorkerUnregistered,
-                        OnServiceWorkerUnregistered)
+                        OnUnregistered)
+    IPC_MESSAGE_HANDLER(ServiceWorkerMsg_ServiceWorkerRegistrationError,
+                        OnRegistrationError)

[kinuko, 2013/10/10 07:57:22]

Any particular reason we use a separate IPC for errors? There's a pros/cons
though either way works.

Say, if we're going to add a new IPC request which would just return success or
fail in this family (I had imagined that unregisterSW might fall into this
category), are we going to add OnSuccess IPC?

[michaeln, 2013/10/11 01:29:12]

Either way does work. I was expecting register/registercomplete +
unregister/unregistercomplete pairing of messages. The pros to me are that it's
more obvious whats going on at each step of the way... 
- when looking at the ipc message .h
- when looking at the onxxxcomplete handler, you see all possible complete paths
- its more clear what to do in the "please do it" handler what needs to be done
to complete the call
- its more clear what to do when adding a new request/response type

Fair to say i have a preference for foo/fooresult, bar/barresult pairs.

     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   DCHECK(handled) << "Unhandled message:" << msg.type();
 }
 
 bool ServiceWorkerDispatcher::Send(IPC::Message* msg) {
   return thread_safe_sender_->Send(msg);
 }
 
 static int CurrentWorkerId() {
@@ skipping 30 matching lines @@
   if (g_dispatcher_tls.Pointer()->Get())
     return g_dispatcher_tls.Pointer()->Get();
 
   ServiceWorkerDispatcher* dispatcher =
       new ServiceWorkerDispatcher(thread_safe_sender);
   if (WorkerTaskRunner::Instance()->CurrentWorkerId())
     webkit_glue::WorkerTaskRunner::Instance()->AddStopObserver(dispatcher);
   return dispatcher;
 }
 
-void ServiceWorkerDispatcher::OnServiceWorkerRegistered(
-    int32 thread_id,
-    int32 request_id,
-    int32 service_worker_id) {
+void ServiceWorkerDispatcher::OnRegistered(int32 thread_id,
+                                           int32 request_id,
+                                           int32 service_worker_id) {
   WebServiceWorkerProvider::WebServiceWorkerCallbacks* callbacks =
       pending_callbacks_.Lookup(request_id);
   DCHECK(callbacks);
   if (!callbacks)
     return;
 
   // the browser has to generate the service_worker_id so the same
   // worker can be called from different renderer contexts. However,
   // the impl object doesn't have to be the same instance across calls
   // unless we require the DOM objects to be identical when there's a
   // duplicate registration. So for now we mint a new object each
   // time.
   WebServiceWorkerImpl* worker =
       new WebServiceWorkerImpl(service_worker_id, true);
   callbacks->onSuccess(worker);
   pending_callbacks_.Remove(request_id);
 }
 
-void ServiceWorkerDispatcher::OnServiceWorkerUnregistered(
-    int32 thread_id,
-    int32 request_id,
-    int32 service_worker_id) {
+void ServiceWorkerDispatcher::OnUnregistered(int32 thread_id,
+                                             int32 request_id,
+                                             int32 service_worker_id) {
   WebServiceWorkerProvider::WebServiceWorkerCallbacks* callbacks =
       pending_callbacks_.Lookup(request_id);
   DCHECK(callbacks);
   if (!callbacks)
     return;
 
   // see notes in ServiceWorkerRegistered
   WebServiceWorkerImpl* worker =
       new WebServiceWorkerImpl(service_worker_id, false);
   callbacks->onSuccess(worker);
   pending_callbacks_.Remove(request_id);
 }
 
+void ServiceWorkerDispatcher::OnRegistrationError(int32 thread_id,
+                                                  int32 request_id) {
+  WebServiceWorkerProvider::WebServiceWorkerCallbacks* callbacks =
+      pending_callbacks_.Lookup(request_id);
+  DCHECK(callbacks);
+  if (!callbacks)
+    return;
+
+  callbacks->onError(NULL);

[kinuko, 2013/10/10 07:57:22]

Looks like this method expects WebSW ptr type for now, while this should
probably be evolved to pass something like WebServiceWorkerErrorReason?

https://github.com/slightlyoff/ServiceWorker/blob/master/service_worker.ts#L29

+  pending_callbacks_.Remove(request_id);
+}
+
 void ServiceWorkerDispatcher::OnWorkerRunLoopStopped() { delete this; }
 
 }  // namespace content