OLD | NEW |
---|---|
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. Use of this | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. Use of this |
2 // source code is governed by a BSD-style license that can be found in the | 2 // source code is governed by a BSD-style license that can be found in the |
3 // LICENSE file. | 3 // LICENSE file. |
4 | 4 |
5 #include "content/browser/in_process_webkit/dom_storage_namespace.h" | 5 #include "content/browser/in_process_webkit/dom_storage_namespace.h" |
6 | 6 |
7 #include "base/file_path.h" | 7 #include "base/file_path.h" |
8 #include "content/browser/in_process_webkit/dom_storage_area.h" | 8 #include "content/browser/in_process_webkit/dom_storage_area.h" |
9 #include "content/browser/in_process_webkit/dom_storage_context.h" | 9 #include "content/browser/in_process_webkit/dom_storage_context.h" |
10 #include "content/browser/in_process_webkit/dom_storage_message_filter.h" | 10 #include "content/browser/in_process_webkit/dom_storage_message_filter.h" |
11 #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageArea.h" | 11 #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageArea.h" |
12 #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageNamespace.h " | 12 #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageNamespace.h " |
13 #include "webkit/glue/webkit_glue.h" | 13 #include "webkit/glue/webkit_glue.h" |
14 | 14 |
15 using WebKit::WebStorageArea; | 15 using WebKit::WebStorageArea; |
16 using WebKit::WebStorageNamespace; | 16 using WebKit::WebStorageNamespace; |
17 using WebKit::WebString; | 17 using WebKit::WebString; |
18 | 18 |
19 /* static */ | 19 /* static */ |
20 DOMStorageNamespace* DOMStorageNamespace::CreateLocalStorageNamespace( | 20 DOMStorageNamespace* DOMStorageNamespace::CreateLocalStorageNamespace( |
21 DOMStorageContext* dom_storage_context, const FilePath& data_dir_path) { | 21 DOMStorageContext* dom_storage_context, const FilePath& data_dir_path) { |
22 int64 id = kLocalStorageNamespaceId; | 22 int64 id = kLocalStorageNamespaceId; |
23 DCHECK(!dom_storage_context->GetStorageNamespace(id, false)); | 23 DCHECK(!dom_storage_context->GetStorageNamespace(id, false)); |
24 return new DOMStorageNamespace(dom_storage_context, id, | 24 return new DOMStorageNamespace(dom_storage_context, id, FilePath(""), |
25 webkit_glue::FilePathToWebString(data_dir_path), DOM_STORAGE_LOCAL); | 25 webkit_glue::FilePathToWebString(data_dir_path), DOM_STORAGE_LOCAL); |
26 } | 26 } |
27 | 27 |
28 /* static */ | 28 /* static */ |
29 DOMStorageNamespace* DOMStorageNamespace::CreateSessionStorageNamespace( | 29 DOMStorageNamespace* DOMStorageNamespace::CreateSessionStorageNamespace( |
30 DOMStorageContext* dom_storage_context, int64 id) { | 30 DOMStorageContext* dom_storage_context, const FilePath& data_dir_path, |
31 int64 id) { | |
31 DCHECK(!dom_storage_context->GetStorageNamespace(id, false)); | 32 DCHECK(!dom_storage_context->GetStorageNamespace(id, false)); |
32 return new DOMStorageNamespace(dom_storage_context, id, WebString(), | 33 return new DOMStorageNamespace( |
33 DOM_STORAGE_SESSION); | 34 dom_storage_context, id, data_dir_path.BaseName(), |
35 webkit_glue::FilePathToWebString(data_dir_path), DOM_STORAGE_SESSION); | |
34 } | 36 } |
35 | 37 |
36 DOMStorageNamespace::DOMStorageNamespace(DOMStorageContext* dom_storage_context, | 38 DOMStorageNamespace::DOMStorageNamespace( |
37 int64 id, | 39 DOMStorageContext* dom_storage_context, |
38 const WebString& data_dir_path, | 40 int64 id, |
39 DOMStorageType dom_storage_type) | 41 const FilePath& session_storage_directory, |
42 const WebString& data_dir_path, | |
43 DOMStorageType dom_storage_type) | |
40 : dom_storage_context_(dom_storage_context), | 44 : dom_storage_context_(dom_storage_context), |
41 id_(id), | 45 id_(id), |
46 session_storage_directory_(session_storage_directory), | |
42 data_dir_path_(data_dir_path), | 47 data_dir_path_(data_dir_path), |
43 dom_storage_type_(dom_storage_type) { | 48 dom_storage_type_(dom_storage_type) { |
44 DCHECK(dom_storage_context_); | 49 DCHECK(dom_storage_context_); |
45 } | 50 } |
46 | 51 |
47 DOMStorageNamespace::~DOMStorageNamespace() { | 52 DOMStorageNamespace::~DOMStorageNamespace() { |
48 // TODO(jorlow): If the DOMStorageContext is being destructed, there's no need | 53 // TODO(jorlow): If the DOMStorageContext is being destructed, there's no need |
49 // to do these calls. Maybe we should add a fast path? | 54 // to do these calls. Maybe we should add a fast path? |
50 for (OriginToStorageAreaMap::iterator iter(origin_to_storage_area_.begin()); | 55 for (OriginToStorageAreaMap::iterator iter(origin_to_storage_area_.begin()); |
51 iter != origin_to_storage_area_.end(); ++iter) { | 56 iter != origin_to_storage_area_.end(); ++iter) { |
(...skipping 11 matching lines...) Expand all Loading... | |
63 // We need to create a new one. | 68 // We need to create a new one. |
64 int64 id = dom_storage_context_->AllocateStorageAreaId(); | 69 int64 id = dom_storage_context_->AllocateStorageAreaId(); |
65 DCHECK(!dom_storage_context_->GetStorageArea(id)); | 70 DCHECK(!dom_storage_context_->GetStorageArea(id)); |
66 DOMStorageArea* storage_area = new DOMStorageArea(origin, id, this); | 71 DOMStorageArea* storage_area = new DOMStorageArea(origin, id, this); |
67 origin_to_storage_area_[origin] = storage_area; | 72 origin_to_storage_area_[origin] = storage_area; |
68 dom_storage_context_->RegisterStorageArea(storage_area); | 73 dom_storage_context_->RegisterStorageArea(storage_area); |
69 return storage_area; | 74 return storage_area; |
70 } | 75 } |
71 | 76 |
72 DOMStorageNamespace* DOMStorageNamespace::Copy(int64 id) { | 77 DOMStorageNamespace* DOMStorageNamespace::Copy(int64 id) { |
78 // FIXME-before-landing: how can we copy session storage namespaces now? | |
73 DCHECK(dom_storage_type_ == DOM_STORAGE_SESSION); | 79 DCHECK(dom_storage_type_ == DOM_STORAGE_SESSION); |
74 DCHECK(!dom_storage_context_->GetStorageNamespace(id, false)); | 80 DCHECK(!dom_storage_context_->GetStorageNamespace(id, false)); |
75 DOMStorageNamespace* new_storage_namespace = new DOMStorageNamespace( | 81 DOMStorageNamespace* new_storage_namespace = new DOMStorageNamespace( |
76 dom_storage_context_, id, data_dir_path_, dom_storage_type_); | 82 dom_storage_context_, id, session_storage_directory_, data_dir_path_, |
83 dom_storage_type_); | |
77 // If we haven't used the namespace yet, there's nothing to copy. | 84 // If we haven't used the namespace yet, there's nothing to copy. |
78 if (storage_namespace_.get()) | 85 if (storage_namespace_.get()) |
79 new_storage_namespace->storage_namespace_.reset(storage_namespace_->copy()); | 86 new_storage_namespace->storage_namespace_.reset(storage_namespace_->copy()); |
80 return new_storage_namespace; | 87 return new_storage_namespace; |
81 } | 88 } |
82 | 89 |
83 void DOMStorageNamespace::PurgeMemory() { | 90 void DOMStorageNamespace::PurgeMemory() { |
84 DCHECK(dom_storage_type_ == DOM_STORAGE_LOCAL); | 91 // FIXME-before-landing: how do we purge session storage? |
92 //DCHECK(dom_storage_type_ == DOM_STORAGE_LOCAL); | |
85 for (OriginToStorageAreaMap::iterator iter(origin_to_storage_area_.begin()); | 93 for (OriginToStorageAreaMap::iterator iter(origin_to_storage_area_.begin()); |
86 iter != origin_to_storage_area_.end(); ++iter) | 94 iter != origin_to_storage_area_.end(); ++iter) |
87 iter->second->PurgeMemory(); | 95 iter->second->PurgeMemory(); |
88 storage_namespace_.reset(); | 96 storage_namespace_.reset(); |
89 } | 97 } |
90 | 98 |
91 WebStorageArea* DOMStorageNamespace::CreateWebStorageArea( | 99 WebStorageArea* DOMStorageNamespace::CreateWebStorageArea( |
92 const string16& origin) { | 100 const string16& origin) { |
93 CreateWebStorageNamespaceIfNecessary(); | 101 CreateWebStorageNamespaceIfNecessary(); |
94 return storage_namespace_->createStorageArea(origin); | 102 return storage_namespace_->createStorageArea(origin); |
95 } | 103 } |
96 | 104 |
97 void DOMStorageNamespace::CreateWebStorageNamespaceIfNecessary() { | 105 void DOMStorageNamespace::CreateWebStorageNamespaceIfNecessary() { |
98 if (storage_namespace_.get()) | 106 if (storage_namespace_.get()) |
99 return; | 107 return; |
100 | 108 |
101 if (dom_storage_type_ == DOM_STORAGE_LOCAL) { | 109 // Note: from WebKit point of view, also sessionStorage is localStorage, since |
102 storage_namespace_.reset( | 110 // we want to save it on disk. |
michaeln
2011/12/13 20:40:03
So we won't be using the SessionStorage stuff in w
| |
103 WebStorageNamespace::createLocalStorageNamespace(data_dir_path_, | 111 storage_namespace_.reset( |
104 WebStorageNamespace::m_localStorageQuota)); | 112 WebStorageNamespace::createLocalStorageNamespace( |
105 } else { | 113 data_dir_path_, |
106 storage_namespace_.reset(WebStorageNamespace::createSessionStorageNamespace( | 114 WebStorageNamespace::m_localStorageQuota)); |
107 WebStorageNamespace::m_sessionStorageQuota)); | |
108 } | |
109 } | 115 } |
OLD | NEW |