Index: content/browser/service_worker/service_worker_database.cc |
diff --git a/content/browser/service_worker/service_worker_database.cc b/content/browser/service_worker/service_worker_database.cc |
index 7ef2e4eacbafa807fda9d26b9a790b5306df07f5..d4f0eec53a09823f3b8dd404b252ee1041941dd9 100644 |
--- a/content/browser/service_worker/service_worker_database.cc |
+++ b/content/browser/service_worker/service_worker_database.cc |
@@ -492,11 +492,13 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::ReadRegistration( |
ServiceWorkerDatabase::Status ServiceWorkerDatabase::WriteRegistration( |
const RegistrationData& registration, |
const std::vector<ResourceRecord>& resources, |
- int64* deleted_version_id, |
+ RegistrationData* old_registration, |
std::vector<int64>* newly_purgeable_resources) { |
DCHECK(sequence_checker_.CalledOnValidSequencedThread()); |
- *deleted_version_id = kInvalidServiceWorkerVersionId; |
Status status = LazyOpen(true); |
+ if (old_registration) { |
michaeln
2014/10/24 23:15:47
do we have a usage that passes in null? if not, le
dmurph
2014/10/27 21:37:06
Done.
|
+ old_registration->version_id = kInvalidServiceWorkerVersionId; |
+ } |
if (status != STATUS_OK) |
return status; |
@@ -538,18 +540,20 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::WriteRegistration( |
CreateResourceIdKey(kPurgeableResIdKeyPrefix, itr->resource_id)); |
} |
+ RegistrationData old_registration_on_stack; |
+ if (!old_registration) { |
+ old_registration = &old_registration_on_stack; |
+ } |
// Retrieve a previous version to sweep purgeable resources. |
- RegistrationData old_registration; |
status = ReadRegistrationData(registration.registration_id, |
registration.scope.GetOrigin(), |
- &old_registration); |
+ old_registration); |
if (status != STATUS_OK && status != STATUS_ERROR_NOT_FOUND) |
return status; |
if (status == STATUS_OK) { |
- DCHECK_LT(old_registration.version_id, registration.version_id); |
- *deleted_version_id = old_registration.version_id; |
+ DCHECK_LT(old_registration->version_id, registration.version_id); |
status = DeleteResourceRecords( |
- old_registration.version_id, newly_purgeable_resources, &batch); |
+ old_registration->version_id, newly_purgeable_resources, &batch); |
if (status != STATUS_OK) |
return status; |