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

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

Issue 355163003: Don't prematurely delete script resources when registration is deleted (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: really fix win build Created 6 years, 6 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_database.cc
diff --git a/content/browser/service_worker/service_worker_database.cc b/content/browser/service_worker/service_worker_database.cc
index 1058acc6165d6d414fbd91c3e731238093b10a80..288edd40d05bc6704eff10ec225e06584af48fdb 100644
--- a/content/browser/service_worker/service_worker_database.cc
+++ b/content/browser/service_worker/service_worker_database.cc
@@ -488,6 +488,7 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::ReadRegistration(
ServiceWorkerDatabase::Status ServiceWorkerDatabase::WriteRegistration(
const RegistrationData& registration,
const std::vector<ResourceRecord>& resources,
+ int64* deleted_version_id,
std::vector<int64>* newly_purgeable_resources) {
DCHECK(sequence_checker_.CalledOnValidSequencedThread());
Status status = LazyOpen(true);
@@ -529,6 +530,7 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::WriteRegistration(
return status;
if (status == STATUS_OK) {
DCHECK_LT(old_registration.version_id, registration.version_id);
+ *deleted_version_id = old_registration.version_id;
status = DeleteResourceRecords(
old_registration.version_id, newly_purgeable_resources, &batch);
if (status != STATUS_OK)
@@ -598,6 +600,7 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::UpdateLastCheckTime(
ServiceWorkerDatabase::Status ServiceWorkerDatabase::DeleteRegistration(
int64 registration_id,
const GURL& origin,
+ int64* version_id,
std::vector<int64>* newly_purgeable_resources) {
DCHECK(sequence_checker_.CalledOnValidSequencedThread());
Status status = LazyOpen(false);
@@ -630,6 +633,7 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::DeleteRegistration(
for (std::vector<RegistrationData>::const_iterator itr =
registrations.begin(); itr != registrations.end(); ++itr) {
if (itr->registration_id == registration_id) {
+ *version_id = itr->version_id;
status = DeleteResourceRecords(
itr->version_id, newly_purgeable_resources, &batch);
if (status != STATUS_OK)

Powered by Google App Engine
This is Rietveld 408576698