| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "webkit/dom_storage/dom_storage_namespace.h" | 5 #include "webkit/dom_storage/dom_storage_namespace.h" |
| 6 | 6 |
| 7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "base/bind.h" |
| 9 #include "base/location.h" |
| 8 #include "base/logging.h" | 10 #include "base/logging.h" |
| 9 #include "webkit/dom_storage/dom_storage_area.h" | 11 #include "webkit/dom_storage/dom_storage_area.h" |
| 10 #include "webkit/dom_storage/dom_storage_task_runner.h" | 12 #include "webkit/dom_storage/dom_storage_task_runner.h" |
| 11 #include "webkit/dom_storage/dom_storage_types.h" | 13 #include "webkit/dom_storage/dom_storage_types.h" |
| 14 #include "webkit/dom_storage/session_storage_database.h" |
| 12 | 15 |
| 13 namespace dom_storage { | 16 namespace dom_storage { |
| 14 | 17 |
| 15 DomStorageNamespace::DomStorageNamespace( | 18 DomStorageNamespace::DomStorageNamespace( |
| 16 const FilePath& directory, | 19 const FilePath& directory, |
| 17 DomStorageTaskRunner* task_runner) | 20 DomStorageTaskRunner* task_runner) |
| 18 : namespace_id_(kLocalStorageNamespaceId), | 21 : namespace_id_(kLocalStorageNamespaceId), |
| 19 directory_(directory), | 22 directory_(directory), |
| 20 task_runner_(task_runner) { | 23 task_runner_(task_runner) { |
| 21 } | 24 } |
| 22 | 25 |
| 23 DomStorageNamespace::DomStorageNamespace( | 26 DomStorageNamespace::DomStorageNamespace( |
| 24 int64 namespace_id, | 27 int64 namespace_id, |
| 25 const std::string& persistent_namespace_id, | 28 const std::string& persistent_namespace_id, |
| 29 SessionStorageDatabase* session_storage_database, |
| 26 DomStorageTaskRunner* task_runner) | 30 DomStorageTaskRunner* task_runner) |
| 27 : namespace_id_(namespace_id), | 31 : namespace_id_(namespace_id), |
| 28 persistent_namespace_id_(persistent_namespace_id), | 32 persistent_namespace_id_(persistent_namespace_id), |
| 29 task_runner_(task_runner) { | 33 task_runner_(task_runner), |
| 34 session_storage_database_(session_storage_database) { |
| 30 DCHECK_NE(kLocalStorageNamespaceId, namespace_id); | 35 DCHECK_NE(kLocalStorageNamespaceId, namespace_id); |
| 31 } | 36 } |
| 32 | 37 |
| 33 DomStorageNamespace::~DomStorageNamespace() { | 38 DomStorageNamespace::~DomStorageNamespace() { |
| 34 } | 39 } |
| 35 | 40 |
| 36 DomStorageArea* DomStorageNamespace::OpenStorageArea(const GURL& origin) { | 41 DomStorageArea* DomStorageNamespace::OpenStorageArea(const GURL& origin) { |
| 37 if (AreaHolder* holder = GetAreaHolder(origin)) { | 42 if (AreaHolder* holder = GetAreaHolder(origin)) { |
| 38 ++(holder->open_count_); | 43 ++(holder->open_count_); |
| 39 return holder->area_; | 44 return holder->area_; |
| 40 } | 45 } |
| 41 DomStorageArea* area; | 46 DomStorageArea* area; |
| 42 if (namespace_id_ == kLocalStorageNamespaceId) { | 47 if (namespace_id_ == kLocalStorageNamespaceId) { |
| 43 area = new DomStorageArea(origin, directory_, task_runner_); | 48 area = new DomStorageArea(origin, directory_, task_runner_); |
| 44 } else { | 49 } else { |
| 45 area = new DomStorageArea(namespace_id_, persistent_namespace_id_, origin, | 50 area = new DomStorageArea(namespace_id_, persistent_namespace_id_, origin, |
| 46 task_runner_); | 51 session_storage_database_, task_runner_); |
| 47 } | 52 } |
| 48 areas_[origin] = AreaHolder(area, 1); | 53 areas_[origin] = AreaHolder(area, 1); |
| 49 return area; | 54 return area; |
| 50 } | 55 } |
| 51 | 56 |
| 52 void DomStorageNamespace::CloseStorageArea(DomStorageArea* area) { | 57 void DomStorageNamespace::CloseStorageArea(DomStorageArea* area) { |
| 53 AreaHolder* holder = GetAreaHolder(area->origin()); | 58 AreaHolder* holder = GetAreaHolder(area->origin()); |
| 54 DCHECK(holder); | 59 DCHECK(holder); |
| 55 DCHECK_EQ(holder->area_.get(), area); | 60 DCHECK_EQ(holder->area_.get(), area); |
| 56 --(holder->open_count_); | 61 --(holder->open_count_); |
| 57 // TODO(michaeln): Clean up areas that aren't needed in memory anymore. | 62 // TODO(michaeln): Clean up areas that aren't needed in memory anymore. |
| 58 // The in-process-webkit based impl didn't do this either, but would be nice. | 63 // The in-process-webkit based impl didn't do this either, but would be nice. |
| 59 } | 64 } |
| 60 | 65 |
| 61 DomStorageNamespace* DomStorageNamespace::Clone( | 66 DomStorageNamespace* DomStorageNamespace::Clone( |
| 62 int64 clone_namespace_id, | 67 int64 clone_namespace_id, |
| 63 const std::string& clone_persistent_namespace_id) { | 68 const std::string& clone_persistent_namespace_id) { |
| 64 DCHECK_NE(kLocalStorageNamespaceId, namespace_id_); | 69 DCHECK_NE(kLocalStorageNamespaceId, namespace_id_); |
| 65 DCHECK_NE(kLocalStorageNamespaceId, clone_namespace_id); | 70 DCHECK_NE(kLocalStorageNamespaceId, clone_namespace_id); |
| 66 DomStorageNamespace* clone = new DomStorageNamespace( | 71 DomStorageNamespace* clone = new DomStorageNamespace( |
| 67 clone_namespace_id, clone_persistent_namespace_id, task_runner_); | 72 clone_namespace_id, clone_persistent_namespace_id, |
| 73 session_storage_database_, task_runner_); |
| 68 AreaMap::const_iterator it = areas_.begin(); | 74 AreaMap::const_iterator it = areas_.begin(); |
| 75 // Clone the in-memory structures. |
| 69 for (; it != areas_.end(); ++it) { | 76 for (; it != areas_.end(); ++it) { |
| 70 DomStorageArea* area = it->second.area_->ShallowCopy( | 77 DomStorageArea* area = it->second.area_->ShallowCopy( |
| 71 clone_namespace_id, clone_persistent_namespace_id); | 78 clone_namespace_id, clone_persistent_namespace_id); |
| 72 clone->areas_[it->first] = AreaHolder(area, 0); | 79 clone->areas_[it->first] = AreaHolder(area, 0); |
| 73 } | 80 } |
| 81 // And clone the on-disk structures, too. |
| 82 if (session_storage_database_.get()) { |
| 83 bool success = task_runner_->PostShutdownBlockingTask( |
| 84 FROM_HERE, |
| 85 DomStorageTaskRunner::COMMIT_SEQUENCE, |
| 86 base::Bind(base::IgnoreResult(&SessionStorageDatabase::CloneNamespace), |
| 87 session_storage_database_.get(), persistent_namespace_id_, |
| 88 clone_persistent_namespace_id)); |
| 89 DCHECK(success); |
| 90 } |
| 74 return clone; | 91 return clone; |
| 75 } | 92 } |
| 76 | 93 |
| 77 void DomStorageNamespace::DeleteOrigin(const GURL& origin) { | 94 void DomStorageNamespace::DeleteOrigin(const GURL& origin) { |
| 95 DCHECK(!session_storage_database_.get()); |
| 78 AreaHolder* holder = GetAreaHolder(origin); | 96 AreaHolder* holder = GetAreaHolder(origin); |
| 79 if (holder) { | 97 if (holder) { |
| 80 holder->area_->DeleteOrigin(); | 98 holder->area_->DeleteOrigin(); |
| 81 return; | 99 return; |
| 82 } | 100 } |
| 83 if (!directory_.empty()) { | 101 if (!directory_.empty()) { |
| 84 scoped_refptr<DomStorageArea> area = | 102 scoped_refptr<DomStorageArea> area = |
| 85 new DomStorageArea(origin, directory_, task_runner_); | 103 new DomStorageArea(origin, directory_, task_runner_); |
| 86 area->DeleteOrigin(); | 104 area->DeleteOrigin(); |
| 87 } | 105 } |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 135 | 153 |
| 136 DomStorageNamespace::AreaHolder::AreaHolder( | 154 DomStorageNamespace::AreaHolder::AreaHolder( |
| 137 DomStorageArea* area, int count) | 155 DomStorageArea* area, int count) |
| 138 : area_(area), open_count_(count) { | 156 : area_(area), open_count_(count) { |
| 139 } | 157 } |
| 140 | 158 |
| 141 DomStorageNamespace::AreaHolder::~AreaHolder() { | 159 DomStorageNamespace::AreaHolder::~AreaHolder() { |
| 142 } | 160 } |
| 143 | 161 |
| 144 } // namespace dom_storage | 162 } // namespace dom_storage |
| OLD | NEW |