ServiceWorker: Make "ready" fetches registration from browser process(2/3).

content/child/service_worker/service_worker_dispatcher.h

 // 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.
 
 #ifndef CONTENT_CHILD_SERVICE_WORKER_SERVICE_WORKER_DISPATCHER_H_
 #define CONTENT_CHILD_SERVICE_WORKER_SERVICE_WORKER_DISPATCHER_H_
 
 #include <map>
 #include <vector>
 
 #include "base/id_map.h"
 #include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"

[falken, 2015/03/09 06:29:23]

why add this?

[xiang, 2015/03/09 06:46:13]

Done, forgot to remove it.

 #include "base/strings/string16.h"
 #include "content/child/worker_task_runner.h"
 #include "third_party/WebKit/public/platform/WebServiceWorkerError.h"
 #include "third_party/WebKit/public/platform/WebServiceWorkerProvider.h"
 #include "third_party/WebKit/public/platform/WebServiceWorkerState.h"
 
 class GURL;
 
 namespace blink {
 class WebURL;
@@ skipping 21 matching lines @@
 class ServiceWorkerDispatcher : public WorkerTaskRunner::Observer {
  public:
   typedef blink::WebServiceWorkerProvider::WebServiceWorkerRegistrationCallbacks
       WebServiceWorkerRegistrationCallbacks;
   typedef
       blink::WebServiceWorkerProvider::WebServiceWorkerUnregistrationCallbacks
       WebServiceWorkerUnregistrationCallbacks;
   typedef
       blink::WebServiceWorkerProvider::WebServiceWorkerGetRegistrationCallbacks
       WebServiceWorkerGetRegistrationCallbacks;
+  typedef blink::WebServiceWorkerProvider::
+      WebServiceWorkerGetRegistrationForReadyCallbacks
+          WebServiceWorkerGetRegistrationForReadyCallbacks;
 
   explicit ServiceWorkerDispatcher(ThreadSafeSender* thread_safe_sender);
   ~ServiceWorkerDispatcher() override;
 
   void OnMessageReceived(const IPC::Message& msg);
   bool Send(IPC::Message* msg);
 
   // Corresponds to navigator.serviceWorker.register()
   void RegisterServiceWorker(
       int provider_id,
       const GURL& pattern,
       const GURL& script_url,
       WebServiceWorkerRegistrationCallbacks* callbacks);
   // Corresponds to navigator.serviceWorker.unregister()
   void UnregisterServiceWorker(
       int provider_id,
       const GURL& pattern,
       WebServiceWorkerUnregistrationCallbacks* callbacks);
   // Corresponds to navigator.serviceWorker.getRegistration()
   void GetRegistration(
       int provider_id,
       const GURL& document_url,
       WebServiceWorkerRegistrationCallbacks* callbacks);
 
+  void GetRegistrationForReady(
+      int provider_id,
+      WebServiceWorkerGetRegistrationForReadyCallbacks* callbacks);
+
   // Called when a new provider context for a document is created. Usually
   // this happens when a new document is being loaded, and is called much
   // earlier than AddScriptClient.
   // (This is attached only to the document thread's ServiceWorkerDispatcher)
   void AddProviderContext(ServiceWorkerProviderContext* provider_context);
   void RemoveProviderContext(ServiceWorkerProviderContext* provider_context);
 
   // Called when navigator.serviceWorker is instantiated or detached
   // for a document whose provider can be identified by |provider_id|.
   void AddProviderClient(int provider_id,
@@ skipping 42 matching lines @@
   // instance if thread-local instance doesn't exist.
   static ServiceWorkerDispatcher* GetThreadSpecificInstance();
 
  private:
   typedef IDMap<WebServiceWorkerRegistrationCallbacks,
       IDMapOwnPointer> RegistrationCallbackMap;
   typedef IDMap<WebServiceWorkerUnregistrationCallbacks,
       IDMapOwnPointer> UnregistrationCallbackMap;
   typedef IDMap<WebServiceWorkerGetRegistrationCallbacks,
       IDMapOwnPointer> GetRegistrationCallbackMap;
+  typedef IDMap<WebServiceWorkerGetRegistrationForReadyCallbacks,
+      IDMapOwnPointer> GetRegistrationForReadyCallbackMap;
 
   typedef std::map<int, blink::WebServiceWorkerProviderClient*>
       ProviderClientMap;
   typedef std::map<int, ServiceWorkerProviderContext*> ProviderContextMap;
   typedef std::map<int, ServiceWorkerProviderContext*> WorkerToProviderMap;
   typedef std::map<int, WebServiceWorkerImpl*> WorkerObjectMap;
   typedef std::map<int, WebServiceWorkerRegistrationImpl*>
       RegistrationObjectMap;
 
   friend class WebServiceWorkerImpl;
@@ skipping 17 matching lines @@
                     int request_id,
                     const ServiceWorkerRegistrationObjectInfo& info,
                     const ServiceWorkerVersionAttributes& attrs);
   void OnUnregistered(int thread_id,
                       int request_id,
                       bool is_success);
   void OnDidGetRegistration(int thread_id,
                             int request_id,
                             const ServiceWorkerRegistrationObjectInfo& info,
                             const ServiceWorkerVersionAttributes& attrs);
+  void OnDidGetRegistrationForReady(
+      int thread_id,
+      int request_id,
+      const ServiceWorkerRegistrationObjectInfo& info,
+      const ServiceWorkerVersionAttributes& attrs);
   void OnRegistrationError(int thread_id,
                            int request_id,
                            blink::WebServiceWorkerError::ErrorType error_type,
                            const base::string16& message);
   void OnUnregistrationError(int thread_id,
                              int request_id,
                              blink::WebServiceWorkerError::ErrorType error_type,
                              const base::string16& message);
   void OnGetRegistrationError(
       int thread_id,
@@ skipping 14 matching lines @@
                                     int provider_id,
                                     const ServiceWorkerObjectInfo& info,
                                     bool should_notify_controllerchange);
   void OnPostMessage(
       int thread_id,
       int provider_id,
       const base::string16& message,
       const std::vector<TransferredMessagePort>& sent_message_ports,
       const std::vector<int>& new_routing_ids);
 
-  void SetReadyRegistration(
-      int provider_id,
-      int registration_handle_id);
-
   // Keeps map from handle_id to ServiceWorker object.
   void AddServiceWorker(int handle_id, WebServiceWorkerImpl* worker);
   void RemoveServiceWorker(int handle_id);
 
   // Keeps map from registration_handle_id to ServiceWorkerRegistration object.
   void AddServiceWorkerRegistration(
       int registration_handle_id,
       WebServiceWorkerRegistrationImpl* registration);
   void RemoveServiceWorkerRegistration(
       int registration_handle_id);
 
   WebServiceWorkerRegistrationImpl* FindOrCreateRegistration(
       const ServiceWorkerRegistrationObjectInfo& info,
       const ServiceWorkerVersionAttributes& attrs);
 
   RegistrationCallbackMap pending_registration_callbacks_;
   UnregistrationCallbackMap pending_unregistration_callbacks_;
   GetRegistrationCallbackMap pending_get_registration_callbacks_;
+  GetRegistrationForReadyCallbackMap get_for_ready_callbacks_;
 
   ProviderClientMap provider_clients_;
   ProviderContextMap provider_contexts_;
 
   WorkerObjectMap service_workers_;
   RegistrationObjectMap registrations_;
 
   // A map for ServiceWorkers that are associated to a particular document
   // (e.g. as .current).
   WorkerToProviderMap worker_to_provider_;
 
   scoped_refptr<ThreadSafeSender> thread_safe_sender_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceWorkerDispatcher);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_CHILD_SERVICE_WORKER_SERVICE_WORKER_DISPATCHER_H_