Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(857)

Unified Diff: content/browser/service_worker/service_worker_register_job.h

Issue 309453002: ServiceWorker: Rename 'pending version' to 'installing' or 'waiting' (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/service_worker/service_worker_register_job.h
diff --git a/content/browser/service_worker/service_worker_register_job.h b/content/browser/service_worker/service_worker_register_job.h
index 6a42b853bf42e0d3f34bf5c2c959b5d04d1f28b4..2d668ede249bd566d778f463d147ada7899db5a7 100644
--- a/content/browser/service_worker/service_worker_register_job.h
+++ b/content/browser/service_worker/service_worker_register_job.h
@@ -57,10 +57,10 @@ class ServiceWorkerRegisterJob : public ServiceWorkerRegisterJobBase {
virtual RegistrationJobType GetType() OVERRIDE;
private:
- FRIEND_TEST_ALL_PREFIXES(ServiceWorkerProviderHostPendingVersionTest,
- AssociatePendingVersionToDocuments);
- FRIEND_TEST_ALL_PREFIXES(ServiceWorkerProviderHostPendingVersionTest,
- DisassociatePendingVersionFromDocuments);
+ FRIEND_TEST_ALL_PREFIXES(ServiceWorkerProviderHostWaitingVersionTest,
+ AssociateWaitingVersionToDocuments);
+ FRIEND_TEST_ALL_PREFIXES(ServiceWorkerProviderHostWaitingVersionTest,
+ DisassociateWaitingVersionFromDocuments);
enum Phase {
INITIAL,
@@ -79,6 +79,8 @@ class ServiceWorkerRegisterJob : public ServiceWorkerRegisterJobBase {
Internal();
~Internal();
scoped_refptr<ServiceWorkerRegistration> registration;
+
+ // Holds 'installing' or 'waiting' version depending on the phase.
scoped_refptr<ServiceWorkerVersion> pending_version;
};
@@ -106,14 +108,14 @@ class ServiceWorkerRegisterJob : public ServiceWorkerRegisterJobBase {
ServiceWorkerRegistration* registration,
ServiceWorkerVersion* version);
- // Associates a pending version to documents matched with a scope of the
+ // Associates a waiting version to documents matched with a scope of the
// version.
- CONTENT_EXPORT static void AssociatePendingVersionToDocuments(
+ CONTENT_EXPORT static void AssociateWaitingVersionToDocuments(
base::WeakPtr<ServiceWorkerContextCore> context,
ServiceWorkerVersion* version);
- // Disassociates a pending version specified by |version_id| from documents.
- CONTENT_EXPORT static void DisassociatePendingVersionFromDocuments(
+ // Disassociates a waiting version specified by |version_id| from documents.
+ CONTENT_EXPORT static void DisassociateWaitingVersionFromDocuments(
base::WeakPtr<ServiceWorkerContextCore> context,
int64 version_id);

Powered by Google App Engine
This is Rietveld 408576698