content/browser/service_worker/service_worker_database.cc - Issue 355163003: Don't prematurely delete script resources when registration is deleted

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: patch for landing 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

« no previous file with comments | « content/browser/service_worker/service_worker_database.h ('k') | content/browser/service_worker/service_worker_database_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..4ce2934ab6c25c24526f760ffd2088150e4b53d0 100644

--- a/content/browser/service_worker/service_worker_database.cc

+++ b/content/browser/service_worker/service_worker_database.cc

@@ -488,8 +488,10 @@ 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());

+ *deleted_version_id = kInvalidServiceWorkerVersionId;

Status status = LazyOpen(true);

if (status != STATUS_OK)

return status;

@@ -529,6 +531,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,8 +601,10 @@ 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());

+ *version_id = kInvalidServiceWorkerVersionId;

Status status = LazyOpen(false);

if (IsNewOrNonexistentDatabase(status))

return STATUS_OK;

@@ -630,6 +635,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)