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

Side by Side Diff: content/browser/indexed_db/indexed_db_database.cc

Issue 2125213002: [IndexedDB] Propogating changes to observers : Renderer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lifetime
Patch Set: Filtering Changes to Observer : Browser End Created 4 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 unified diff | Download patch
OLDNEW
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.h" 5 #include "content/browser/indexed_db/indexed_db_database.h"
6 6
7 #include <math.h> 7 #include <math.h>
8 8
9 #include <limits> 9 #include <limits>
10 #include <memory> 10 #include <memory>
(...skipping 19 matching lines...) Expand all
30 #include "content/browser/indexed_db/indexed_db_factory.h" 30 #include "content/browser/indexed_db/indexed_db_factory.h"
31 #include "content/browser/indexed_db/indexed_db_index_writer.h" 31 #include "content/browser/indexed_db/indexed_db_index_writer.h"
32 #include "content/browser/indexed_db/indexed_db_pending_connection.h" 32 #include "content/browser/indexed_db/indexed_db_pending_connection.h"
33 #include "content/browser/indexed_db/indexed_db_return_value.h" 33 #include "content/browser/indexed_db/indexed_db_return_value.h"
34 #include "content/browser/indexed_db/indexed_db_tracing.h" 34 #include "content/browser/indexed_db/indexed_db_tracing.h"
35 #include "content/browser/indexed_db/indexed_db_transaction.h" 35 #include "content/browser/indexed_db/indexed_db_transaction.h"
36 #include "content/browser/indexed_db/indexed_db_value.h" 36 #include "content/browser/indexed_db/indexed_db_value.h"
37 #include "content/common/indexed_db/indexed_db_constants.h" 37 #include "content/common/indexed_db/indexed_db_constants.h"
38 #include "content/common/indexed_db/indexed_db_key_path.h" 38 #include "content/common/indexed_db/indexed_db_key_path.h"
39 #include "content/common/indexed_db/indexed_db_key_range.h" 39 #include "content/common/indexed_db/indexed_db_key_range.h"
40 #include "content/common/indexed_db/indexed_db_observation.h"
40 #include "content/public/common/content_switches.h" 41 #include "content/public/common/content_switches.h"
41 #include "storage/browser/blob/blob_data_handle.h" 42 #include "storage/browser/blob/blob_data_handle.h"
42 #include "third_party/WebKit/public/platform/modules/indexeddb/WebIDBDatabaseExc eption.h" 43 #include "third_party/WebKit/public/platform/modules/indexeddb/WebIDBDatabaseExc eption.h"
43 #include "third_party/leveldatabase/env_chromium.h" 44 #include "third_party/leveldatabase/env_chromium.h"
44 #include "url/origin.h" 45 #include "url/origin.h"
45 46
46 using base::ASCIIToUTF16; 47 using base::ASCIIToUTF16;
47 using base::Int64ToString16; 48 using base::Int64ToString16;
48 using blink::WebIDBKeyTypeNumber; 49 using blink::WebIDBKeyTypeNumber;
49 50
(...skipping 504 matching lines...) Expand 10 before | Expand all | Expand 10 after
554 const std::vector<int32_t>& pending_observer_ids) { 555 const std::vector<int32_t>& pending_observer_ids) {
555 TransactionMap::iterator it; 556 TransactionMap::iterator it;
556 for (it = transactions_.begin(); it != transactions_.end(); it++) { 557 for (it = transactions_.begin(); it != transactions_.end(); it++) {
557 // Avoid call to RemovePendingObservers for transactions on other 558 // Avoid call to RemovePendingObservers for transactions on other
558 // connections. 559 // connections.
559 if (it->second->connection() == connection) 560 if (it->second->connection() == connection)
560 it->second->RemovePendingObservers(pending_observer_ids); 561 it->second->RemovePendingObservers(pending_observer_ids);
561 } 562 }
562 } 563 }
563 564
565 // TODO(palakj): Augment the function with IDBValue later.
566 void IndexedDBDatabase::FilterObservation(
567 IndexedDBTransaction* transaction,
568 int64_t object_store_id,
569 IndexedDBObservation::OperationType type,
570 const IndexedDBKeyRange& key_range) {
571 bool recorded = false;
572 for (const auto* connection : connections_) {
573 if (!connection)
cmumford 2016/07/07 21:14:21 How would a NULL connection wind up in connections
palakj1 2016/07/08 17:37:55 Right, that's redundant.
574 continue;
575
576 const std::vector<std::unique_ptr<IndexedDBObserver>>& observers =
577 connection->active_observers();
578 for (const auto& observer : observers) {
cmumford 2016/07/07 21:14:21 Just use: for (const auto& observer : connectio
palakj1 2016/07/08 17:37:55 Done.
579 if (observer->IsRecordingType(type) &&
580 observer->IsRecordingObjectStore(object_store_id)) {
581 if (!recorded) {
582 if (type == IndexedDBObservation::OperationType::CLEAR) {
583 transaction->AddObservation(
584 connection->id(),
585 base::WrapUnique(new IndexedDBObservation(type)));
586 } else {
587 transaction->AddObservation(
588 connection->id(),
589 base::WrapUnique(new IndexedDBObservation(type, key_range)));
590 }
591 recorded = true;
592 }
593 transaction->AddObservationIndex(observer->id(), connection->id());
594 }
595 }
596 }
597 }
598
599 void IndexedDBDatabase::SendObservations(
600 std::map<int32_t, std::unique_ptr<IndexedDBObserverChanges>> change_map) {
601 for (const auto& it : connections_) {
cmumford 2016/07/07 21:14:21 Nit: no need for braces for a single line.
palakj1 2016/07/08 17:37:55 Done.
602 it->callbacks()->OnDatabaseChange(std::move(change_map[it->id()]));
603 }
604 }
605
564 void IndexedDBDatabase::GetAll(int64_t transaction_id, 606 void IndexedDBDatabase::GetAll(int64_t transaction_id,
565 int64_t object_store_id, 607 int64_t object_store_id,
566 int64_t index_id, 608 int64_t index_id,
567 std::unique_ptr<IndexedDBKeyRange> key_range, 609 std::unique_ptr<IndexedDBKeyRange> key_range,
568 bool key_only, 610 bool key_only,
569 int64_t max_count, 611 int64_t max_count,
570 scoped_refptr<IndexedDBCallbacks> callbacks) { 612 scoped_refptr<IndexedDBCallbacks> callbacks) {
571 IDB_TRACE1("IndexedDBDatabase::GetAll", "txn.id", transaction_id); 613 IDB_TRACE1("IndexedDBDatabase::GetAll", "txn.id", transaction_id);
572 IndexedDBTransaction* transaction = GetTransaction(transaction_id); 614 IndexedDBTransaction* transaction = GetTransaction(transaction_id);
573 if (!transaction) 615 if (!transaction)
(...skipping 534 matching lines...) Expand 10 before | Expand all | Expand 10 after
1108 if (s.IsCorruption()) 1150 if (s.IsCorruption())
1109 factory_->HandleBackingStoreCorruption(backing_store_->origin(), error); 1151 factory_->HandleBackingStoreCorruption(backing_store_->origin(), error);
1110 return; 1152 return;
1111 } 1153 }
1112 } 1154 }
1113 { 1155 {
1114 IDB_TRACE1("IndexedDBDatabase::PutOperation.Callbacks", "txn.id", 1156 IDB_TRACE1("IndexedDBDatabase::PutOperation.Callbacks", "txn.id",
1115 transaction->id()); 1157 transaction->id());
1116 params->callbacks->OnSuccess(*key); 1158 params->callbacks->OnSuccess(*key);
1117 } 1159 }
1160
1161 FilterObservation(transaction, params->object_store_id,
1162 params->put_mode == blink::WebIDBPutModeAddOnly
1163 ? IndexedDBObservation::OperationType::ADD
1164 : IndexedDBObservation::OperationType::PUT,
1165 IndexedDBKeyRange(*key)); // std::move
1118 } 1166 }
1119 1167
1120 void IndexedDBDatabase::SetIndexKeys(int64_t transaction_id, 1168 void IndexedDBDatabase::SetIndexKeys(int64_t transaction_id,
1121 int64_t object_store_id, 1169 int64_t object_store_id,
1122 std::unique_ptr<IndexedDBKey> primary_key, 1170 std::unique_ptr<IndexedDBKey> primary_key,
1123 const std::vector<IndexKeys>& index_keys) { 1171 const std::vector<IndexKeys>& index_keys) {
1124 IDB_TRACE1("IndexedDBDatabase::SetIndexKeys", "txn.id", transaction_id); 1172 IDB_TRACE1("IndexedDBDatabase::SetIndexKeys", "txn.id", transaction_id);
1125 IndexedDBTransaction* transaction = GetTransaction(transaction_id); 1173 IndexedDBTransaction* transaction = GetTransaction(transaction_id);
1126 if (!transaction) 1174 if (!transaction)
1127 return; 1175 return;
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
1451 if (s.IsCorruption()) { 1499 if (s.IsCorruption()) {
1452 factory_->HandleBackingStoreCorruption(backing_store_->origin(), error); 1500 factory_->HandleBackingStoreCorruption(backing_store_->origin(), error);
1453 } 1501 }
1454 return; 1502 return;
1455 } 1503 }
1456 if (experimental_web_platform_features_enabled_) { 1504 if (experimental_web_platform_features_enabled_) {
1457 callbacks->OnSuccess(base::checked_cast<int64_t>(delete_count)); 1505 callbacks->OnSuccess(base::checked_cast<int64_t>(delete_count));
1458 } else { 1506 } else {
1459 callbacks->OnSuccess(); 1507 callbacks->OnSuccess();
1460 } 1508 }
1509 FilterObservation(transaction, object_store_id,
1510 IndexedDBObservation::OperationType::DELETE, *key_range);
1461 } 1511 }
1462 1512
1463 void IndexedDBDatabase::Clear(int64_t transaction_id, 1513 void IndexedDBDatabase::Clear(int64_t transaction_id,
1464 int64_t object_store_id, 1514 int64_t object_store_id,
1465 scoped_refptr<IndexedDBCallbacks> callbacks) { 1515 scoped_refptr<IndexedDBCallbacks> callbacks) {
1466 IDB_TRACE1("IndexedDBDatabase::Clear", "txn.id", transaction_id); 1516 IDB_TRACE1("IndexedDBDatabase::Clear", "txn.id", transaction_id);
1467 IndexedDBTransaction* transaction = GetTransaction(transaction_id); 1517 IndexedDBTransaction* transaction = GetTransaction(transaction_id);
1468 if (!transaction) 1518 if (!transaction)
1469 return; 1519 return;
1470 DCHECK_NE(transaction->mode(), blink::WebIDBTransactionModeReadOnly); 1520 DCHECK_NE(transaction->mode(), blink::WebIDBTransactionModeReadOnly);
(...skipping 15 matching lines...) Expand all
1486 if (!s.ok()) { 1536 if (!s.ok()) {
1487 IndexedDBDatabaseError error(blink::WebIDBDatabaseExceptionUnknownError, 1537 IndexedDBDatabaseError error(blink::WebIDBDatabaseExceptionUnknownError,
1488 "Internal error clearing object store"); 1538 "Internal error clearing object store");
1489 callbacks->OnError(error); 1539 callbacks->OnError(error);
1490 if (s.IsCorruption()) { 1540 if (s.IsCorruption()) {
1491 factory_->HandleBackingStoreCorruption(backing_store_->origin(), error); 1541 factory_->HandleBackingStoreCorruption(backing_store_->origin(), error);
1492 } 1542 }
1493 return; 1543 return;
1494 } 1544 }
1495 callbacks->OnSuccess(); 1545 callbacks->OnSuccess();
1546
1547 // FilterObservation(transaction, object_store_id,
cmumford 2016/07/07 21:14:21 Why is this commented out?
palakj1 2016/07/08 17:37:55 Done.
1548 // IndexedDBObservation::OperationType::CLEAR, );
1496 } 1549 }
1497 1550
1498 void IndexedDBDatabase::DeleteObjectStoreOperation( 1551 void IndexedDBDatabase::DeleteObjectStoreOperation(
1499 int64_t object_store_id, 1552 int64_t object_store_id,
1500 IndexedDBTransaction* transaction) { 1553 IndexedDBTransaction* transaction) {
1501 IDB_TRACE1("IndexedDBDatabase::DeleteObjectStoreOperation", 1554 IDB_TRACE1("IndexedDBDatabase::DeleteObjectStoreOperation",
1502 "txn.id", 1555 "txn.id",
1503 transaction->id()); 1556 transaction->id());
1504 1557
1505 const IndexedDBObjectStoreMetadata object_store_metadata = 1558 const IndexedDBObjectStoreMetadata object_store_metadata =
(...skipping 464 matching lines...) Expand 10 before | Expand all | Expand 10 after
1970 2023
1971 void IndexedDBDatabase::VersionChangeAbortOperation( 2024 void IndexedDBDatabase::VersionChangeAbortOperation(
1972 int64_t previous_version, 2025 int64_t previous_version,
1973 IndexedDBTransaction* transaction) { 2026 IndexedDBTransaction* transaction) {
1974 DCHECK(!transaction); 2027 DCHECK(!transaction);
1975 IDB_TRACE("IndexedDBDatabase::VersionChangeAbortOperation"); 2028 IDB_TRACE("IndexedDBDatabase::VersionChangeAbortOperation");
1976 metadata_.version = previous_version; 2029 metadata_.version = previous_version;
1977 } 2030 }
1978 2031
1979 } // namespace content 2032 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698