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

Side by Side Diff: content/child/indexed_db/webidbdatabase_impl.cc

Issue 2062203004: IDBObserver: Lifetime Management: Adding Observer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Expected test results changed 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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/child/indexed_db/webidbdatabase_impl.h" 5 #include "content/child/indexed_db/webidbdatabase_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/stl_util.h"
12 #include "content/child/indexed_db/indexed_db_dispatcher.h" 13 #include "content/child/indexed_db/indexed_db_dispatcher.h"
13 #include "content/child/indexed_db/indexed_db_key_builders.h" 14 #include "content/child/indexed_db/indexed_db_key_builders.h"
14 #include "content/child/thread_safe_sender.h" 15 #include "content/child/thread_safe_sender.h"
15 #include "content/child/worker_thread_registry.h" 16 #include "content/child/worker_thread_registry.h"
16 #include "content/common/indexed_db/indexed_db_messages.h" 17 #include "content/common/indexed_db/indexed_db_messages.h"
17 #include "third_party/WebKit/public/platform/WebBlobInfo.h" 18 #include "third_party/WebKit/public/platform/WebBlobInfo.h"
18 #include "third_party/WebKit/public/platform/WebString.h" 19 #include "third_party/WebKit/public/platform/WebString.h"
19 #include "third_party/WebKit/public/platform/WebVector.h" 20 #include "third_party/WebKit/public/platform/WebVector.h"
20 #include "third_party/WebKit/public/platform/modules/indexeddb/WebIDBKeyPath.h" 21 #include "third_party/WebKit/public/platform/modules/indexeddb/WebIDBKeyPath.h"
21 #include "third_party/WebKit/public/platform/modules/indexeddb/WebIDBMetadata.h" 22 #include "third_party/WebKit/public/platform/modules/indexeddb/WebIDBMetadata.h"
23 #include "third_party/WebKit/public/platform/modules/indexeddb/WebIDBObserver.h"
22 24
23 using blink::WebBlobInfo; 25 using blink::WebBlobInfo;
24 using blink::WebIDBCallbacks; 26 using blink::WebIDBCallbacks;
25 using blink::WebIDBCursor; 27 using blink::WebIDBCursor;
26 using blink::WebIDBDatabase; 28 using blink::WebIDBDatabase;
27 using blink::WebIDBDatabaseCallbacks; 29 using blink::WebIDBDatabaseCallbacks;
28 using blink::WebIDBMetadata; 30 using blink::WebIDBMetadata;
29 using blink::WebIDBKey; 31 using blink::WebIDBKey;
30 using blink::WebIDBKeyPath; 32 using blink::WebIDBKeyPath;
31 using blink::WebIDBKeyRange; 33 using blink::WebIDBKeyRange;
34 using blink::WebIDBObserver;
cmumford 2016/07/01 18:35:01 Either forward declare (if possible), or #include
palakj1 2016/07/02 00:48:14 Done.
32 using blink::WebString; 35 using blink::WebString;
33 using blink::WebVector; 36 using blink::WebVector;
34 37
35 namespace content { 38 namespace content {
36 39
37 WebIDBDatabaseImpl::WebIDBDatabaseImpl(int32_t ipc_database_id, 40 WebIDBDatabaseImpl::WebIDBDatabaseImpl(int32_t ipc_database_id,
38 int32_t ipc_database_callbacks_id, 41 int32_t ipc_database_callbacks_id,
39 ThreadSafeSender* thread_safe_sender) 42 ThreadSafeSender* thread_safe_sender)
40 : ipc_database_id_(ipc_database_id), 43 : ipc_database_id_(ipc_database_id),
41 ipc_database_callbacks_id_(ipc_database_callbacks_id), 44 ipc_database_callbacks_id_(ipc_database_callbacks_id),
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 blink::WebIDBTransactionMode mode) { 86 blink::WebIDBTransactionMode mode) {
84 IndexedDBDispatcher* dispatcher = 87 IndexedDBDispatcher* dispatcher =
85 IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get()); 88 IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
86 dispatcher->RequestIDBDatabaseCreateTransaction( 89 dispatcher->RequestIDBDatabaseCreateTransaction(
87 ipc_database_id_, transaction_id, callbacks, object_store_ids, mode); 90 ipc_database_id_, transaction_id, callbacks, object_store_ids, mode);
88 } 91 }
89 92
90 void WebIDBDatabaseImpl::close() { 93 void WebIDBDatabaseImpl::close() {
91 IndexedDBDispatcher* dispatcher = 94 IndexedDBDispatcher* dispatcher =
92 IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get()); 95 IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
96 dispatcher->RemoveIDBObservers(observer_ids_);
93 dispatcher->RequestIDBDatabaseClose(ipc_database_id_, 97 dispatcher->RequestIDBDatabaseClose(ipc_database_id_,
94 ipc_database_callbacks_id_); 98 ipc_database_callbacks_id_);
95 } 99 }
96 100
97 void WebIDBDatabaseImpl::versionChangeIgnored() { 101 void WebIDBDatabaseImpl::versionChangeIgnored() {
98 IndexedDBDispatcher* dispatcher = 102 IndexedDBDispatcher* dispatcher =
99 IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get()); 103 IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
100 dispatcher->NotifyIDBDatabaseVersionChangeIgnored(ipc_database_id_); 104 dispatcher->NotifyIDBDatabaseVersionChangeIgnored(ipc_database_id_);
101 } 105 }
102 106
107 int32_t WebIDBDatabaseImpl::addObserver(
108 std::unique_ptr<WebIDBObserver> observer,
109 long long transaction_id) {
110 IndexedDBDispatcher* dispatcher =
111 IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
112
113 int32_t observer_id = dispatcher->AddIDBObserver(
114 ipc_database_id_, transaction_id, std::move(observer));
115 observer_ids_.insert(observer_id);
116 return observer_id;
117 }
118
119 bool WebIDBDatabaseImpl::containsObserverId(int32_t id) const {
120 return ContainsValue(observer_ids_, id);
121 }
122
123 void WebIDBDatabaseImpl::removeObservers(
124 const std::vector<int32_t>& observer_ids_to_remove) {
125 for (int32_t id : observer_ids_to_remove)
126 observer_ids_.erase(id);
127
128 IndexedDBDispatcher* dispatcher =
129 IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
130 dispatcher->RemoveIDBObserversFromDatabase(ipc_database_id_,
131 observer_ids_to_remove);
132 }
133
103 void WebIDBDatabaseImpl::get(long long transaction_id, 134 void WebIDBDatabaseImpl::get(long long transaction_id,
104 long long object_store_id, 135 long long object_store_id,
105 long long index_id, 136 long long index_id,
106 const WebIDBKeyRange& key_range, 137 const WebIDBKeyRange& key_range,
107 bool key_only, 138 bool key_only,
108 WebIDBCallbacks* callbacks) { 139 WebIDBCallbacks* callbacks) {
109 IndexedDBDispatcher* dispatcher = 140 IndexedDBDispatcher* dispatcher =
110 IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get()); 141 IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
111 dispatcher->RequestIDBDatabaseGet(ipc_database_id_, 142 dispatcher->RequestIDBDatabaseGet(ipc_database_id_,
112 transaction_id, 143 transaction_id,
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 322
292 void WebIDBDatabaseImpl::ackReceivedBlobs(const WebVector<WebString>& uuids) { 323 void WebIDBDatabaseImpl::ackReceivedBlobs(const WebVector<WebString>& uuids) {
293 DCHECK(uuids.size()); 324 DCHECK(uuids.size());
294 std::vector<std::string> param(uuids.size()); 325 std::vector<std::string> param(uuids.size());
295 for (size_t i = 0; i < uuids.size(); ++i) 326 for (size_t i = 0; i < uuids.size(); ++i)
296 param[i] = uuids[i].latin1().data(); 327 param[i] = uuids[i].latin1().data();
297 thread_safe_sender_->Send(new IndexedDBHostMsg_AckReceivedBlobs(param)); 328 thread_safe_sender_->Send(new IndexedDBHostMsg_AckReceivedBlobs(param));
298 } 329 }
299 330
300 } // namespace content 331 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698