diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-24 12:15:48 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-28 13:30:04 +0000 |
| commit | b014812705fc80bff0a5c120dfcef88f349816dc (patch) | |
| tree | 25a2e2d9fa285f1add86aa333389a839f81a39ae /chromium/content/renderer/indexed_db | |
| parent | 9f4560b1027ae06fdb497023cdcaf91b8511fa74 (diff) | |
| download | qtwebengine-chromium-b014812705fc80bff0a5c120dfcef88f349816dc.tar.gz | |
BASELINE: Update Chromium to 68.0.3440.125
Change-Id: I23f19369e01f688e496f5bf179abb521ad73874f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/content/renderer/indexed_db')
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" |