| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/indexed_db/indexed_db_database_impl.h" | 5 #include "content/browser/indexed_db/indexed_db_database_impl.h" |
| 6 | 6 |
| 7 #include <math.h> | 7 #include <math.h> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 1219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1230 } | 1230 } |
| 1231 } | 1231 } |
| 1232 | 1232 |
| 1233 if (!backing_store_cursor) { | 1233 if (!backing_store_cursor) { |
| 1234 callbacks_->OnSuccess(static_cast<std::vector<char>*>(NULL)); | 1234 callbacks_->OnSuccess(static_cast<std::vector<char>*>(NULL)); |
| 1235 return; | 1235 return; |
| 1236 } | 1236 } |
| 1237 | 1237 |
| 1238 IndexedDBDatabase::TaskType task_type( | 1238 IndexedDBDatabase::TaskType task_type( |
| 1239 static_cast<IndexedDBDatabase::TaskType>(task_type_)); | 1239 static_cast<IndexedDBDatabase::TaskType>(task_type_)); |
| 1240 scoped_refptr<IndexedDBCursorImpl> cursor = | 1240 scoped_refptr<IndexedDBCursorImpl> cursor = IndexedDBCursorImpl::Create( |
| 1241 IndexedDBCursorImpl::Create(backing_store_cursor.Pass(), | 1241 backing_store_cursor.Pass(), cursor_type_, task_type, transaction); |
| 1242 cursor_type_, | |
| 1243 task_type, | |
| 1244 transaction, | |
| 1245 object_store_id_); | |
| 1246 callbacks_->OnSuccess( | 1242 callbacks_->OnSuccess( |
| 1247 cursor, cursor->key(), cursor->primary_key(), cursor->Value()); | 1243 cursor, cursor->key(), cursor->primary_key(), cursor->Value()); |
| 1248 } | 1244 } |
| 1249 | 1245 |
| 1250 void IndexedDBDatabaseImpl::Count( | 1246 void IndexedDBDatabaseImpl::Count( |
| 1251 int64 transaction_id, | 1247 int64 transaction_id, |
| 1252 int64 object_store_id, | 1248 int64 object_store_id, |
| 1253 int64 index_id, | 1249 int64 index_id, |
| 1254 scoped_ptr<IndexedDBKeyRange> key_range, | 1250 scoped_ptr<IndexedDBKeyRange> key_range, |
| 1255 scoped_refptr<IndexedDBCallbacksWrapper> callbacks) { | 1251 scoped_refptr<IndexedDBCallbacksWrapper> callbacks) { |
| (...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1814 | 1810 |
| 1815 void IndexedDBDatabaseImpl::VersionChangeAbortOperation::Perform( | 1811 void IndexedDBDatabaseImpl::VersionChangeAbortOperation::Perform( |
| 1816 IndexedDBTransaction* transaction) { | 1812 IndexedDBTransaction* transaction) { |
| 1817 IDB_TRACE("VersionChangeAbortOperation"); | 1813 IDB_TRACE("VersionChangeAbortOperation"); |
| 1818 DCHECK(!transaction); | 1814 DCHECK(!transaction); |
| 1819 database_->metadata_.version = previous_version_; | 1815 database_->metadata_.version = previous_version_; |
| 1820 database_->metadata_.int_version = previous_int_version_; | 1816 database_->metadata_.int_version = previous_int_version_; |
| 1821 } | 1817 } |
| 1822 | 1818 |
| 1823 } // namespace content | 1819 } // namespace content |
| OLD | NEW |