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/indexed_db/indexed_db_callbacks.h" | 5 #include "content/browser/indexed_db/indexed_db_callbacks.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 | 10 |
| (...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 156 DCHECK(dispatcher_host_.get()); | 156 DCHECK(dispatcher_host_.get()); |
| 157 | 157 |
| 158 DCHECK_EQ(kNoCursor, ipc_cursor_id_); | 158 DCHECK_EQ(kNoCursor, ipc_cursor_id_); |
| 159 DCHECK_NE(kNoTransaction, host_transaction_id_); | 159 DCHECK_NE(kNoTransaction, host_transaction_id_); |
| 160 DCHECK_EQ(kNoDatabase, ipc_database_id_); | 160 DCHECK_EQ(kNoDatabase, ipc_database_id_); |
| 161 DCHECK_NE(kNoDatabaseCallbacks, ipc_database_callbacks_id_); | 161 DCHECK_NE(kNoDatabaseCallbacks, ipc_database_callbacks_id_); |
| 162 | 162 |
| 163 dispatcher_host_->RegisterTransactionId(host_transaction_id_, origin_); | 163 dispatcher_host_->RegisterTransactionId(host_transaction_id_, origin_); |
| 164 int32_t ipc_database_id = | 164 int32_t ipc_database_id = |
| 165 dispatcher_host_->Add(connection.release(), ipc_thread_id_, origin_); | 165 dispatcher_host_->Add(connection.release(), ipc_thread_id_, origin_); |
| 166 | |
|
dmurph
2016/07/08 18:40:44
Remove whitespace changes in this file.
palakj1
2016/07/08 22:17:53
Done.
| |
| 166 if (ipc_database_id < 0) | 167 if (ipc_database_id < 0) |
| 167 return; | 168 return; |
| 168 ipc_database_id_ = ipc_database_id; | 169 ipc_database_id_ = ipc_database_id; |
| 169 IndexedDBMsg_CallbacksUpgradeNeeded_Params params; | 170 IndexedDBMsg_CallbacksUpgradeNeeded_Params params; |
| 170 params.ipc_thread_id = ipc_thread_id_; | 171 params.ipc_thread_id = ipc_thread_id_; |
| 171 params.ipc_callbacks_id = ipc_callbacks_id_; | 172 params.ipc_callbacks_id = ipc_callbacks_id_; |
| 172 params.ipc_database_id = ipc_database_id; | 173 params.ipc_database_id = ipc_database_id; |
| 173 params.ipc_database_callbacks_id = ipc_database_callbacks_id_; | 174 params.ipc_database_callbacks_id = ipc_database_callbacks_id_; |
| 174 params.old_version = old_version; | 175 params.old_version = old_version; |
| 175 params.idb_metadata = IndexedDBDispatcherHost::ConvertMetadata(metadata); | 176 params.idb_metadata = IndexedDBDispatcherHost::ConvertMetadata(metadata); |
| (...skipping 20 matching lines...) Expand all Loading... | |
| 196 DCHECK_NE(kNoDatabaseCallbacks, ipc_database_callbacks_id_); | 197 DCHECK_NE(kNoDatabaseCallbacks, ipc_database_callbacks_id_); |
| 197 | 198 |
| 198 scoped_refptr<IndexedDBCallbacks> self(this); | 199 scoped_refptr<IndexedDBCallbacks> self(this); |
| 199 | 200 |
| 200 int32_t ipc_object_id = kNoDatabase; | 201 int32_t ipc_object_id = kNoDatabase; |
| 201 // Only register if the connection was not previously sent in OnUpgradeNeeded. | 202 // Only register if the connection was not previously sent in OnUpgradeNeeded. |
| 202 if (ipc_database_id_ == kNoDatabase) { | 203 if (ipc_database_id_ == kNoDatabase) { |
| 203 ipc_object_id = | 204 ipc_object_id = |
| 204 dispatcher_host_->Add(connection.release(), ipc_thread_id_, origin_); | 205 dispatcher_host_->Add(connection.release(), ipc_thread_id_, origin_); |
| 205 } | 206 } |
| 206 | |
| 207 dispatcher_host_->Send(new IndexedDBMsg_CallbacksSuccessIDBDatabase( | 207 dispatcher_host_->Send(new IndexedDBMsg_CallbacksSuccessIDBDatabase( |
| 208 ipc_thread_id_, | 208 ipc_thread_id_, |
| 209 ipc_callbacks_id_, | 209 ipc_callbacks_id_, |
| 210 ipc_database_callbacks_id_, | 210 ipc_database_callbacks_id_, |
| 211 ipc_object_id, | 211 ipc_object_id, |
| 212 IndexedDBDispatcherHost::ConvertMetadata(metadata))); | 212 IndexedDBDispatcherHost::ConvertMetadata(metadata))); |
| 213 dispatcher_host_ = NULL; | 213 dispatcher_host_ = NULL; |
| 214 | 214 |
| 215 if (!connection_open_start_time_.is_null()) { | 215 if (!connection_open_start_time_.is_null()) { |
| 216 UMA_HISTOGRAM_MEDIUM_TIMES( | 216 UMA_HISTOGRAM_MEDIUM_TIMES( |
| (...skipping 390 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 607 ipc_thread_id_, ipc_callbacks_id_)); | 607 ipc_thread_id_, ipc_callbacks_id_)); |
| 608 dispatcher_host_ = NULL; | 608 dispatcher_host_ = NULL; |
| 609 } | 609 } |
| 610 | 610 |
| 611 void IndexedDBCallbacks::SetConnectionOpenStartTime( | 611 void IndexedDBCallbacks::SetConnectionOpenStartTime( |
| 612 const base::TimeTicks& start_time) { | 612 const base::TimeTicks& start_time) { |
| 613 connection_open_start_time_ = start_time; | 613 connection_open_start_time_ = start_time; |
| 614 } | 614 } |
| 615 | 615 |
| 616 } // namespace content | 616 } // namespace content |
| OLD | NEW |