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

Unified 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: Test added 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 side-by-side diff with in-line comments
Download patch
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 a73ba298ee5616a7fdbbe4925781907e33cae45f..4dae3118f3eba4807602a9e2854aca9ec15312d5 100644
--- a/content/browser/indexed_db/indexed_db_database.cc
+++ b/content/browser/indexed_db/indexed_db_database.cc
@@ -29,6 +29,8 @@
#include "content/browser/indexed_db/indexed_db_cursor.h"
#include "content/browser/indexed_db/indexed_db_factory.h"
#include "content/browser/indexed_db/indexed_db_index_writer.h"
+#include "content/browser/indexed_db/indexed_db_observation.h"
+#include "content/browser/indexed_db/indexed_db_observer_changes.h"
#include "content/browser/indexed_db/indexed_db_pending_connection.h"
#include "content/browser/indexed_db/indexed_db_return_value.h"
#include "content/browser/indexed_db/indexed_db_tracing.h"
@@ -542,11 +544,12 @@ void IndexedDBDatabase::Abort(int64_t transaction_id,
}
void IndexedDBDatabase::AddPendingObserver(int64_t transaction_id,
- int32_t observer_id) {
+ int32_t observer_id,
+ IndexedDBObserver::Options options) {
IndexedDBTransaction* transaction = GetTransaction(transaction_id);
if (!transaction)
return;
- transaction->AddPendingObserver(observer_id);
+ transaction->AddPendingObserver(observer_id, options);
}
void IndexedDBDatabase::RemovePendingObservers(
@@ -561,6 +564,44 @@ void IndexedDBDatabase::RemovePendingObservers(
}
}
+// TODO(palakj): Augment the function with IDBValue later.
palmer 2016/07/16 00:03:14 It's always a good idea to refer to a crbug.com li
palakj1 2016/07/18 22:02:29 Done
+void IndexedDBDatabase::FilterObservation(IndexedDBTransaction* transaction,
+ int64_t object_store_id,
+ blink::WebIDBOperationType type,
+ const IndexedDBKeyRange& key_range) {
+ for (const auto* connection : connections_) {
+ bool recorded = false;
+ for (const auto& observer : connection->active_observers()) {
+ if (!observer->IsRecordingType(type) ||
+ !observer->IsRecordingObjectStore(object_store_id))
+ continue;
+ if (!recorded) {
+ if (type == blink::WebIDBClear) {
+ transaction->AddObservation(connection->id(),
+ base::WrapUnique(new IndexedDBObservation(
+ object_store_id, type)));
+ } else {
+ transaction->AddObservation(connection->id(),
+ base::WrapUnique(new IndexedDBObservation(
+ object_store_id, type, key_range)));
+ }
+ recorded = true;
+ }
+ transaction->RecordObserverForLastObservation(connection->id(),
+ observer->id());
+ }
+ }
+}
+
+void IndexedDBDatabase::SendObservations(
+ std::map<int32_t, std::unique_ptr<IndexedDBObserverChanges>> changes_map) {
+ for (const auto& conn : connections_) {
palmer 2016/07/16 00:03:14 Nit: Up above (line 572) you said for (const
palakj1 2016/07/18 22:02:29 Done
+ auto it = changes_map.find(conn->id());
+ if (it != changes_map.end())
+ conn->callbacks()->OnDatabaseChange(it->first, std::move(it->second));
+ }
+}
+
void IndexedDBDatabase::GetAll(int64_t transaction_id,
int64_t object_store_id,
int64_t index_id,
@@ -1115,6 +1156,11 @@ void IndexedDBDatabase::PutOperation(std::unique_ptr<PutOperationParams> params,
transaction->id());
params->callbacks->OnSuccess(*key);
}
+ FilterObservation(transaction, params->object_store_id,
+ params->put_mode == blink::WebIDBPutModeAddOnly
+ ? blink::WebIDBAdd
+ : blink::WebIDBPut,
+ IndexedDBKeyRange(*key));
}
void IndexedDBDatabase::SetIndexKeys(int64_t transaction_id,
@@ -1458,6 +1504,8 @@ void IndexedDBDatabase::DeleteRangeOperation(
} else {
callbacks->OnSuccess();
}
+ FilterObservation(transaction, object_store_id, blink::WebIDBDelete,
+ *key_range);
}
void IndexedDBDatabase::Clear(int64_t transaction_id,
@@ -1493,6 +1541,9 @@ void IndexedDBDatabase::ClearOperation(
return;
}
callbacks->OnSuccess();
+
+ FilterObservation(transaction, object_store_id, blink::WebIDBClear,
+ IndexedDBKeyRange());
}
void IndexedDBDatabase::DeleteObjectStoreOperation(

Powered by Google App Engine
This is Rietveld 408576698