ServiceWorker: Add support for .skipWaiting and controllerchange event(2/3)

content/browser/service_worker/service_worker_registration.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_REGISTRATION_H_
 #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_REGISTRATION_H_
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/logging.h"
@@ skipping 22 matching lines @@
    public:
     virtual void OnVersionAttributesChanged(
         ServiceWorkerRegistration* registration,
         ChangedVersionAttributesMask changed_mask,
         const ServiceWorkerRegistrationInfo& info) {}
     virtual void OnRegistrationFailed(
         ServiceWorkerRegistration* registration) {}
     virtual void OnRegistrationFinishedUninstalling(
         ServiceWorkerRegistration* registration) {}
     virtual void OnUpdateFound(
         ServiceWorkerRegistration* registration) {}

[michaeln, 2014/11/14 23:06:39]

virtual void OnSkippedWaiting(reg) ?

[xiang, 2014/11/17 08:42:10]

Done.

   };
 
   ServiceWorkerRegistration(const GURL& pattern,
                             int64 registration_id,
                             base::WeakPtr<ServiceWorkerContextCore> context);
 
   int64 id() const { return registration_id_; }
   const GURL& pattern() const { return pattern_; }
 
   bool is_deleted() const { return is_deleted_; }
@@ skipping 41 matching lines @@
   // If version is the installing, waiting, active version of this
   // registation, the method will reset that field to NULL, and notify
   // listeners via OnVersionAttributesChanged.
   void UnsetVersion(ServiceWorkerVersion* version);
 
   // Triggers the [[Activate]] algorithm when the currently active version
   // has no controllees. If there are no controllees at the time the method
   // is called, activation is initiated immediately.
   void ActivateWaitingVersionWhenReady();
 
+  // Activate version immediately. Used when skip waiting flag is set.

[falken, 2014/11/14 04:00:15]

The second sentence is a little misleading: it's also called by
ActivateWaitingVersionWhenReady when skip waiting is not set.

[xiang, 2014/11/17 08:42:10]

Done.

+  void ActivateWaitingVersion();
+
   // Triggers the [[ClearRegistration]] algorithm when the currently
   // active version has no controllees. Deletes this registration
   // from storage immediately.
   void ClearWhenReady();
 
   // Restores this registration in storage and cancels the pending
   // [[ClearRegistration]] algorithm.
   void AbortPendingClear(const StatusCallback& callback);
 
   // The time of the most recent update check.
   base::Time last_update_check() const { return last_update_check_; }
   void set_last_update_check(base::Time last) { last_update_check_ = last; }
 
  private:
   friend class base::RefCounted<ServiceWorkerRegistration>;
 
   ~ServiceWorkerRegistration() override;
 
   void SetVersionInternal(
       ServiceWorkerVersion* version,
       scoped_refptr<ServiceWorkerVersion>* data_member,
       int change_flag);
   void UnsetVersionInternal(
       ServiceWorkerVersion* version,
       ChangedVersionAttributesMask* mask);
 
   // ServiceWorkerVersion::Listener override.
   void OnNoControllees(ServiceWorkerVersion* version) override;
 
-  // This method corresponds to the [[Activate]] algorithm.
-  void ActivateWaitingVersion();
+  void PrepareProviderHostsToSkipWaiting();
   void OnActivateEventFinished(
       ServiceWorkerVersion* activating_version,
       ServiceWorkerStatusCode status);
   void OnDeleteFinished(ServiceWorkerStatusCode status);
 
   // This method corresponds to the [[ClearRegistration]] algorithm.
   void Clear();
 
   void OnRestoreFinished(const StatusCallback& callback,
                          scoped_refptr<ServiceWorkerVersion> version,
@@ skipping 12 matching lines @@
   scoped_refptr<ServiceWorkerVersion> installing_version_;
   ObserverList<Listener> listeners_;
   base::WeakPtr<ServiceWorkerContextCore> context_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceWorkerRegistration);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_REGISTRATION_H_