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

Unified Diff: content/browser/service_worker/service_worker_registration.cc

Issue 309453002: ServiceWorker: Rename 'pending version' to 'installing' or 'waiting' (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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_registration.cc
diff --git a/content/browser/service_worker/service_worker_registration.cc b/content/browser/service_worker/service_worker_registration.cc
index 1baeda7ca1a3ae11e6563a6ec8e82db356d8d3a9..1cfba17e31407b85e785929251aa877cefc9c1b0 100644
--- a/content/browser/service_worker/service_worker_registration.cc
+++ b/content/browser/service_worker/service_worker_registration.cc
@@ -37,22 +37,22 @@ ServiceWorkerRegistrationInfo ServiceWorkerRegistration::GetInfo() {
script_url(),
pattern(),
active_version_ ? active_version_->GetInfo() : ServiceWorkerVersionInfo(),
- pending_version_ ? pending_version_->GetInfo()
+ waiting_version_ ? waiting_version_->GetInfo()
: ServiceWorkerVersionInfo());
}
ServiceWorkerVersion* ServiceWorkerRegistration::GetNewestVersion() {
if (active_version())
return active_version();
- return pending_version();
+ return waiting_version();
}
-void ServiceWorkerRegistration::ActivatePendingVersion() {
+void ServiceWorkerRegistration::ActivateWaitingVersion() {
active_version_->SetStatus(ServiceWorkerVersion::DEACTIVATED);
- active_version_ = pending_version_;
+ active_version_ = waiting_version_;
// TODO(kinuko): This should be set to ACTIVATING until activation finishes.
active_version_->SetStatus(ServiceWorkerVersion::ACTIVE);
- pending_version_ = NULL;
+ waiting_version_ = NULL;
}
} // namespace content

Powered by Google App Engine
This is Rietveld 408576698