summaryrefslogtreecommitdiff
path: root/chromium/content/renderer/indexed_db
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/content/renderer/indexed_db')
-rw-r--r--chromium/content/renderer/indexed_db/indexed_db_database_callbacks_impl.cc8
-rw-r--r--chromium/content/renderer/indexed_db/indexed_db_database_callbacks_impl.h1
-rw-r--r--chromium/content/renderer/indexed_db/mock_webidbcallbacks.h2
-rw-r--r--chromium/content/renderer/indexed_db/webidbcursor_impl.cc1
4 files changed, 9 insertions, 3 deletions
diff --git a/chromium/content/renderer/indexed_db/indexed_db_database_callbacks_impl.cc b/chromium/content/renderer/indexed_db/indexed_db_database_callbacks_impl.cc
index 08f03791791..4ccf2af1b8e 100644
--- a/chromium/content/renderer/indexed_db/indexed_db_database_callbacks_impl.cc
+++ b/chromium/content/renderer/indexed_db/indexed_db_database_callbacks_impl.cc
@@ -49,6 +49,10 @@ void BuildObservationsAndNotify(WebIDBDatabaseCallbacks* callbacks,
IndexedDBCallbacksImpl::ConvertValue(observation->value));
}
+ WebIDBDatabaseCallbacks::ObservationIndexMap observation_index_map(
+ changes->observation_index_map.begin(),
+ changes->observation_index_map.end());
+
std::unordered_map<int32_t, std::pair<int64_t, std::vector<int64_t>>>
observer_transactions;
for (const auto& transaction_pair : changes->transaction_map) {
@@ -60,8 +64,8 @@ void BuildObservationsAndNotify(WebIDBDatabaseCallbacks* callbacks,
std::move(transaction_pair.second->scope));
}
- callbacks->OnChanges(changes->observation_index_map,
- std::move(web_observations), observer_transactions);
+ callbacks->OnChanges(observation_index_map, std::move(web_observations),
+ observer_transactions);
}
} // namespace
diff --git a/chromium/content/renderer/indexed_db/indexed_db_database_callbacks_impl.h b/chromium/content/renderer/indexed_db/indexed_db_database_callbacks_impl.h
index f6986dd7226..13df0fa2260 100644
--- a/chromium/content/renderer/indexed_db/indexed_db_database_callbacks_impl.h
+++ b/chromium/content/renderer/indexed_db/indexed_db_database_callbacks_impl.h
@@ -5,6 +5,7 @@
#ifndef CONTENT_RENDERER_INDEXED_DB_INDEXED_DB_DATABASE_CALLBACKS_IMPL_H_
#define CONTENT_RENDERER_INDEXED_DB_INDEXED_DB_DATABASE_CALLBACKS_IMPL_H_
+#include "base/single_thread_task_runner.h"
#include "content/common/indexed_db/indexed_db.mojom.h"
namespace blink {
diff --git a/chromium/content/renderer/indexed_db/mock_webidbcallbacks.h b/chromium/content/renderer/indexed_db/mock_webidbcallbacks.h
index aa59e310a73..a52677cb4d1 100644
--- a/chromium/content/renderer/indexed_db/mock_webidbcallbacks.h
+++ b/chromium/content/renderer/indexed_db/mock_webidbcallbacks.h
@@ -19,7 +19,7 @@ namespace content {
class MockWebIDBCallbacks : public blink::WebIDBCallbacks {
public:
MockWebIDBCallbacks();
- ~MockWebIDBCallbacks();
+ ~MockWebIDBCallbacks() override;
MOCK_METHOD1(OnError, void(const blink::WebIDBDatabaseError&));
void OnSuccess(blink::WebIDBKey,
diff --git a/chromium/content/renderer/indexed_db/webidbcursor_impl.cc b/chromium/content/renderer/indexed_db/webidbcursor_impl.cc
index 62811b6fd76..797d4d8ed39 100644
--- a/chromium/content/renderer/indexed_db/webidbcursor_impl.cc
+++ b/chromium/content/renderer/indexed_db/webidbcursor_impl.cc
@@ -9,6 +9,7 @@
#include <string>
#include <vector>
+#include "base/single_thread_task_runner.h"
#include "content/renderer/indexed_db/indexed_db_dispatcher.h"
#include "content/renderer/indexed_db/indexed_db_key_builders.h"
#include "mojo/public/cpp/bindings/strong_associated_binding.h"