summaryrefslogtreecommitdiffstats
path: root/chromium/content/browser/dom_storage/dom_storage_namespace.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-07-14 17:41:05 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2016-08-04 12:37:36 +0000
commit399c965b6064c440ddcf4015f5f8e9d131c7a0a6 (patch)
tree6b06b60ff365abef0e13b3503d593a0df48d20e8 /chromium/content/browser/dom_storage/dom_storage_namespace.cc
parent7366110654eec46f21b6824f302356426f48cd74 (diff)
BASELINE: Update Chromium to 52.0.2743.76 and Ninja to 1.7.1
Change-Id: I382f51b959689505a60f8b707255ecb344f7d8b4 Reviewed-by: Michael BrĂ¼ning <michael.bruning@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.cc14
1 files changed, 14 insertions, 0 deletions
diff --git a/chromium/content/browser/dom_storage/dom_storage_namespace.cc b/chromium/content/browser/dom_storage/dom_storage_namespace.cc
index a8681b6e6c2..6f976f0d501 100644
--- a/chromium/content/browser/dom_storage/dom_storage_namespace.cc
+++ b/chromium/content/browser/dom_storage/dom_storage_namespace.cc
@@ -176,6 +176,20 @@ unsigned int DOMStorageNamespace::CountInMemoryAreas() const {
return area_count;
}
+void DOMStorageNamespace::OnMemoryDump(
+ base::trace_event::ProcessMemoryDump* pmd) {
+ DCHECK(task_runner_->IsRunningOnPrimarySequence());
+ for (const auto& it : areas_)
+ it.second.area_->OnMemoryDump(pmd);
+}
+
+void DOMStorageNamespace::GetOriginsWithAreas(
+ std::vector<GURL>* origins) const {
+ origins->clear();
+ for (const auto& entry : areas_)
+ origins->push_back(entry.first);
+}
+
DOMStorageNamespace::AreaHolder*
DOMStorageNamespace::GetAreaHolder(const GURL& origin) {
AreaMap::iterator found = areas_.find(origin);