Adds class ServiceWorkerScriptCacheMap and new ServiceWorkerVersion::Listener methods related to sc…

content/browser/service_worker/service_worker_version.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_BROWSER_SERVICE_WORKER_SERVICE_WORKER_VERSION_H_
 #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_VERSION_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/gtest_prod_util.h"
 #include "base/id_map.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "content/browser/service_worker/embedded_worker_instance.h"
+#include "content/browser/service_worker/service_worker_script_cache_map.h"
 #include "content/common/content_export.h"
 #include "content/common/service_worker/service_worker_status_code.h"
 #include "content/common/service_worker/service_worker_types.h"
 #include "third_party/WebKit/public/platform/WebServiceWorkerEventResult.h"
 
 class GURL;
 
 namespace content {
 
 class EmbeddedWorkerRegistry;
@@ skipping 51 matching lines @@
                                  const base::string16& error_message,
                                  int line_number,
                                  int column_number,
                                  const GURL& source_url) = 0;
     virtual void OnReportConsoleMessage(ServiceWorkerVersion* version,
                                         int source_identifier,
                                         int message_level,
                                         const base::string16& message,
                                         int line_number,
                                         const GURL& source_url) = 0;
+
+    // Notification that the main script resource has been written to
+    // the disk cache. Only called when a version is being initially
+    // installed.
+    virtual void OnMainScriptCached(ServiceWorkerVersion* version,
+                                    bool success) = 0;

[michaeln, 2014/05/13 06:51:00]

i'll have to track down derivatives in tests and fix them to override these too,
either that or make a scriptcache::listener class and have the
register/updatejob listen for these notifications that way.

[kinuko, 2014/05/13 16:14:25]

Looks like these can be in a separate listener class, like ScriptCacheObserver,
as the source of events are a bit different and other listeners won't be
interested in these events?

[kinuko, 2014/05/13 16:14:25]

Is this where we compare scripts to see if it's the same one or not?  In update
case how the version's cache map would look like?

[michaeln, 2014/05/13 22:41:11]

Yes. In the first time and update cases, a versions cache map should have an
entry for the main script url. The storage class will provide a method to
compare two responses given their ids.

[michaeln, 2014/05/13 22:41:11]

Done, ServiceWorkerScriptCacheMap::Observer.

+
+    // Notification that the main script resource and all imports have
+    // been written to the disk cache. Only called when a version is
+    // being initially installed.
+    virtual void OnAllScriptsCached(ServiceWorkerVersion* version,
+                                    bool success) = 0;

[kinuko, 2014/05/13 16:14:25]

Is this where we actually commit the registration with resources?

[michaeln, 2014/05/13 22:41:11]

I think so. There are at least two things of interest when it comes to writing
to disk: scripts are all cached, install event has completed successfully. I
think we commit the registration after both of those have succeeded.

   };
 
   ServiceWorkerVersion(
       ServiceWorkerRegistration* registration,
       int64 version_id,
       base::WeakPtr<ServiceWorkerContextCore> context);
 
   int64 version_id() const { return version_id_; }
   int64 registration_id() const { return registration_id_; }
 
+  const GURL& script_url() const { return script_url_; }
+  const GURL& scope() const { return scope_; }

[nhiroki, 2014/05/13 07:44:34]

scope() doesn't seem to be neccessary for this change.

[michaeln, 2014/05/13 22:41:11]

Done.

+
   RunningStatus running_status() const {
     return static_cast<RunningStatus>(embedded_worker_->status());
   }
 
   ServiceWorkerVersionInfo GetInfo();
 
   Status status() const { return status_; }
 
   // This sets the new status and also run status change callbacks
   // if there're any (see RegisterStatusChangeCallback).
@@ skipping 80 matching lines @@
   void AddPendingControllee(ServiceWorkerProviderHost* provider_host);
   void RemovePendingControllee(ServiceWorkerProviderHost* provider_host);
 
   // Returns if it has (non-pending) controllee.
   bool HasControllee() const { return !controllee_map_.empty(); }
 
   // Adds and removes Listeners.
   void AddListener(Listener* listener);
   void RemoveListener(Listener* listener);
 
+  // Propagates script caching progress to listneners.

[nhiroki, 2014/05/13 07:44:34]

nit: s/listneners/listeners/

[michaeln, 2014/05/13 22:41:11]

removed these methods

+  void NotifyMainScriptCached(bool success);
+  void NotifyAllScriptsCached(bool success);
+
+  ServiceWorkerScriptCacheMap* script_cache_map() { return &script_cache_map_; }
+
   EmbeddedWorkerInstance* embedded_worker() { return embedded_worker_.get(); }
 
+ private:
+  typedef ServiceWorkerVersion self;
+  typedef std::map<ServiceWorkerProviderHost*, int> ControlleeMap;
+  typedef IDMap<ServiceWorkerProviderHost> ControlleeByIDMap;
+  friend class base::RefCounted<ServiceWorkerVersion>;
+
+  virtual ~ServiceWorkerVersion();
+
   // EmbeddedWorkerInstance::Listener overrides:
   virtual void OnStarted() OVERRIDE;
   virtual void OnStopped() OVERRIDE;
   virtual void OnReportException(const base::string16& error_message,
                                  int line_number,
                                  int column_number,
                                  const GURL& source_url) OVERRIDE;
   virtual void OnReportConsoleMessage(int source_identifier,
                                       int message_level,
                                       const base::string16& message,
                                       int line_number,
                                       const GURL& source_url) OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
-  void AddToScriptCache(const GURL& url, int64 resource_id);
-  int64 LookupInScriptCache(const GURL& url);
-
- private:
-  typedef ServiceWorkerVersion self;
-  typedef std::map<ServiceWorkerProviderHost*, int> ControlleeMap;
-  typedef IDMap<ServiceWorkerProviderHost> ControlleeByIDMap;
-  typedef std::map<GURL, int64> ResourceIDMap;
-  friend class base::RefCounted<ServiceWorkerVersion>;
-
-  virtual ~ServiceWorkerVersion();
-
   void RunStartWorkerCallbacksOnError(ServiceWorkerStatusCode status);
 
   void DispatchInstallEventAfterStartWorker(int active_version_id,
                                             const StatusCallback& callback);
   void DispatchActivateEventAfterStartWorker(const StatusCallback& callback);
 
   // Message handlers.
   void OnGetClientDocuments(int request_id);
   void OnActivateEventFinished(int request_id,
                                blink::WebServiceWorkerEventResult result);
@@ skipping 20 matching lines @@
   // Message callbacks.
   IDMap<StatusCallback, IDMapOwnPointer> activate_callbacks_;
   IDMap<StatusCallback, IDMapOwnPointer> install_callbacks_;
   IDMap<FetchCallback, IDMapOwnPointer> fetch_callbacks_;
   IDMap<StatusCallback, IDMapOwnPointer> sync_callbacks_;
 
   ControlleeMap controllee_map_;
   ControlleeByIDMap controllee_by_id_;
   base::WeakPtr<ServiceWorkerContextCore> context_;
   ObserverList<Listener> listeners_;
-
-  ResourceIDMap script_cache_map_;
+  ServiceWorkerScriptCacheMap script_cache_map_;
 
   base::WeakPtrFactory<ServiceWorkerVersion> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceWorkerVersion);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_VERSION_H_