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

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

Issue 2449953008: Port messages sent by WebIDBDatabaseImpl to Mojo. (Closed)
Patch Set: Address cmumford@ and jsbell@'s comments. Created 4 years, 1 month 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/indexed_db_callbacks_impl.h" 5 #include "content/child/indexed_db/indexed_db_callbacks_impl.h"
6 6
7 #include "content/child/indexed_db/indexed_db_dispatcher.h" 7 #include "content/child/indexed_db/indexed_db_dispatcher.h"
8 #include "content/child/indexed_db/indexed_db_key_builders.h" 8 #include "content/child/indexed_db/indexed_db_key_builders.h"
9 #include "content/child/indexed_db/webidbcursor_impl.h"
10 #include "content/child/indexed_db/webidbdatabase_impl.h"
9 #include "content/child/thread_safe_sender.h" 11 #include "content/child/thread_safe_sender.h"
10 #include "content/common/indexed_db/indexed_db_constants.h" 12 #include "content/common/indexed_db/indexed_db_constants.h"
11 #include "third_party/WebKit/public/platform/modules/indexeddb/WebIDBCallbacks.h " 13 #include "third_party/WebKit/public/platform/modules/indexeddb/WebIDBCallbacks.h "
12 #include "third_party/WebKit/public/platform/modules/indexeddb/WebIDBDatabaseErr or.h" 14 #include "third_party/WebKit/public/platform/modules/indexeddb/WebIDBDatabaseErr or.h"
13 #include "third_party/WebKit/public/platform/modules/indexeddb/WebIDBMetadata.h" 15 #include "third_party/WebKit/public/platform/modules/indexeddb/WebIDBMetadata.h"
16 #include "third_party/WebKit/public/platform/modules/indexeddb/WebIDBValue.h"
14 17
18 using blink::WebBlobInfo;
15 using blink::WebIDBCallbacks; 19 using blink::WebIDBCallbacks;
16 using blink::WebIDBDatabase; 20 using blink::WebIDBDatabase;
17 using blink::WebIDBMetadata; 21 using blink::WebIDBMetadata;
22 using blink::WebIDBValue;
18 using blink::WebString; 23 using blink::WebString;
19 using blink::WebVector; 24 using blink::WebVector;
25 using indexed_db::mojom::DatabaseAssociatedPtrInfo;
20 26
21 namespace content { 27 namespace content {
22 28
23 namespace { 29 namespace {
24 30
25 void ConvertIndexMetadata(const content::IndexedDBIndexMetadata& metadata, 31 void ConvertIndexMetadata(const content::IndexedDBIndexMetadata& metadata,
26 WebIDBMetadata::Index* output) { 32 WebIDBMetadata::Index* output) {
27 output->id = metadata.id; 33 output->id = metadata.id;
28 output->name = metadata.name; 34 output->name = metadata.name;
29 output->keyPath = WebIDBKeyPathBuilder::Build(metadata.key_path); 35 output->keyPath = WebIDBKeyPathBuilder::Build(metadata.key_path);
(...skipping 21 matching lines...) Expand all
51 output->name = metadata.name; 57 output->name = metadata.name;
52 output->version = metadata.version; 58 output->version = metadata.version;
53 output->maxObjectStoreId = metadata.max_object_store_id; 59 output->maxObjectStoreId = metadata.max_object_store_id;
54 output->objectStores = 60 output->objectStores =
55 WebVector<WebIDBMetadata::ObjectStore>(metadata.object_stores.size()); 61 WebVector<WebIDBMetadata::ObjectStore>(metadata.object_stores.size());
56 size_t i = 0; 62 size_t i = 0;
57 for (const auto& iter : metadata.object_stores) 63 for (const auto& iter : metadata.object_stores)
58 ConvertObjectStoreMetadata(iter.second, &output->objectStores[i++]); 64 ConvertObjectStoreMetadata(iter.second, &output->objectStores[i++]);
59 } 65 }
60 66
67 void ConvertValue(const indexed_db::mojom::ValuePtr& value,
68 WebIDBValue* web_value) {
69 if (value->bits.empty())
70 return;
71
72 blink::WebVector<WebBlobInfo> local_blob_info(
73 value->blob_or_file_info.size());
74 for (size_t i = 0; i < value->blob_or_file_info.size(); ++i) {
75 const auto& info = value->blob_or_file_info[i];
76 if (info->is_file) {
77 local_blob_info[i] = WebBlobInfo(
78 WebString::fromUTF8(info->uuid.c_str()), info->file_path,
79 info->file_name, info->mime_type, info->last_modified, info->size);
80 } else {
81 local_blob_info[i] = WebBlobInfo(WebString::fromUTF8(info->uuid.c_str()),
82 info->mime_type, info->size);
83 }
84 }
85
86 web_value->data.assign(&*value->bits.begin(), value->bits.size());
87 web_value->webBlobInfo.swap(local_blob_info);
88 }
89
90 void ConvertReturnValue(const indexed_db::mojom::ReturnValuePtr& value,
91 WebIDBValue* web_value) {
92 ConvertValue(value->value, web_value);
93 web_value->primaryKey = WebIDBKeyBuilder::Build(value->primary_key);
94 web_value->keyPath = WebIDBKeyPathBuilder::Build(value->key_path);
95 }
96
61 } // namespace 97 } // namespace
62 98
63 IndexedDBCallbacksImpl::IndexedDBCallbacksImpl( 99 IndexedDBCallbacksImpl::IndexedDBCallbacksImpl(
64 std::unique_ptr<WebIDBCallbacks> callbacks, 100 std::unique_ptr<WebIDBCallbacks> callbacks,
101 int64_t transaction_id,
102 scoped_refptr<base::SingleThreadTaskRunner> io_runner,
65 scoped_refptr<ThreadSafeSender> thread_safe_sender) 103 scoped_refptr<ThreadSafeSender> thread_safe_sender)
66 : internal_state_(new InternalState(std::move(callbacks), 104 : internal_state_(new InternalState(std::move(callbacks),
105 transaction_id,
106 std::move(io_runner),
67 std::move(thread_safe_sender))), 107 std::move(thread_safe_sender))),
68 callback_runner_(base::ThreadTaskRunnerHandle::Get()) {} 108 callback_runner_(base::ThreadTaskRunnerHandle::Get()) {}
69 109
70 IndexedDBCallbacksImpl::~IndexedDBCallbacksImpl() { 110 IndexedDBCallbacksImpl::~IndexedDBCallbacksImpl() {
71 callback_runner_->DeleteSoon(FROM_HERE, internal_state_); 111 callback_runner_->DeleteSoon(FROM_HERE, internal_state_);
72 } 112 }
73 113
74 void IndexedDBCallbacksImpl::Error(int32_t code, 114 void IndexedDBCallbacksImpl::Error(int32_t code,
75 const base::string16& message) { 115 const base::string16& message) {
76 callback_runner_->PostTask( 116 callback_runner_->PostTask(
77 FROM_HERE, base::Bind(&InternalState::Error, 117 FROM_HERE, base::Bind(&InternalState::Error,
78 base::Unretained(internal_state_), code, message)); 118 base::Unretained(internal_state_), code, message));
79 } 119 }
80 120
81 void IndexedDBCallbacksImpl::SuccessStringList( 121 void IndexedDBCallbacksImpl::SuccessStringList(
82 const std::vector<base::string16>& value) { 122 const std::vector<base::string16>& value) {
83 callback_runner_->PostTask( 123 callback_runner_->PostTask(
84 FROM_HERE, base::Bind(&InternalState::SuccessStringList, 124 FROM_HERE, base::Bind(&InternalState::SuccessStringList,
85 base::Unretained(internal_state_), value)); 125 base::Unretained(internal_state_), value));
86 } 126 }
87 127
88 void IndexedDBCallbacksImpl::Blocked(int64_t existing_version) { 128 void IndexedDBCallbacksImpl::Blocked(int64_t existing_version) {
89 callback_runner_->PostTask( 129 callback_runner_->PostTask(
90 FROM_HERE, 130 FROM_HERE,
91 base::Bind(&InternalState::Blocked, base::Unretained(internal_state_), 131 base::Bind(&InternalState::Blocked, base::Unretained(internal_state_),
92 existing_version)); 132 existing_version));
93 } 133 }
94 134
95 void IndexedDBCallbacksImpl::UpgradeNeeded( 135 void IndexedDBCallbacksImpl::UpgradeNeeded(
96 int32_t database_id, 136 DatabaseAssociatedPtrInfo database,
97 int64_t old_version, 137 int64_t old_version,
98 blink::WebIDBDataLoss data_loss, 138 blink::WebIDBDataLoss data_loss,
99 const std::string& data_loss_message, 139 const std::string& data_loss_message,
100 const content::IndexedDBDatabaseMetadata& metadata) { 140 const content::IndexedDBDatabaseMetadata& metadata) {
101 callback_runner_->PostTask( 141 callback_runner_->PostTask(
102 FROM_HERE, 142 FROM_HERE,
103 base::Bind(&InternalState::UpgradeNeeded, 143 base::Bind(&InternalState::UpgradeNeeded,
104 base::Unretained(internal_state_), database_id, old_version, 144 base::Unretained(internal_state_), base::Passed(&database),
105 data_loss, data_loss_message, metadata)); 145 old_version, data_loss, data_loss_message, metadata));
106 } 146 }
107 147
108 void IndexedDBCallbacksImpl::SuccessDatabase( 148 void IndexedDBCallbacksImpl::SuccessDatabase(
109 int32_t database_id, 149 DatabaseAssociatedPtrInfo database,
110 const content::IndexedDBDatabaseMetadata& metadata) { 150 const content::IndexedDBDatabaseMetadata& metadata) {
151 callback_runner_->PostTask(FROM_HERE,
152 base::Bind(&InternalState::SuccessDatabase,
153 base::Unretained(internal_state_),
154 base::Passed(&database), metadata));
155 }
156
157 void IndexedDBCallbacksImpl::SuccessCursor(int32_t cursor_id,
158 const IndexedDBKey& key,
159 const IndexedDBKey& primary_key,
160 indexed_db::mojom::ValuePtr value) {
161 callback_runner_->PostTask(
162 FROM_HERE, base::Bind(&InternalState::SuccessCursor,
163 base::Unretained(internal_state_), cursor_id, key,
164 primary_key, base::Passed(&value)));
165 }
166
167 void IndexedDBCallbacksImpl::SuccessValue(
168 indexed_db::mojom::ReturnValuePtr value) {
111 callback_runner_->PostTask( 169 callback_runner_->PostTask(
112 FROM_HERE, 170 FROM_HERE,
113 base::Bind(&InternalState::SuccessDatabase, 171 base::Bind(&InternalState::SuccessValue,
114 base::Unretained(internal_state_), database_id, metadata)); 172 base::Unretained(internal_state_), base::Passed(&value)));
173 }
174
175 void IndexedDBCallbacksImpl::SuccessArray(
176 std::vector<indexed_db::mojom::ReturnValuePtr> values) {
177 callback_runner_->PostTask(
178 FROM_HERE,
179 base::Bind(&InternalState::SuccessArray,
180 base::Unretained(internal_state_), base::Passed(&values)));
181 }
182
183 void IndexedDBCallbacksImpl::SuccessKey(const IndexedDBKey& key) {
184 callback_runner_->PostTask(
185 FROM_HERE, base::Bind(&InternalState::SuccessKey,
186 base::Unretained(internal_state_), key));
115 } 187 }
116 188
117 void IndexedDBCallbacksImpl::SuccessInteger(int64_t value) { 189 void IndexedDBCallbacksImpl::SuccessInteger(int64_t value) {
118 callback_runner_->PostTask( 190 callback_runner_->PostTask(
119 FROM_HERE, base::Bind(&InternalState::SuccessInteger, 191 FROM_HERE, base::Bind(&InternalState::SuccessInteger,
120 base::Unretained(internal_state_), value)); 192 base::Unretained(internal_state_), value));
121 } 193 }
122 194
195 void IndexedDBCallbacksImpl::Success() {
196 callback_runner_->PostTask(
197 FROM_HERE,
198 base::Bind(&InternalState::Success, base::Unretained(internal_state_)));
199 }
200
123 IndexedDBCallbacksImpl::InternalState::InternalState( 201 IndexedDBCallbacksImpl::InternalState::InternalState(
124 std::unique_ptr<blink::WebIDBCallbacks> callbacks, 202 std::unique_ptr<blink::WebIDBCallbacks> callbacks,
203 int64_t transaction_id,
204 scoped_refptr<base::SingleThreadTaskRunner> io_runner,
125 scoped_refptr<ThreadSafeSender> thread_safe_sender) 205 scoped_refptr<ThreadSafeSender> thread_safe_sender)
126 : callbacks_(std::move(callbacks)), 206 : callbacks_(std::move(callbacks)),
207 transaction_id_(transaction_id),
208 io_runner_(std::move(io_runner)),
127 thread_safe_sender_(std::move(thread_safe_sender)) { 209 thread_safe_sender_(std::move(thread_safe_sender)) {
128 IndexedDBDispatcher* dispatcher = 210 IndexedDBDispatcher* dispatcher =
129 IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get()); 211 IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
130 dispatcher->RegisterMojoOwnedCallbacks(this); 212 dispatcher->RegisterMojoOwnedCallbacks(this);
131 } 213 }
132 214
133 IndexedDBCallbacksImpl::InternalState::~InternalState() { 215 IndexedDBCallbacksImpl::InternalState::~InternalState() {
134 IndexedDBDispatcher* dispatcher = 216 IndexedDBDispatcher* dispatcher =
135 IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get()); 217 IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
136 dispatcher->UnregisterMojoOwnedCallbacks(this); 218 dispatcher->UnregisterMojoOwnedCallbacks(this);
137 } 219 }
138 220
139 void IndexedDBCallbacksImpl::InternalState::Error( 221 void IndexedDBCallbacksImpl::InternalState::Error(
140 int32_t code, 222 int32_t code,
141 const base::string16& message) { 223 const base::string16& message) {
142 callbacks_->onError(blink::WebIDBDatabaseError(code, message)); 224 callbacks_->onError(blink::WebIDBDatabaseError(code, message));
225 callbacks_.reset();
143 } 226 }
144 227
145 void IndexedDBCallbacksImpl::InternalState::SuccessStringList( 228 void IndexedDBCallbacksImpl::InternalState::SuccessStringList(
146 const std::vector<base::string16>& value) { 229 const std::vector<base::string16>& value) {
147 callbacks_->onSuccess(WebVector<WebString>(value)); 230 callbacks_->onSuccess(WebVector<WebString>(value));
231 callbacks_.reset();
148 } 232 }
149 233
150 void IndexedDBCallbacksImpl::InternalState::Blocked(int64_t existing_version) { 234 void IndexedDBCallbacksImpl::InternalState::Blocked(int64_t existing_version) {
151 callbacks_->onBlocked(existing_version); 235 callbacks_->onBlocked(existing_version);
236 // Not resetting |callbacks_|.
152 } 237 }
153 238
154 void IndexedDBCallbacksImpl::InternalState::UpgradeNeeded( 239 void IndexedDBCallbacksImpl::InternalState::UpgradeNeeded(
155 int32_t database_id, 240 DatabaseAssociatedPtrInfo database_info,
156 int64_t old_version, 241 int64_t old_version,
157 blink::WebIDBDataLoss data_loss, 242 blink::WebIDBDataLoss data_loss,
158 const std::string& data_loss_message, 243 const std::string& data_loss_message,
159 const content::IndexedDBDatabaseMetadata& metadata) { 244 const content::IndexedDBDatabaseMetadata& metadata) {
160 IndexedDBDispatcher* dispatcher = 245 WebIDBDatabase* database = new WebIDBDatabaseImpl(
161 IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get()); 246 std::move(database_info), io_runner_, thread_safe_sender_);
162 WebIDBDatabase* database = dispatcher->RegisterDatabase(database_id);
163 WebIDBMetadata web_metadata; 247 WebIDBMetadata web_metadata;
164 ConvertDatabaseMetadata(metadata, &web_metadata); 248 ConvertDatabaseMetadata(metadata, &web_metadata);
165 callbacks_->onUpgradeNeeded(old_version, database, web_metadata, data_loss, 249 callbacks_->onUpgradeNeeded(old_version, database, web_metadata, data_loss,
166 WebString::fromUTF8(data_loss_message)); 250 WebString::fromUTF8(data_loss_message));
251 // Not resetting |callbacks_|.
167 } 252 }
168 253
169 void IndexedDBCallbacksImpl::InternalState::SuccessDatabase( 254 void IndexedDBCallbacksImpl::InternalState::SuccessDatabase(
170 int32_t database_id, 255 DatabaseAssociatedPtrInfo database_info,
171 const content::IndexedDBDatabaseMetadata& metadata) { 256 const content::IndexedDBDatabaseMetadata& metadata) {
172 WebIDBDatabase* database = nullptr; 257 WebIDBDatabase* database = nullptr;
173 if (database_id != kNoDatabase) { 258 if (database_info.is_valid()) {
174 IndexedDBDispatcher* dispatcher = 259 database = new WebIDBDatabaseImpl(std::move(database_info), io_runner_,
175 IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get()); 260 thread_safe_sender_);
176 database = dispatcher->RegisterDatabase(database_id);
177 } 261 }
178 WebIDBMetadata web_metadata; 262 WebIDBMetadata web_metadata;
179 ConvertDatabaseMetadata(metadata, &web_metadata); 263 ConvertDatabaseMetadata(metadata, &web_metadata);
180 callbacks_->onSuccess(database, web_metadata); 264 callbacks_->onSuccess(database, web_metadata);
265 callbacks_.reset();
266 }
267
268 void IndexedDBCallbacksImpl::InternalState::SuccessCursor(
269 int32_t cursor_id,
270 const IndexedDBKey& key,
271 const IndexedDBKey& primary_key,
272 indexed_db::mojom::ValuePtr value) {
273 WebIDBValue web_value;
274 if (value)
275 ConvertValue(value, &web_value);
276
277 WebIDBCursorImpl* cursor = new WebIDBCursorImpl(cursor_id, transaction_id_,
278 thread_safe_sender_.get());
279 IndexedDBDispatcher* dispatcher =
280 IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
281 dispatcher->RegisterCursor(cursor_id, cursor);
282 callbacks_->onSuccess(cursor, WebIDBKeyBuilder::Build(key),
283 WebIDBKeyBuilder::Build(primary_key), web_value);
284 callbacks_.reset();
285 }
286
287 void IndexedDBCallbacksImpl::InternalState::SuccessKey(
288 const IndexedDBKey& key) {
289 callbacks_->onSuccess(WebIDBKeyBuilder::Build(key));
290 callbacks_.reset();
291 }
292
293 void IndexedDBCallbacksImpl::InternalState::SuccessValue(
294 indexed_db::mojom::ReturnValuePtr value) {
295 WebIDBValue web_value;
296 if (value)
297 ConvertReturnValue(value, &web_value);
298 callbacks_->onSuccess(web_value);
299 callbacks_.reset();
300 }
301
302 void IndexedDBCallbacksImpl::InternalState::SuccessArray(
303 std::vector<indexed_db::mojom::ReturnValuePtr> values) {
304 blink::WebVector<WebIDBValue> web_values(values.size());
305 for (size_t i = 0; i < values.size(); ++i)
306 ConvertReturnValue(values[i], &web_values[i]);
307 callbacks_->onSuccess(web_values);
308 callbacks_.reset();
181 } 309 }
182 310
183 void IndexedDBCallbacksImpl::InternalState::SuccessInteger(int64_t value) { 311 void IndexedDBCallbacksImpl::InternalState::SuccessInteger(int64_t value) {
184 callbacks_->onSuccess(value); 312 callbacks_->onSuccess(value);
313 callbacks_.reset();
314 }
315
316 void IndexedDBCallbacksImpl::InternalState::Success() {
317 callbacks_->onSuccess();
318 callbacks_.reset();
185 } 319 }
186 320
187 } // namespace content 321 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698