Populate .current when navigator.serviceWorker is accessed

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 "base/id_map.h"
@@ skipping 11 matching lines @@
 }
 
 namespace IPC {
 class Message;
 }
 
 namespace content {
 
 class ServiceWorkerMessageFilter;
 struct ServiceWorkerObjectInfo;
+class ServiceWorkerProviderContext;
 class ThreadSafeSender;
 class WebServiceWorkerImpl;
 
 // This class manages communication with the browser process about
 // registration of the service worker, exposed to renderer and worker
 // scripts through methods like navigator.registerServiceWorker().
 class ServiceWorkerDispatcher : public WorkerTaskRunner::Observer {
  public:
   explicit ServiceWorkerDispatcher(ThreadSafeSender* thread_safe_sender);
   virtual ~ServiceWorkerDispatcher();
 
   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,
       blink::WebServiceWorkerProvider::WebServiceWorkerCallbacks* callbacks);
   // Corresponds to navigator.serviceWorker.unregister()
   void UnregisterServiceWorker(
       int provider_id,
       const GURL& pattern,
       blink::WebServiceWorkerProvider::WebServiceWorkerCallbacks* 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 AddScriptClient(int provider_id,
                        blink::WebServiceWorkerProviderClient* client);
   void RemoveScriptClient(int provider_id);
 
   // |thread_safe_sender| needs to be passed in because if the call leads to
   // construction it will be needed.
   static ServiceWorkerDispatcher* GetOrCreateThreadSpecificInstance(
       ThreadSafeSender* thread_safe_sender);
 
   // Unlike GetOrCreateThreadSpecificInstance() this doesn't create a new
   // instance if thread-local instance doesn't exist.
   static ServiceWorkerDispatcher* GetThreadSpecificInstance();
 
  private:
   typedef IDMap<blink::WebServiceWorkerProvider::WebServiceWorkerCallbacks,
       IDMapOwnPointer> CallbackMap;
   typedef std::map<int, blink::WebServiceWorkerProviderClient*> ScriptClientMap;
-  typedef std::map<int, WebServiceWorkerImpl*> ServiceWorkerMap;
+  typedef std::map<int, ServiceWorkerProviderContext*> ProviderContextMap;
+  typedef std::map<int, WebServiceWorkerImpl*> WorkerObjectMap;
+  typedef std::map<int, ServiceWorkerProviderContext*> WorkerToProviderMap;
 
   friend class WebServiceWorkerImpl;
 
   // WorkerTaskRunner::Observer implementation.
   virtual void OnWorkerRunLoopStopped() OVERRIDE;
 
   void OnRegistered(int thread_id,
                     int request_id,
                     const ServiceWorkerObjectInfo& info);
   void OnUnregistered(int thread_id,
                       int request_id);
   void OnRegistrationError(int thread_id,
                            int request_id,
                            blink::WebServiceWorkerError::ErrorType error_type,
                            const base::string16& message);
   void OnServiceWorkerStateChanged(int thread_id,
                                    int handle_id,
                                    blink::WebServiceWorkerState state);
   void OnSetCurrentServiceWorker(int thread_id,
                                  int provider_id,
                                  const ServiceWorkerObjectInfo& info);
 
   // Keeps map from handle_id to ServiceWorker object.
   void AddServiceWorker(int handle_id, WebServiceWorkerImpl* worker);
   void RemoveServiceWorker(int handle_id);
 
   CallbackMap pending_callbacks_;
   ScriptClientMap script_clients_;
-  ServiceWorkerMap service_workers_;
+  ProviderContextMap provider_contexts_;
+  WorkerObjectMap service_workers_;
+
+  // 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_