Populate .current when navigator.serviceWorker is accessed

content/child/service_worker/web_service_worker_impl.h

Index: content/child/service_worker/web_service_worker_impl.h
diff --git a/content/child/service_worker/web_service_worker_impl.h b/content/child/service_worker/web_service_worker_impl.h
index cf9728e5cbfffc7fb0f93bb1d5fa5b83fcae4556..bd23b288ee7c0b9e7327c4559be802e9cfb58072 100644
--- a/content/child/service_worker/web_service_worker_impl.h
+++ b/content/child/service_worker/web_service_worker_impl.h
@@ -20,14 +20,17 @@ class WebServiceWorkerProxy;
 
 namespace content {
 
-class ThreadSafeSender;
+class ScopedServiceWorkerReference;
 struct ServiceWorkerObjectInfo;
+class ThreadSafeSender;
 
 class WebServiceWorkerImpl

[michaeln, 2014/05/01 01:25:18]

similary a comment about how this corresponds to each instance of an object like
navigator.serviceWorker.current or the resolved value of a call to
nav.serviceWorker.register might help

[kinuko, 2014/05/02 10:00:56]

Done.

     : NON_EXPORTED_BASE(public blink::WebServiceWorker) {
  public:
   WebServiceWorkerImpl(const ServiceWorkerObjectInfo& info,
                        ThreadSafeSender* thread_safe_sender);
+  WebServiceWorkerImpl(scoped_ptr<ScopedServiceWorkerReference> worker_ref,
+                       ThreadSafeSender* thread_safe_sender);
   virtual ~WebServiceWorkerImpl();
 
   // Notifies that the service worker's state changed. This function may queue
@@ -47,9 +50,7 @@ class WebServiceWorkerImpl
   // Commits the new state internally and notifies the proxy of the change.
   void ChangeState(blink::WebServiceWorkerState new_state);
 
-  const int handle_id_;
-  const GURL scope_;
-  const GURL url_;
+  scoped_ptr<ScopedServiceWorkerReference> worker_ref_;
   blink::WebServiceWorkerState state_;
   scoped_refptr<ThreadSafeSender> thread_safe_sender_;
   blink::WebServiceWorkerProxy* proxy_;