OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/browser/service_worker/service_worker_storage.h" | 5 #include "content/browser/service_worker/service_worker_storage.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <utility> |
8 | 9 |
9 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
10 #include "base/files/file_util.h" | 11 #include "base/files/file_util.h" |
11 #include "base/message_loop/message_loop.h" | 12 #include "base/message_loop/message_loop.h" |
12 #include "base/sequenced_task_runner.h" | 13 #include "base/sequenced_task_runner.h" |
13 #include "base/single_thread_task_runner.h" | 14 #include "base/single_thread_task_runner.h" |
14 #include "base/task_runner_util.h" | 15 #include "base/task_runner_util.h" |
15 #include "base/thread_task_runner_handle.h" | 16 #include "base/thread_task_runner_handle.h" |
16 #include "base/trace_event/trace_event.h" | 17 #include "base/trace_event/trace_event.h" |
17 #include "content/browser/service_worker/service_worker_context_core.h" | 18 #include "content/browser/service_worker/service_worker_context_core.h" |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
107 } | 108 } |
108 | 109 |
109 // static | 110 // static |
110 scoped_ptr<ServiceWorkerStorage> ServiceWorkerStorage::Create( | 111 scoped_ptr<ServiceWorkerStorage> ServiceWorkerStorage::Create( |
111 const base::FilePath& path, | 112 const base::FilePath& path, |
112 const base::WeakPtr<ServiceWorkerContextCore>& context, | 113 const base::WeakPtr<ServiceWorkerContextCore>& context, |
113 scoped_ptr<ServiceWorkerDatabaseTaskManager> database_task_manager, | 114 scoped_ptr<ServiceWorkerDatabaseTaskManager> database_task_manager, |
114 const scoped_refptr<base::SingleThreadTaskRunner>& disk_cache_thread, | 115 const scoped_refptr<base::SingleThreadTaskRunner>& disk_cache_thread, |
115 storage::QuotaManagerProxy* quota_manager_proxy, | 116 storage::QuotaManagerProxy* quota_manager_proxy, |
116 storage::SpecialStoragePolicy* special_storage_policy) { | 117 storage::SpecialStoragePolicy* special_storage_policy) { |
117 return make_scoped_ptr(new ServiceWorkerStorage(path, | 118 return make_scoped_ptr(new ServiceWorkerStorage( |
118 context, | 119 path, context, std::move(database_task_manager), disk_cache_thread, |
119 database_task_manager.Pass(), | 120 quota_manager_proxy, special_storage_policy)); |
120 disk_cache_thread, | |
121 quota_manager_proxy, | |
122 special_storage_policy)); | |
123 } | 121 } |
124 | 122 |
125 // static | 123 // static |
126 scoped_ptr<ServiceWorkerStorage> ServiceWorkerStorage::Create( | 124 scoped_ptr<ServiceWorkerStorage> ServiceWorkerStorage::Create( |
127 const base::WeakPtr<ServiceWorkerContextCore>& context, | 125 const base::WeakPtr<ServiceWorkerContextCore>& context, |
128 ServiceWorkerStorage* old_storage) { | 126 ServiceWorkerStorage* old_storage) { |
129 return make_scoped_ptr( | 127 return make_scoped_ptr( |
130 new ServiceWorkerStorage(old_storage->path_, | 128 new ServiceWorkerStorage(old_storage->path_, |
131 context, | 129 context, |
132 old_storage->database_task_manager_->Clone(), | 130 old_storage->database_task_manager_->Clone(), |
(...skipping 643 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
776 scoped_ptr<ServiceWorkerDatabaseTaskManager> database_task_manager, | 774 scoped_ptr<ServiceWorkerDatabaseTaskManager> database_task_manager, |
777 const scoped_refptr<base::SingleThreadTaskRunner>& disk_cache_thread, | 775 const scoped_refptr<base::SingleThreadTaskRunner>& disk_cache_thread, |
778 storage::QuotaManagerProxy* quota_manager_proxy, | 776 storage::QuotaManagerProxy* quota_manager_proxy, |
779 storage::SpecialStoragePolicy* special_storage_policy) | 777 storage::SpecialStoragePolicy* special_storage_policy) |
780 : next_registration_id_(kInvalidServiceWorkerRegistrationId), | 778 : next_registration_id_(kInvalidServiceWorkerRegistrationId), |
781 next_version_id_(kInvalidServiceWorkerVersionId), | 779 next_version_id_(kInvalidServiceWorkerVersionId), |
782 next_resource_id_(kInvalidServiceWorkerResourceId), | 780 next_resource_id_(kInvalidServiceWorkerResourceId), |
783 state_(UNINITIALIZED), | 781 state_(UNINITIALIZED), |
784 path_(path), | 782 path_(path), |
785 context_(context), | 783 context_(context), |
786 database_task_manager_(database_task_manager.Pass()), | 784 database_task_manager_(std::move(database_task_manager)), |
787 disk_cache_thread_(disk_cache_thread), | 785 disk_cache_thread_(disk_cache_thread), |
788 quota_manager_proxy_(quota_manager_proxy), | 786 quota_manager_proxy_(quota_manager_proxy), |
789 special_storage_policy_(special_storage_policy), | 787 special_storage_policy_(special_storage_policy), |
790 is_purge_pending_(false), | 788 is_purge_pending_(false), |
791 has_checked_for_stale_resources_(false), | 789 has_checked_for_stale_resources_(false), |
792 weak_factory_(this) { | 790 weak_factory_(this) { |
793 DCHECK(context_); | 791 DCHECK(context_); |
794 database_.reset(new ServiceWorkerDatabase(GetDatabasePath())); | 792 database_.reset(new ServiceWorkerDatabase(GetDatabasePath())); |
795 } | 793 } |
796 | 794 |
(...skipping 662 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1459 DCHECK(database); | 1457 DCHECK(database); |
1460 scoped_ptr<ServiceWorkerStorage::InitialData> data( | 1458 scoped_ptr<ServiceWorkerStorage::InitialData> data( |
1461 new ServiceWorkerStorage::InitialData()); | 1459 new ServiceWorkerStorage::InitialData()); |
1462 | 1460 |
1463 ServiceWorkerDatabase::Status status = | 1461 ServiceWorkerDatabase::Status status = |
1464 database->GetNextAvailableIds(&data->next_registration_id, | 1462 database->GetNextAvailableIds(&data->next_registration_id, |
1465 &data->next_version_id, | 1463 &data->next_version_id, |
1466 &data->next_resource_id); | 1464 &data->next_resource_id); |
1467 if (status != ServiceWorkerDatabase::STATUS_OK) { | 1465 if (status != ServiceWorkerDatabase::STATUS_OK) { |
1468 original_task_runner->PostTask( | 1466 original_task_runner->PostTask( |
1469 FROM_HERE, base::Bind(callback, base::Passed(data.Pass()), status)); | 1467 FROM_HERE, base::Bind(callback, base::Passed(std::move(data)), status)); |
1470 return; | 1468 return; |
1471 } | 1469 } |
1472 | 1470 |
1473 status = database->GetOriginsWithRegistrations(&data->origins); | 1471 status = database->GetOriginsWithRegistrations(&data->origins); |
1474 if (status != ServiceWorkerDatabase::STATUS_OK) { | 1472 if (status != ServiceWorkerDatabase::STATUS_OK) { |
1475 original_task_runner->PostTask( | 1473 original_task_runner->PostTask( |
1476 FROM_HERE, base::Bind(callback, base::Passed(data.Pass()), status)); | 1474 FROM_HERE, base::Bind(callback, base::Passed(std::move(data)), status)); |
1477 return; | 1475 return; |
1478 } | 1476 } |
1479 | 1477 |
1480 status = database->GetOriginsWithForeignFetchRegistrations( | 1478 status = database->GetOriginsWithForeignFetchRegistrations( |
1481 &data->foreign_fetch_origins); | 1479 &data->foreign_fetch_origins); |
1482 original_task_runner->PostTask( | 1480 original_task_runner->PostTask( |
1483 FROM_HERE, base::Bind(callback, base::Passed(data.Pass()), status)); | 1481 FROM_HERE, base::Bind(callback, base::Passed(std::move(data)), status)); |
1484 } | 1482 } |
1485 | 1483 |
1486 void ServiceWorkerStorage::DeleteRegistrationFromDB( | 1484 void ServiceWorkerStorage::DeleteRegistrationFromDB( |
1487 ServiceWorkerDatabase* database, | 1485 ServiceWorkerDatabase* database, |
1488 scoped_refptr<base::SequencedTaskRunner> original_task_runner, | 1486 scoped_refptr<base::SequencedTaskRunner> original_task_runner, |
1489 int64_t registration_id, | 1487 int64_t registration_id, |
1490 const GURL& origin, | 1488 const GURL& origin, |
1491 const DeleteRegistrationCallback& callback) { | 1489 const DeleteRegistrationCallback& callback) { |
1492 DCHECK(database); | 1490 DCHECK(database); |
1493 | 1491 |
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1743 callback.Run(SERVICE_WORKER_ERROR_FAILED); | 1741 callback.Run(SERVICE_WORKER_ERROR_FAILED); |
1744 return; | 1742 return; |
1745 } | 1743 } |
1746 DVLOG(1) << "Deleted ServiceWorkerDiskCache successfully."; | 1744 DVLOG(1) << "Deleted ServiceWorkerDiskCache successfully."; |
1747 ServiceWorkerMetrics::RecordDeleteAndStartOverResult( | 1745 ServiceWorkerMetrics::RecordDeleteAndStartOverResult( |
1748 ServiceWorkerMetrics::DELETE_OK); | 1746 ServiceWorkerMetrics::DELETE_OK); |
1749 callback.Run(SERVICE_WORKER_OK); | 1747 callback.Run(SERVICE_WORKER_OK); |
1750 } | 1748 } |
1751 | 1749 |
1752 } // namespace content | 1750 } // namespace content |
OLD | NEW |