Chromium Code Reviews| 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 "content/browser/dom_storage/dom_storage_context_impl.h" | 5 #include "content/browser/dom_storage/dom_storage_context_impl.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
| 9 #include "base/message_loop_proxy.h" | 9 #include "base/message_loop_proxy.h" |
| 10 #include "content/public/browser/browser_thread.h" | 10 #include "content/public/browser/browser_thread.h" |
| 11 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" | 11 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" |
| 12 #include "webkit/database/database_util.h" | 12 #include "webkit/database/database_util.h" |
| 13 #include "webkit/dom_storage/dom_storage_area.h" | 13 #include "webkit/dom_storage/dom_storage_area.h" |
| 14 #include "webkit/dom_storage/dom_storage_context.h" | 14 #include "webkit/dom_storage/dom_storage_context.h" |
| 15 #include "webkit/dom_storage/dom_storage_task_runner.h" | 15 #include "webkit/dom_storage/dom_storage_task_runner.h" |
| 16 #include "webkit/glue/webkit_glue.h" | 16 #include "webkit/glue/webkit_glue.h" |
| 17 | 17 |
| 18 using content::BrowserThread; | 18 using content::BrowserThread; |
| 19 using content::DOMStorageContext; | 19 using content::DOMStorageContext; |
| 20 using dom_storage::DomStorageArea; | 20 using dom_storage::DomStorageArea; |
| 21 using dom_storage::DomStorageContext; | 21 using dom_storage::DomStorageContext; |
| 22 using dom_storage::DomStorageTaskRunner; | 22 using dom_storage::DomStorageTaskRunner; |
| 23 using dom_storage::DomStorageWorkerPoolTaskRunner; | 23 using dom_storage::DomStorageWorkerPoolTaskRunner; |
| 24 using webkit_database::DatabaseUtil; | 24 using webkit_database::DatabaseUtil; |
| 25 | 25 |
| 26 namespace { | 26 namespace { |
| 27 | 27 |
| 28 const char kLocalStorageDirectory[] = "Local Storage"; | 28 const char kLocalStorageDirectory[] = "Local Storage"; |
| 29 const char kSessionStorageDirectory[] = "Session Storage"; | |
| 29 | 30 |
| 30 // TODO(michaeln): Fix the content layer api, FilePaths and | 31 // TODO(michaeln): Fix the content layer api, FilePaths and |
| 31 // string16 origin_ids are just wrong. Then get rid of | 32 // string16 origin_ids are just wrong. Then get rid of |
| 32 // this conversion non-sense. Most of the includes are just | 33 // this conversion non-sense. Most of the includes are just |
| 33 // to support that non-sense. | 34 // to support that non-sense. |
| 34 | 35 |
| 35 GURL OriginIdToGURL(const string16& origin_id) { | 36 GURL OriginIdToGURL(const string16& origin_id) { |
| 36 return DatabaseUtil::GetOriginFromIdentifier(origin_id); | 37 return DatabaseUtil::GetOriginFromIdentifier(origin_id); |
| 37 } | 38 } |
| 38 | 39 |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 79 | 80 |
| 80 DOMStorageContextImpl::DOMStorageContextImpl( | 81 DOMStorageContextImpl::DOMStorageContextImpl( |
| 81 const FilePath& data_path, | 82 const FilePath& data_path, |
| 82 quota::SpecialStoragePolicy* special_storage_policy) { | 83 quota::SpecialStoragePolicy* special_storage_policy) { |
| 83 base::SequencedWorkerPool* worker_pool = BrowserThread::GetBlockingPool(); | 84 base::SequencedWorkerPool* worker_pool = BrowserThread::GetBlockingPool(); |
| 84 // TODO(marja): Pass a nonempty session storage directory when session storage | 85 // TODO(marja): Pass a nonempty session storage directory when session storage |
| 85 // is backed on disk. | 86 // is backed on disk. |
| 86 context_ = new dom_storage::DomStorageContext( | 87 context_ = new dom_storage::DomStorageContext( |
| 87 data_path.empty() ? | 88 data_path.empty() ? |
| 88 data_path : data_path.AppendASCII(kLocalStorageDirectory), | 89 data_path : data_path.AppendASCII(kLocalStorageDirectory), |
| 89 FilePath(), // Empty session storage directory. | 90 data_path.empty() ? |
| 91 data_path : data_path.AppendASCII(kSessionStorageDirectory), | |
|
michaeln
2012/05/16 08:10:55
until we work out how the higher level session res
marja
2012/05/30 11:46:19
I would have liked to put this "save session state
| |
| 90 special_storage_policy, | 92 special_storage_policy, |
| 91 new DomStorageWorkerPoolTaskRunner( | 93 new DomStorageWorkerPoolTaskRunner( |
| 92 worker_pool, | 94 worker_pool, |
| 93 worker_pool->GetNamedSequenceToken("dom_storage_primary"), | 95 worker_pool->GetNamedSequenceToken("dom_storage_primary"), |
| 94 worker_pool->GetNamedSequenceToken("dom_storage_commit"), | 96 worker_pool->GetNamedSequenceToken("dom_storage_commit"), |
| 95 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO))); | 97 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO))); |
| 96 } | 98 } |
| 97 | 99 |
| 98 DOMStorageContextImpl::~DOMStorageContextImpl() { | 100 DOMStorageContextImpl::~DOMStorageContextImpl() { |
| 99 } | 101 } |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 178 int64 DOMStorageContextImpl::LeakyCloneSessionStorage( | 180 int64 DOMStorageContextImpl::LeakyCloneSessionStorage( |
| 179 int64 existing_namespace_id) { | 181 int64 existing_namespace_id) { |
| 180 DCHECK(context_); | 182 DCHECK(context_); |
| 181 int64 clone_id = context_->AllocateSessionId(); | 183 int64 clone_id = context_->AllocateSessionId(); |
| 182 context_->task_runner()->PostTask( | 184 context_->task_runner()->PostTask( |
| 183 FROM_HERE, | 185 FROM_HERE, |
| 184 base::Bind(&DomStorageContext::CloneSessionNamespace, context_, | 186 base::Bind(&DomStorageContext::CloneSessionNamespace, context_, |
| 185 existing_namespace_id, clone_id)); | 187 existing_namespace_id, clone_id)); |
| 186 return clone_id; | 188 return clone_id; |
| 187 } | 189 } |
| OLD | NEW |