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

Unified Diff: content/browser/indexed_db/indexed_db_database.cc

Issue 377953002: IndexedDB: Cleanup of r281546 following Blink roll (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 months 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
« no previous file with comments | « no previous file | content/browser/indexed_db/indexed_db_database_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/indexed_db/indexed_db_database.cc
diff --git a/content/browser/indexed_db/indexed_db_database.cc b/content/browser/indexed_db/indexed_db_database.cc
index fa2ccc58c963ba85285f8d4ed894d944980cc7ba..6bdb9ac961ab1137e591fd692085030ab2c31eae 100644
--- a/content/browser/indexed_db/indexed_db_database.cc
+++ b/content/browser/indexed_db/indexed_db_database.cc
@@ -1603,17 +1603,8 @@ void IndexedDBDatabase::RunVersionChangeTransaction(
requested_version);
}
}
-
- // TODO(jsbell): Remove once Blink is updated. crbug.com/100123
-#if WEB_INDEXEDDB_FIRE_BLOCKED_ONLY_IF_IGNORED
// OnBlocked will be fired at the request when one of the other
// connections acks that the OnVersionChange was ignored.
-#else
- // TODO(jsbell): Remove the call to OnBlocked and instead wait
- // until the frontend tells us that all the "versionchange" events
- // have been delivered. http://crbug.com/100123
- callbacks->OnBlocked(metadata_.int_version);
-#endif
DCHECK(!pending_run_version_change_transaction_call_);
pending_run_version_change_transaction_call_.reset(new PendingUpgradeCall(
@@ -1657,17 +1648,8 @@ void IndexedDBDatabase::DeleteDatabase(
(*it)->callbacks()->OnVersionChange(
metadata_.int_version, IndexedDBDatabaseMetadata::NO_INT_VERSION);
}
-
- // TODO(jsbell): Remove once Blink is updated. crbug.com/100123
-#if WEB_INDEXEDDB_FIRE_BLOCKED_ONLY_IF_IGNORED
// OnBlocked will be fired at the request when one of the other
// connections acks that the OnVersionChange was ignored.
-#else
- // TODO(jsbell): Only fire OnBlocked if there are open
- // connections after the VersionChangeEvents are received, not
- // just set up to fire. http://crbug.com/100123
- callbacks->OnBlocked(metadata_.int_version);
-#endif
pending_delete_calls_.push_back(new PendingDeleteCall(callbacks));
return;
« no previous file with comments | « no previous file | content/browser/indexed_db/indexed_db_database_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698