summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-12 10:40:21 +0000
committerjorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-12 10:40:21 +0000
commit21f699408c2e8ca3d17f59cd6bd69d65fc025121 (patch)
tree5d83da8b5ac7053788f5c18bceec22f20f909202
parenta8ef5f5030b607b5ddc9722673dda8af5595488e (diff)
downloadchromium_src-21f699408c2e8ca3d17f59cd6bd69d65fc025121.zip
chromium_src-21f699408c2e8ca3d17f59cd6bd69d65fc025121.tar.gz
chromium_src-21f699408c2e8ca3d17f59cd6bd69d65fc025121.tar.bz2
Clean up some old TODOs
TEST=none BUG=none Review URL: http://codereview.chromium.org/6173008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71156 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/in_process_webkit/dom_storage_context.cc18
-rw-r--r--chrome/renderer/renderer_webidbcursor_impl.cc4
-rw-r--r--chrome/renderer/renderer_webidbdatabase_impl.cc6
-rw-r--r--chrome/renderer/renderer_webidbindex_impl.cc6
-rw-r--r--chrome/renderer/renderer_webidbobjectstore_impl.cc4
-rw-r--r--chrome/renderer/renderer_webidbtransaction_impl.cc4
6 files changed, 21 insertions, 21 deletions
diff --git a/chrome/browser/in_process_webkit/dom_storage_context.cc b/chrome/browser/in_process_webkit/dom_storage_context.cc
index 1d6d627..7dfc4a7 100644
--- a/chrome/browser/in_process_webkit/dom_storage_context.cc
+++ b/chrome/browser/in_process_webkit/dom_storage_context.cc
@@ -49,20 +49,6 @@ const FilePath::CharType DOMStorageContext::kLocalStorageDirectory[] =
const FilePath::CharType DOMStorageContext::kLocalStorageExtension[] =
FILE_PATH_LITERAL(".localstorage");
-static const FilePath::CharType kLocalStorageOldPath[] =
- FILE_PATH_LITERAL("localStorage");
-
-// TODO(jorlow): Remove after Chrome 4 ships.
-static void MigrateLocalStorageDirectory(const FilePath& data_path) {
- FilePath new_path = data_path.Append(
- DOMStorageContext::kLocalStorageDirectory);
- FilePath old_path = data_path.Append(kLocalStorageOldPath);
- if (!file_util::DirectoryExists(new_path) &&
- file_util::DirectoryExists(old_path)) {
- file_util::Move(old_path, new_path);
- }
-}
-
DOMStorageContext::DOMStorageContext(WebKitContext* webkit_context)
: last_storage_area_id_(0),
last_session_storage_namespace_id_on_ui_thread_(kLocalStorageNamespaceId),
@@ -258,10 +244,8 @@ void DOMStorageContext::DeleteAllLocalStorageFiles() {
DOMStorageNamespace* DOMStorageContext::CreateLocalStorage() {
FilePath dir_path;
- if (!data_path_.empty()) {
- MigrateLocalStorageDirectory(data_path_);
+ if (!data_path_.empty())
dir_path = data_path_.Append(kLocalStorageDirectory);
- }
DOMStorageNamespace* new_namespace =
DOMStorageNamespace::CreateLocalStorageNamespace(this, dir_path);
RegisterStorageNamespace(new_namespace);
diff --git a/chrome/renderer/renderer_webidbcursor_impl.cc b/chrome/renderer/renderer_webidbcursor_impl.cc
index 89b2392..2418b86 100644
--- a/chrome/renderer/renderer_webidbcursor_impl.cc
+++ b/chrome/renderer/renderer_webidbcursor_impl.cc
@@ -18,6 +18,10 @@ RendererWebIDBCursorImpl::RendererWebIDBCursorImpl(int32 idb_cursor_id)
}
RendererWebIDBCursorImpl::~RendererWebIDBCursorImpl() {
+ // It's not possible for there to be pending callbacks that address this
+ // object since inside WebKit, they hold a reference to the object wich owns
+ // this object. But, if that ever changed, then we'd need to invalidate
+ // any such pointers.
RenderThread::current()->Send(new IndexedDBHostMsg_CursorDestroyed(
idb_cursor_id_));
}
diff --git a/chrome/renderer/renderer_webidbdatabase_impl.cc b/chrome/renderer/renderer_webidbdatabase_impl.cc
index d65e8a18..a4fdf77 100644
--- a/chrome/renderer/renderer_webidbdatabase_impl.cc
+++ b/chrome/renderer/renderer_webidbdatabase_impl.cc
@@ -25,8 +25,10 @@ RendererWebIDBDatabaseImpl::RendererWebIDBDatabaseImpl(int32 idb_database_id)
}
RendererWebIDBDatabaseImpl::~RendererWebIDBDatabaseImpl() {
- // TODO(jorlow): Is it possible for this to be destroyed but still have
- // pending callbacks? If so, fix!
+ // It's not possible for there to be pending callbacks that address this
+ // object since inside WebKit, they hold a reference to the object wich owns
+ // this object. But, if that ever changed, then we'd need to invalidate
+ // any such pointers.
RenderThread::current()->Send(new IndexedDBHostMsg_DatabaseDestroyed(
idb_database_id_));
}
diff --git a/chrome/renderer/renderer_webidbindex_impl.cc b/chrome/renderer/renderer_webidbindex_impl.cc
index 12e990f..acbe6cb 100644
--- a/chrome/renderer/renderer_webidbindex_impl.cc
+++ b/chrome/renderer/renderer_webidbindex_impl.cc
@@ -21,8 +21,10 @@ RendererWebIDBIndexImpl::RendererWebIDBIndexImpl(int32 idb_index_id)
}
RendererWebIDBIndexImpl::~RendererWebIDBIndexImpl() {
- // TODO(jorlow): Is it possible for this to be destroyed but still have
- // pending callbacks? If so, fix!
+ // It's not possible for there to be pending callbacks that address this
+ // object since inside WebKit, they hold a reference to the object wich owns
+ // this object. But, if that ever changed, then we'd need to invalidate
+ // any such pointers.
RenderThread::current()->Send(new IndexedDBHostMsg_IndexDestroyed(
idb_index_id_));
}
diff --git a/chrome/renderer/renderer_webidbobjectstore_impl.cc b/chrome/renderer/renderer_webidbobjectstore_impl.cc
index 8a138da..e2eea42 100644
--- a/chrome/renderer/renderer_webidbobjectstore_impl.cc
+++ b/chrome/renderer/renderer_webidbobjectstore_impl.cc
@@ -34,6 +34,10 @@ RendererWebIDBObjectStoreImpl::RendererWebIDBObjectStoreImpl(
}
RendererWebIDBObjectStoreImpl::~RendererWebIDBObjectStoreImpl() {
+ // It's not possible for there to be pending callbacks that address this
+ // object since inside WebKit, they hold a reference to the object wich owns
+ // this object. But, if that ever changed, then we'd need to invalidate
+ // any such pointers.
RenderThread::current()->Send(
new IndexedDBHostMsg_ObjectStoreDestroyed(idb_object_store_id_));
}
diff --git a/chrome/renderer/renderer_webidbtransaction_impl.cc b/chrome/renderer/renderer_webidbtransaction_impl.cc
index 8a705e2..21fbe64 100644
--- a/chrome/renderer/renderer_webidbtransaction_impl.cc
+++ b/chrome/renderer/renderer_webidbtransaction_impl.cc
@@ -22,6 +22,10 @@ RendererWebIDBTransactionImpl::RendererWebIDBTransactionImpl(
}
RendererWebIDBTransactionImpl::~RendererWebIDBTransactionImpl() {
+ // It's not possible for there to be pending callbacks that address this
+ // object since inside WebKit, they hold a reference to the object wich owns
+ // this object. But, if that ever changed, then we'd need to invalidate
+ // any such pointers.
RenderThread::current()->Send(new IndexedDBHostMsg_TransactionDestroyed(
idb_transaction_id_));
}