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

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 more comments from dcheng@. 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->file) {
77 local_blob_info[i] = WebBlobInfo(
78 WebString::fromUTF8(info->uuid), info->file->path.AsUTF16Unsafe(),
79 info->file->name, info->mime_type,
80 info->file->last_modified.ToDoubleT(), info->size);
81 } else {
82 local_blob_info[i] = WebBlobInfo(WebString::fromUTF8(info->uuid),
83 info->mime_type, info->size);
84 }
85 }
86
87 web_value->data.assign(&*value->bits.begin(), value->bits.size());
88 web_value->webBlobInfo.swap(local_blob_info);
89 }
90
91 void ConvertReturnValue(const indexed_db::mojom::ReturnValuePtr& value,
92 WebIDBValue* web_value) {
93 ConvertValue(value->value, web_value);
94 web_value->primaryKey = WebIDBKeyBuilder::Build(value->primary_key);
95 web_value->keyPath = WebIDBKeyPathBuilder::Build(value->key_path);
96 }
97
61 } // namespace 98 } // namespace
62 99
63 IndexedDBCallbacksImpl::IndexedDBCallbacksImpl( 100 IndexedDBCallbacksImpl::IndexedDBCallbacksImpl(
64 std::unique_ptr<WebIDBCallbacks> callbacks, 101 std::unique_ptr<WebIDBCallbacks> callbacks,
102 int64_t transaction_id,
103 scoped_refptr<base::SingleThreadTaskRunner> io_runner,
65 scoped_refptr<ThreadSafeSender> thread_safe_sender) 104 scoped_refptr<ThreadSafeSender> thread_safe_sender)
66 : internal_state_(new InternalState(std::move(callbacks), 105 : internal_state_(new InternalState(std::move(callbacks),
106 transaction_id,
107 std::move(io_runner),
67 std::move(thread_safe_sender))), 108 std::move(thread_safe_sender))),
68 callback_runner_(base::ThreadTaskRunnerHandle::Get()) {} 109 callback_runner_(base::ThreadTaskRunnerHandle::Get()) {}
69 110
70 IndexedDBCallbacksImpl::~IndexedDBCallbacksImpl() { 111 IndexedDBCallbacksImpl::~IndexedDBCallbacksImpl() {
71 callback_runner_->DeleteSoon(FROM_HERE, internal_state_); 112 callback_runner_->DeleteSoon(FROM_HERE, internal_state_);
72 } 113 }
73 114
74 void IndexedDBCallbacksImpl::Error(int32_t code, 115 void IndexedDBCallbacksImpl::Error(int32_t code,
75 const base::string16& message) { 116 const base::string16& message) {
76 callback_runner_->PostTask( 117 callback_runner_->PostTask(
77 FROM_HERE, base::Bind(&InternalState::Error, 118 FROM_HERE, base::Bind(&InternalState::Error,
78 base::Unretained(internal_state_), code, message)); 119 base::Unretained(internal_state_), code, message));
79 } 120 }
80 121
81 void IndexedDBCallbacksImpl::SuccessStringList( 122 void IndexedDBCallbacksImpl::SuccessStringList(
82 const std::vector<base::string16>& value) { 123 const std::vector<base::string16>& value) {
83 callback_runner_->PostTask( 124 callback_runner_->PostTask(
84 FROM_HERE, base::Bind(&InternalState::SuccessStringList, 125 FROM_HERE, base::Bind(&InternalState::SuccessStringList,
85 base::Unretained(internal_state_), value)); 126 base::Unretained(internal_state_), value));
86 } 127 }
87 128
88 void IndexedDBCallbacksImpl::Blocked(int64_t existing_version) { 129 void IndexedDBCallbacksImpl::Blocked(int64_t existing_version) {
89 callback_runner_->PostTask( 130 callback_runner_->PostTask(
90 FROM_HERE, 131 FROM_HERE,
91 base::Bind(&InternalState::Blocked, base::Unretained(internal_state_), 132 base::Bind(&InternalState::Blocked, base::Unretained(internal_state_),
92 existing_version)); 133 existing_version));
93 } 134 }
94 135
95 void IndexedDBCallbacksImpl::UpgradeNeeded( 136 void IndexedDBCallbacksImpl::UpgradeNeeded(
96 int32_t database_id, 137 DatabaseAssociatedPtrInfo database,
97 int64_t old_version, 138 int64_t old_version,
98 blink::WebIDBDataLoss data_loss, 139 blink::WebIDBDataLoss data_loss,
99 const std::string& data_loss_message, 140 const std::string& data_loss_message,
100 const content::IndexedDBDatabaseMetadata& metadata) { 141 const content::IndexedDBDatabaseMetadata& metadata) {
101 callback_runner_->PostTask( 142 callback_runner_->PostTask(
102 FROM_HERE, 143 FROM_HERE,
103 base::Bind(&InternalState::UpgradeNeeded, 144 base::Bind(&InternalState::UpgradeNeeded,
104 base::Unretained(internal_state_), database_id, old_version, 145 base::Unretained(internal_state_), base::Passed(&database),
105 data_loss, data_loss_message, metadata)); 146 old_version, data_loss, data_loss_message, metadata));
106 } 147 }
107 148
108 void IndexedDBCallbacksImpl::SuccessDatabase( 149 void IndexedDBCallbacksImpl::SuccessDatabase(
109 int32_t database_id, 150 DatabaseAssociatedPtrInfo database,
110 const content::IndexedDBDatabaseMetadata& metadata) { 151 const content::IndexedDBDatabaseMetadata& metadata) {
152 callback_runner_->PostTask(FROM_HERE,
153 base::Bind(&InternalState::SuccessDatabase,
154 base::Unretained(internal_state_),
155 base::Passed(&database), metadata));
156 }
157
158 void IndexedDBCallbacksImpl::SuccessCursor(int32_t cursor_id,
159 const IndexedDBKey& key,
160 const IndexedDBKey& primary_key,
161 indexed_db::mojom::ValuePtr value) {
162 callback_runner_->PostTask(
163 FROM_HERE, base::Bind(&InternalState::SuccessCursor,
164 base::Unretained(internal_state_), cursor_id, key,
165 primary_key, base::Passed(&value)));
166 }
167
168 void IndexedDBCallbacksImpl::SuccessValue(
169 indexed_db::mojom::ReturnValuePtr value) {
111 callback_runner_->PostTask( 170 callback_runner_->PostTask(
112 FROM_HERE, 171 FROM_HERE,
113 base::Bind(&InternalState::SuccessDatabase, 172 base::Bind(&InternalState::SuccessValue,
114 base::Unretained(internal_state_), database_id, metadata)); 173 base::Unretained(internal_state_), base::Passed(&value)));
174 }
175
176 void IndexedDBCallbacksImpl::SuccessArray(
177 std::vector<indexed_db::mojom::ReturnValuePtr> values) {
178 callback_runner_->PostTask(
179 FROM_HERE,
180 base::Bind(&InternalState::SuccessArray,
181 base::Unretained(internal_state_), base::Passed(&values)));
182 }
183
184 void IndexedDBCallbacksImpl::SuccessKey(const IndexedDBKey& key) {
185 callback_runner_->PostTask(
186 FROM_HERE, base::Bind(&InternalState::SuccessKey,
187 base::Unretained(internal_state_), key));
115 } 188 }
116 189
117 void IndexedDBCallbacksImpl::SuccessInteger(int64_t value) { 190 void IndexedDBCallbacksImpl::SuccessInteger(int64_t value) {
118 callback_runner_->PostTask( 191 callback_runner_->PostTask(
119 FROM_HERE, base::Bind(&InternalState::SuccessInteger, 192 FROM_HERE, base::Bind(&InternalState::SuccessInteger,
120 base::Unretained(internal_state_), value)); 193 base::Unretained(internal_state_), value));
121 } 194 }
122 195
196 void IndexedDBCallbacksImpl::Success() {
197 callback_runner_->PostTask(
198 FROM_HERE,
199 base::Bind(&InternalState::Success, base::Unretained(internal_state_)));
200 }
201
123 IndexedDBCallbacksImpl::InternalState::InternalState( 202 IndexedDBCallbacksImpl::InternalState::InternalState(
124 std::unique_ptr<blink::WebIDBCallbacks> callbacks, 203 std::unique_ptr<blink::WebIDBCallbacks> callbacks,
204 int64_t transaction_id,
205 scoped_refptr<base::SingleThreadTaskRunner> io_runner,
125 scoped_refptr<ThreadSafeSender> thread_safe_sender) 206 scoped_refptr<ThreadSafeSender> thread_safe_sender)
126 : callbacks_(std::move(callbacks)), 207 : callbacks_(std::move(callbacks)),
208 transaction_id_(transaction_id),
209 io_runner_(std::move(io_runner)),
127 thread_safe_sender_(std::move(thread_safe_sender)) { 210 thread_safe_sender_(std::move(thread_safe_sender)) {
128 IndexedDBDispatcher* dispatcher = 211 IndexedDBDispatcher* dispatcher =
129 IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get()); 212 IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
130 dispatcher->RegisterMojoOwnedCallbacks(this); 213 dispatcher->RegisterMojoOwnedCallbacks(this);
131 } 214 }
132 215
133 IndexedDBCallbacksImpl::InternalState::~InternalState() { 216 IndexedDBCallbacksImpl::InternalState::~InternalState() {
134 IndexedDBDispatcher* dispatcher = 217 IndexedDBDispatcher* dispatcher =
135 IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get()); 218 IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
136 dispatcher->UnregisterMojoOwnedCallbacks(this); 219 dispatcher->UnregisterMojoOwnedCallbacks(this);
137 } 220 }
138 221
139 void IndexedDBCallbacksImpl::InternalState::Error( 222 void IndexedDBCallbacksImpl::InternalState::Error(
140 int32_t code, 223 int32_t code,
141 const base::string16& message) { 224 const base::string16& message) {
142 callbacks_->onError(blink::WebIDBDatabaseError(code, message)); 225 callbacks_->onError(blink::WebIDBDatabaseError(code, message));
226 callbacks_.reset();
143 } 227 }
144 228
145 void IndexedDBCallbacksImpl::InternalState::SuccessStringList( 229 void IndexedDBCallbacksImpl::InternalState::SuccessStringList(
146 const std::vector<base::string16>& value) { 230 const std::vector<base::string16>& value) {
147 callbacks_->onSuccess(WebVector<WebString>(value)); 231 callbacks_->onSuccess(WebVector<WebString>(value));
232 callbacks_.reset();
148 } 233 }
149 234
150 void IndexedDBCallbacksImpl::InternalState::Blocked(int64_t existing_version) { 235 void IndexedDBCallbacksImpl::InternalState::Blocked(int64_t existing_version) {
151 callbacks_->onBlocked(existing_version); 236 callbacks_->onBlocked(existing_version);
237 // Not resetting |callbacks_|.
152 } 238 }
153 239
154 void IndexedDBCallbacksImpl::InternalState::UpgradeNeeded( 240 void IndexedDBCallbacksImpl::InternalState::UpgradeNeeded(
155 int32_t database_id, 241 DatabaseAssociatedPtrInfo database_info,
156 int64_t old_version, 242 int64_t old_version,
157 blink::WebIDBDataLoss data_loss, 243 blink::WebIDBDataLoss data_loss,
158 const std::string& data_loss_message, 244 const std::string& data_loss_message,
159 const content::IndexedDBDatabaseMetadata& metadata) { 245 const content::IndexedDBDatabaseMetadata& metadata) {
160 IndexedDBDispatcher* dispatcher = 246 WebIDBDatabase* database = new WebIDBDatabaseImpl(
161 IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get()); 247 std::move(database_info), io_runner_, thread_safe_sender_);
162 WebIDBDatabase* database = dispatcher->RegisterDatabase(database_id);
163 WebIDBMetadata web_metadata; 248 WebIDBMetadata web_metadata;
164 ConvertDatabaseMetadata(metadata, &web_metadata); 249 ConvertDatabaseMetadata(metadata, &web_metadata);
165 callbacks_->onUpgradeNeeded(old_version, database, web_metadata, data_loss, 250 callbacks_->onUpgradeNeeded(old_version, database, web_metadata, data_loss,
166 WebString::fromUTF8(data_loss_message)); 251 WebString::fromUTF8(data_loss_message));
252 // Not resetting |callbacks_|.
167 } 253 }
168 254
169 void IndexedDBCallbacksImpl::InternalState::SuccessDatabase( 255 void IndexedDBCallbacksImpl::InternalState::SuccessDatabase(
170 int32_t database_id, 256 DatabaseAssociatedPtrInfo database_info,
171 const content::IndexedDBDatabaseMetadata& metadata) { 257 const content::IndexedDBDatabaseMetadata& metadata) {
172 WebIDBDatabase* database = nullptr; 258 WebIDBDatabase* database = nullptr;
173 if (database_id != kNoDatabase) { 259 if (database_info.is_valid()) {
174 IndexedDBDispatcher* dispatcher = 260 database = new WebIDBDatabaseImpl(std::move(database_info), io_runner_,
175 IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get()); 261 thread_safe_sender_);
176 database = dispatcher->RegisterDatabase(database_id);
177 } 262 }
178 WebIDBMetadata web_metadata; 263 WebIDBMetadata web_metadata;
179 ConvertDatabaseMetadata(metadata, &web_metadata); 264 ConvertDatabaseMetadata(metadata, &web_metadata);
180 callbacks_->onSuccess(database, web_metadata); 265 callbacks_->onSuccess(database, web_metadata);
266 callbacks_.reset();
267 }
268
269 void IndexedDBCallbacksImpl::InternalState::SuccessCursor(
270 int32_t cursor_id,
271 const IndexedDBKey& key,
272 const IndexedDBKey& primary_key,
273 indexed_db::mojom::ValuePtr value) {
274 WebIDBValue web_value;
275 if (value)
276 ConvertValue(value, &web_value);
277
278 WebIDBCursorImpl* cursor = new WebIDBCursorImpl(cursor_id, transaction_id_,
279 thread_safe_sender_.get());
280 IndexedDBDispatcher* dispatcher =
281 IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
282 dispatcher->RegisterCursor(cursor_id, cursor);
283 callbacks_->onSuccess(cursor, WebIDBKeyBuilder::Build(key),
284 WebIDBKeyBuilder::Build(primary_key), web_value);
285 callbacks_.reset();
286 }
287
288 void IndexedDBCallbacksImpl::InternalState::SuccessKey(
289 const IndexedDBKey& key) {
290 callbacks_->onSuccess(WebIDBKeyBuilder::Build(key));
291 callbacks_.reset();
292 }
293
294 void IndexedDBCallbacksImpl::InternalState::SuccessValue(
295 indexed_db::mojom::ReturnValuePtr value) {
296 WebIDBValue web_value;
297 if (value)
298 ConvertReturnValue(value, &web_value);
299 callbacks_->onSuccess(web_value);
300 callbacks_.reset();
301 }
302
303 void IndexedDBCallbacksImpl::InternalState::SuccessArray(
304 std::vector<indexed_db::mojom::ReturnValuePtr> values) {
305 blink::WebVector<WebIDBValue> web_values(values.size());
306 for (size_t i = 0; i < values.size(); ++i)
307 ConvertReturnValue(values[i], &web_values[i]);
308 callbacks_->onSuccess(web_values);
309 callbacks_.reset();
181 } 310 }
182 311
183 void IndexedDBCallbacksImpl::InternalState::SuccessInteger(int64_t value) { 312 void IndexedDBCallbacksImpl::InternalState::SuccessInteger(int64_t value) {
184 callbacks_->onSuccess(value); 313 callbacks_->onSuccess(value);
314 callbacks_.reset();
315 }
316
317 void IndexedDBCallbacksImpl::InternalState::Success() {
318 callbacks_->onSuccess();
319 callbacks_.reset();
185 } 320 }
186 321
187 } // namespace content 322 } // namespace content
OLDNEW
« no previous file with comments | « content/child/indexed_db/indexed_db_callbacks_impl.h ('k') | content/child/indexed_db/indexed_db_dispatcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698