Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1465)

Unified Diff: content/browser/dom_storage/session_storage_namespace_impl.cc

Issue 757723002: [Tests not passing yet] Remove prerender sessionStorage namespace merging. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/dom_storage/session_storage_namespace_impl.cc
diff --git a/content/browser/dom_storage/session_storage_namespace_impl.cc b/content/browser/dom_storage/session_storage_namespace_impl.cc
index ee861b2fbf0d3d90edac0f60313d3c58d2b690d6..a1f7f2dd7f7cc08239fe02fafe91360714a5b9d4 100644
--- a/content/browser/dom_storage/session_storage_namespace_impl.cc
+++ b/content/browser/dom_storage/session_storage_namespace_impl.cc
@@ -25,13 +25,6 @@ SessionStorageNamespaceImpl::SessionStorageNamespaceImpl(
: session_(new DOMStorageSession(context->context(), persistent_id)) {
}
-SessionStorageNamespaceImpl::SessionStorageNamespaceImpl(
- SessionStorageNamespaceImpl* master_session_storage_namespace)
- : session_(new DOMStorageSession(
- master_session_storage_namespace->session_.get())) {
-}
-
-
int64 SessionStorageNamespaceImpl::id() const {
return session_->namespace_id();
}
@@ -65,32 +58,4 @@ SessionStorageNamespaceImpl::SessionStorageNamespaceImpl(
SessionStorageNamespaceImpl::~SessionStorageNamespaceImpl() {
}
-void SessionStorageNamespaceImpl::AddTransactionLogProcessId(int process_id) {
- session_->AddTransactionLogProcessId(process_id);
-}
-
-void SessionStorageNamespaceImpl::RemoveTransactionLogProcessId(
- int process_id) {
- session_->RemoveTransactionLogProcessId(process_id);
-}
-
-void SessionStorageNamespaceImpl::Merge(
- bool actually_merge,
- int process_id,
- SessionStorageNamespace* other,
- const MergeResultCallback& callback) {
- SessionStorageNamespaceImpl* other_impl =
- static_cast<SessionStorageNamespaceImpl*>(other);
- session_->Merge(
- actually_merge, process_id, other_impl->session_.get(), callback);
-}
-
-bool SessionStorageNamespaceImpl::IsAliasOf(SessionStorageNamespace* other) {
- return persistent_id() == other->persistent_id();
-}
-
-SessionStorageNamespace* SessionStorageNamespaceImpl::CreateAlias() {
- return new SessionStorageNamespaceImpl(this);
-}
-
} // namespace content

Powered by Google App Engine
This is Rietveld 408576698