| Index: content/child/indexed_db/indexed_db_dispatcher.cc
|
| diff --git a/content/child/indexed_db/indexed_db_dispatcher.cc b/content/child/indexed_db/indexed_db_dispatcher.cc
|
| index 48391f4714bf3adfcf1ea381e90c4b813e7455c6..c924ffab8b73474ccda36f085b630dce700e44b0 100644
|
| --- a/content/child/indexed_db/indexed_db_dispatcher.cc
|
| +++ b/content/child/indexed_db/indexed_db_dispatcher.cc
|
| @@ -491,14 +491,14 @@ void IndexedDBDispatcher::OnSuccessStringList(
|
|
|
| void IndexedDBDispatcher::OnSuccessValue(int32 ipc_thread_id,
|
| int32 ipc_callbacks_id,
|
| - const std::vector<char>& value) {
|
| + const std::string& value) {
|
| DCHECK_EQ(ipc_thread_id, CurrentWorkerId());
|
| WebIDBCallbacks* callbacks = pending_callbacks_.Lookup(ipc_callbacks_id);
|
| if (!callbacks)
|
| return;
|
| WebData web_value;
|
| if (value.size())
|
| - web_value.assign(&value.front(), value.size());
|
| + web_value.assign(&*value.begin(), value.size());
|
| callbacks->onSuccess(web_value);
|
| pending_callbacks_.Remove(ipc_callbacks_id);
|
| }
|
| @@ -506,7 +506,7 @@ void IndexedDBDispatcher::OnSuccessValue(int32 ipc_thread_id,
|
| void IndexedDBDispatcher::OnSuccessValueWithKey(
|
| int32 ipc_thread_id,
|
| int32 ipc_callbacks_id,
|
| - const std::vector<char>& value,
|
| + const std::string& value,
|
| const IndexedDBKey& primary_key,
|
| const IndexedDBKeyPath& key_path) {
|
| DCHECK_EQ(ipc_thread_id, CurrentWorkerId());
|
| @@ -515,7 +515,7 @@ void IndexedDBDispatcher::OnSuccessValueWithKey(
|
| return;
|
| WebData web_value;
|
| if (value.size())
|
| - web_value.assign(&value.front(), value.size());
|
| + web_value.assign(&*value.begin(), value.size());
|
| callbacks->onSuccess(web_value, primary_key, key_path);
|
| pending_callbacks_.Remove(ipc_callbacks_id);
|
| }
|
| @@ -550,7 +550,7 @@ void IndexedDBDispatcher::OnSuccessOpenCursor(
|
| const IndexedDBKey& primary_key = p.primary_key;
|
| WebData web_value;
|
| if (p.value.size())
|
| - web_value.assign(&p.value.front(), p.value.size());
|
| + web_value.assign(&*p.value.begin(), p.value.size());
|
|
|
| WebIDBCallbacks* callbacks = pending_callbacks_.Lookup(ipc_callbacks_id);
|
| if (!callbacks)
|
| @@ -571,7 +571,7 @@ void IndexedDBDispatcher::OnSuccessCursorContinue(
|
| int32 ipc_cursor_id = p.ipc_cursor_id;
|
| const IndexedDBKey& key = p.key;
|
| const IndexedDBKey& primary_key = p.primary_key;
|
| - const std::vector<char>& value = p.value;
|
| + const std::string& value = p.value;
|
|
|
| RendererWebIDBCursorImpl* cursor = cursors_[ipc_cursor_id];
|
| DCHECK(cursor);
|
| @@ -582,7 +582,7 @@ void IndexedDBDispatcher::OnSuccessCursorContinue(
|
|
|
| WebData web_value;
|
| if (value.size())
|
| - web_value.assign(&value.front(), value.size());
|
| + web_value.assign(&*value.begin(), value.size());
|
| callbacks->onSuccess(key, primary_key, web_value);
|
|
|
| pending_callbacks_.Remove(ipc_callbacks_id);
|
| @@ -598,7 +598,7 @@ void IndexedDBDispatcher::OnSuccessCursorPrefetch(
|
| std::vector<WebData> values(p.values.size());
|
| for (size_t i = 0; i < p.values.size(); ++i) {
|
| if (p.values[i].size())
|
| - values[i].assign(&p.values[i].front(), p.values[i].size());
|
| + values[i].assign(&*p.values[i].begin(), p.values[i].size());
|
| }
|
| RendererWebIDBCursorImpl* cursor = cursors_[ipc_cursor_id];
|
| DCHECK(cursor);
|
|
|