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_transaction.h" | 5 #include "content/browser/indexed_db/indexed_db_transaction.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/location.h" | 8 #include "base/location.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/memory/ptr_util.h" | 10 #include "base/memory/ptr_util.h" |
11 #include "base/single_thread_task_runner.h" | 11 #include "base/single_thread_task_runner.h" |
12 #include "base/stl_util.h" | 12 #include "base/stl_util.h" |
13 #include "base/strings/utf_string_conversions.h" | 13 #include "base/strings/utf_string_conversions.h" |
14 #include "base/threading/thread_task_runner_handle.h" | 14 #include "base/threading/thread_task_runner_handle.h" |
15 #include "content/browser/indexed_db/indexed_db_backing_store.h" | 15 #include "content/browser/indexed_db/indexed_db_backing_store.h" |
16 #include "content/browser/indexed_db/indexed_db_cursor.h" | 16 #include "content/browser/indexed_db/indexed_db_cursor.h" |
17 #include "content/browser/indexed_db/indexed_db_database.h" | 17 #include "content/browser/indexed_db/indexed_db_database.h" |
18 #include "content/browser/indexed_db/indexed_db_database_callbacks.h" | 18 #include "content/browser/indexed_db/indexed_db_database_callbacks.h" |
19 #include "content/browser/indexed_db/indexed_db_observation.h" | |
19 #include "content/browser/indexed_db/indexed_db_observer.h" | 20 #include "content/browser/indexed_db/indexed_db_observer.h" |
21 #include "content/browser/indexed_db/indexed_db_observer_changes.h" | |
20 #include "content/browser/indexed_db/indexed_db_tracing.h" | 22 #include "content/browser/indexed_db/indexed_db_tracing.h" |
21 #include "content/browser/indexed_db/indexed_db_transaction_coordinator.h" | 23 #include "content/browser/indexed_db/indexed_db_transaction_coordinator.h" |
22 #include "third_party/WebKit/public/platform/modules/indexeddb/WebIDBDatabaseExc eption.h" | 24 #include "third_party/WebKit/public/platform/modules/indexeddb/WebIDBDatabaseExc eption.h" |
23 #include "third_party/leveldatabase/env_chromium.h" | 25 #include "third_party/leveldatabase/env_chromium.h" |
24 | 26 |
25 namespace content { | 27 namespace content { |
26 | 28 |
27 namespace { | 29 namespace { |
28 | 30 |
29 const int64_t kInactivityTimeoutPeriodSeconds = 60; | 31 const int64_t kInactivityTimeoutPeriodSeconds = 60; |
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
349 // TODO (palakj) : Send Observations to observers | 351 // TODO (palakj) : Send Observations to observers |
350 if (!pending_observers_.empty() && connection_) | 352 if (!pending_observers_.empty() && connection_) |
351 connection_->ActivatePendingObservers(std::move(pending_observers_)); | 353 connection_->ActivatePendingObservers(std::move(pending_observers_)); |
352 abort_task_stack_.clear(); | 354 abort_task_stack_.clear(); |
353 { | 355 { |
354 IDB_TRACE1( | 356 IDB_TRACE1( |
355 "IndexedDBTransaction::CommitPhaseTwo.TransactionCompleteCallbacks", | 357 "IndexedDBTransaction::CommitPhaseTwo.TransactionCompleteCallbacks", |
356 "txn.id", id()); | 358 "txn.id", id()); |
357 callbacks_->OnComplete(id_); | 359 callbacks_->OnComplete(id_); |
358 } | 360 } |
361 database_->SendObservations(std::move(connection_changes_map_)); | |
dmurph
2016/07/08 18:40:44
Activate pending observers after this.
palakj1
2016/07/08 22:17:54
Sorry. Moving the orders.
| |
359 database_->TransactionFinished(this, true); | 362 database_->TransactionFinished(this, true); |
360 } else { | 363 } else { |
361 while (!abort_task_stack_.empty()) | 364 while (!abort_task_stack_.empty()) |
362 abort_task_stack_.pop().Run(NULL); | 365 abort_task_stack_.pop().Run(NULL); |
363 | 366 |
364 IndexedDBDatabaseError error; | 367 IndexedDBDatabaseError error; |
365 if (leveldb_env::IndicatesDiskFull(s)) { | 368 if (leveldb_env::IndicatesDiskFull(s)) { |
366 error = IndexedDBDatabaseError( | 369 error = IndexedDBDatabaseError( |
367 blink::WebIDBDatabaseExceptionQuotaError, | 370 blink::WebIDBDatabaseExceptionQuotaError, |
368 "Encountered disk full while committing transaction."); | 371 "Encountered disk full while committing transaction."); |
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
450 | 453 |
451 void IndexedDBTransaction::CloseOpenCursors() { | 454 void IndexedDBTransaction::CloseOpenCursors() { |
452 IDB_TRACE1("IndexedDBTransaction::CloseOpenCursors", "txn.id", id()); | 455 IDB_TRACE1("IndexedDBTransaction::CloseOpenCursors", "txn.id", id()); |
453 for (auto* cursor : open_cursors_) | 456 for (auto* cursor : open_cursors_) |
454 cursor->Close(); | 457 cursor->Close(); |
455 open_cursors_.clear(); | 458 open_cursors_.clear(); |
456 } | 459 } |
457 | 460 |
458 void IndexedDBTransaction::AddPendingObserver(int32_t observer_id) { | 461 void IndexedDBTransaction::AddPendingObserver(int32_t observer_id) { |
459 pending_observers_.push_back( | 462 pending_observers_.push_back( |
460 base::WrapUnique(new IndexedDBObserver(observer_id))); | 463 base::WrapUnique(new IndexedDBObserver(observer_id, object_store_ids_))); |
461 } | 464 } |
462 | 465 |
463 void IndexedDBTransaction::RemovePendingObservers( | 466 void IndexedDBTransaction::RemovePendingObservers( |
464 const std::vector<int32_t>& pending_observer_ids) { | 467 const std::vector<int32_t>& pending_observer_ids) { |
465 const auto& it = std::remove_if( | 468 const auto& it = std::remove_if( |
466 pending_observers_.begin(), pending_observers_.end(), | 469 pending_observers_.begin(), pending_observers_.end(), |
467 [&pending_observer_ids](const std::unique_ptr<IndexedDBObserver>& o) { | 470 [&pending_observer_ids](const std::unique_ptr<IndexedDBObserver>& o) { |
468 return ContainsValue(pending_observer_ids, o->id()); | 471 return ContainsValue(pending_observer_ids, o->id()); |
469 }); | 472 }); |
470 if (it != pending_observers_.end()) | 473 if (it != pending_observers_.end()) |
471 pending_observers_.erase(it, pending_observers_.end()); | 474 pending_observers_.erase(it, pending_observers_.end()); |
472 } | 475 } |
473 | 476 |
477 void IndexedDBTransaction::AddObservation( | |
478 int32_t connection_id, | |
479 std::unique_ptr<IndexedDBObservation> observation) { | |
480 connection_changes_map_[connection_id]->AddObservation( | |
481 std::move(observation)); | |
482 } | |
483 | |
484 void IndexedDBTransaction::AddObservationIndex(int32_t observer_id, | |
485 int32_t connection_id) { | |
486 connection_changes_map_[connection_id]->AddObservationIndex(observer_id); | |
487 } | |
488 | |
474 } // namespace content | 489 } // namespace content |
OLD | NEW |