diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-20 10:33:36 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-22 11:45:12 +0000 |
commit | be59a35641616a4cf23c4a13fa0632624b021c1b (patch) | |
tree | 9da183258bdf9cc413f7562079d25ace6955467f /chromium/content/browser/dom_storage/dom_storage_namespace.cc | |
parent | d702e4b6a64574e97fc7df8fe3238cde70242080 (diff) |
BASELINE: Update Chromium to 62.0.3202.101
Change-Id: I2d5eca8117600df6d331f6166ab24d943d9814ac
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/content/browser/dom_storage/dom_storage_namespace.cc')
-rw-r--r-- | chromium/content/browser/dom_storage/dom_storage_namespace.cc | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/chromium/content/browser/dom_storage/dom_storage_namespace.cc b/chromium/content/browser/dom_storage/dom_storage_namespace.cc index 847b1930d70..a448665f97f 100644 --- a/chromium/content/browser/dom_storage/dom_storage_namespace.cc +++ b/chromium/content/browser/dom_storage/dom_storage_namespace.cc @@ -88,11 +88,11 @@ DOMStorageNamespace* DOMStorageNamespace::Clone( // And clone the on-disk structures, too. if (session_storage_database_.get()) { task_runner_->PostShutdownBlockingTask( - FROM_HERE, - DOMStorageTaskRunner::COMMIT_SEQUENCE, - base::Bind(base::IgnoreResult(&SessionStorageDatabase::CloneNamespace), - session_storage_database_.get(), persistent_namespace_id_, - clone_persistent_namespace_id)); + FROM_HERE, DOMStorageTaskRunner::COMMIT_SEQUENCE, + base::BindOnce( + base::IgnoreResult(&SessionStorageDatabase::CloneNamespace), + session_storage_database_.get(), persistent_namespace_id_, + clone_persistent_namespace_id)); } return clone; } @@ -196,6 +196,13 @@ void DOMStorageNamespace::GetOriginsWithAreas( origins->push_back(entry.first); } +int DOMStorageNamespace::GetAreaOpenCount(const GURL& origin) const { + const auto& found = areas_.find(origin); + if (found == areas_.end()) + return 0; + return found->second.open_count_; +} + DOMStorageNamespace::AreaHolder* DOMStorageNamespace::GetAreaHolder(const GURL& origin) { AreaMap::iterator found = areas_.find(origin); |