| Index: content/child/indexed_db/indexed_db_callbacks_impl.cc
|
| diff --git a/content/child/indexed_db/indexed_db_callbacks_impl.cc b/content/child/indexed_db/indexed_db_callbacks_impl.cc
|
| index 845dc54930a10dc3ee6e899abcbc1c71039d6abf..c55b3db4ff52c46b7d5f24965a4431a5bc032065 100644
|
| --- a/content/child/indexed_db/indexed_db_callbacks_impl.cc
|
| +++ b/content/child/indexed_db/indexed_db_callbacks_impl.cc
|
| @@ -65,8 +65,18 @@ void ConvertDatabaseMetadata(const content::IndexedDBDatabaseMetadata& metadata,
|
| ConvertObjectStoreMetadata(iter.second, &output->objectStores[i++]);
|
| }
|
|
|
| -void ConvertValue(const indexed_db::mojom::ValuePtr& value,
|
| - WebIDBValue* web_value) {
|
| +void ConvertReturnValue(const indexed_db::mojom::ReturnValuePtr& value,
|
| + WebIDBValue* web_value) {
|
| + IndexedDBCallbacksImpl::ConvertValue(value->value, web_value);
|
| + web_value->primaryKey = WebIDBKeyBuilder::Build(value->primary_key);
|
| + web_value->keyPath = WebIDBKeyPathBuilder::Build(value->key_path);
|
| +}
|
| +
|
| +} // namespace
|
| +
|
| +/* static */ void IndexedDBCallbacksImpl::ConvertValue(
|
| + const indexed_db::mojom::ValuePtr& value,
|
| + WebIDBValue* web_value) {
|
| if (value->bits.empty())
|
| return;
|
|
|
| @@ -92,14 +102,6 @@ void ConvertValue(const indexed_db::mojom::ValuePtr& value,
|
| web_value->webBlobInfo.swap(local_blob_info);
|
| }
|
|
|
| -void ConvertReturnValue(const indexed_db::mojom::ReturnValuePtr& value,
|
| - WebIDBValue* web_value) {
|
| - ConvertValue(value->value, web_value);
|
| - web_value->primaryKey = WebIDBKeyBuilder::Build(value->primary_key);
|
| - web_value->keyPath = WebIDBKeyPathBuilder::Build(value->key_path);
|
| -}
|
| -
|
| -} // namespace
|
|
|
| IndexedDBCallbacksImpl::IndexedDBCallbacksImpl(
|
| std::unique_ptr<WebIDBCallbacks> callbacks,
|
| @@ -301,7 +303,7 @@ void IndexedDBCallbacksImpl::InternalState::SuccessCursor(
|
| indexed_db::mojom::ValuePtr value) {
|
| WebIDBValue web_value;
|
| if (value)
|
| - ConvertValue(value, &web_value);
|
| + IndexedDBCallbacksImpl::ConvertValue(value, &web_value);
|
|
|
| WebIDBCursorImpl* cursor =
|
| new WebIDBCursorImpl(std::move(cursor_info), transaction_id_, io_runner_);
|
|
|