| Index: third_party/WebKit/Source/modules/indexeddb/IDBMetadata.h
|
| diff --git a/third_party/WebKit/Source/modules/indexeddb/IDBMetadata.h b/third_party/WebKit/Source/modules/indexeddb/IDBMetadata.h
|
| index e293d3ac55b2edd84e169144f52439e1c1b129aa..522319fd336aeb6af612f059a89e3cde55b0d722 100644
|
| --- a/third_party/WebKit/Source/modules/indexeddb/IDBMetadata.h
|
| +++ b/third_party/WebKit/Source/modules/indexeddb/IDBMetadata.h
|
| @@ -29,8 +29,8 @@
|
| #ifndef IDBMetadata_h
|
| #define IDBMetadata_h
|
|
|
| +#include "Source/modules/indexeddb/indexed_db.mojom-blink.h"
|
| #include "modules/indexeddb/IDBKeyPath.h"
|
| -#include "public/platform/modules/indexeddb/WebIDBMetadata.h"
|
| #include "wtf/Allocator.h"
|
| #include "wtf/HashMap.h"
|
| #include "wtf/text/StringHash.h"
|
| @@ -75,8 +75,7 @@ struct IDBObjectStoreMetadata {
|
|
|
| static const int64_t InvalidId = -1;
|
|
|
| - typedef HashMap<int64_t, IDBIndexMetadata> IndexMap;
|
| - IndexMap indexes;
|
| + HashMap<int64_t, IDBIndexMetadata> indexes;
|
| };
|
|
|
| struct IDBDatabaseMetadata {
|
| @@ -87,8 +86,6 @@ struct IDBDatabaseMetadata {
|
| DefaultVersion = 0
|
| };
|
|
|
| - typedef HashMap<int64_t, IDBObjectStoreMetadata> ObjectStoreMap;
|
| -
|
| IDBDatabaseMetadata()
|
| : version(NoVersion)
|
| {
|
| @@ -102,14 +99,14 @@ struct IDBDatabaseMetadata {
|
| {
|
| }
|
|
|
| - explicit IDBDatabaseMetadata(const WebIDBMetadata&);
|
| + explicit IDBDatabaseMetadata(indexed_db::mojom::blink::DatabaseMetadataPtr);
|
|
|
| String name;
|
| int64_t id;
|
| int64_t version;
|
| int64_t maxObjectStoreId;
|
|
|
| - ObjectStoreMap objectStores;
|
| + HashMap<int64_t, IDBObjectStoreMetadata> objectStores;
|
| };
|
|
|
| } // namespace blink
|
|
|