Implement StructTraits for remaining IndexedDB IPC types.

content/common/indexed_db/indexed_db.mojom

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // TODO: This will move to //third_party/WebKit when //content/child/indexed_db
 // is deleted but for now this will depend on //content/common types and so
 // so belongs here.
 
 module indexed_db.mojom;
 
 import "mojo/common/common_custom_types.mojom";
 import "url/mojo/origin.mojom";
 
 enum CursorDirection {
   Next,
   NextNoDuplicate,
   Prev,
   PrevNoDuplicate,
 };
 
 enum DataLoss {
   None,
   Total,
 };
 
-[Native]
-struct Key;
+// Represents key types that hold no data and so cannot be options in the
+// KeyData union.
+enum DatalessKeyType {
+  Invalid,
+  Null,
+};
 
-[Native]
-struct KeyPath;
+union KeyData {
+  array<Key> key_array;
+  array<uint8> binary;
+  mojo.common.mojom.String16 string;
+  double date;
+  double number;
+  DatalessKeyType other;

[jsbell, 2016/11/17 04:32:42]

Ugh. I remember this falling out of very early WebKit implementation. In theory
a Key should be just union {array, binary, string, date, number} and be nullable
in certain places (e.g. KeyRange)

This is probably fine for now but we should add a big TODO to clean this up end
to end.

[Reilly Grant (use Gerrit), 2016/11/17 21:31:17]

Added a little TODO.

+};
 
-[Native]
-struct KeyRange;
+// Defined as a structure so that it can by typemapped with StructTraits.
+struct Key {
+  KeyData data;
+};
+
+// Represents WebIDBKeyPathTypeString and WebIDBKeyPathTypeArray in a key path.
+union KeyPathData {
+  mojo.common.mojom.String16 string;
+  array<mojo.common.mojom.String16> string_array;
+};
+
+struct KeyPath {
+  // A null value here corresponds to WebIDBKeyPathTypeNull.
+  KeyPathData? data;
+};
+
+struct KeyRange {
+  Key lower;
+  Key upper;
+  bool lower_open;
+  bool upper_open;
+};
 
 enum PutMode {
   AddOrUpdate,
   AddOnly,
   CursorUpdate,
 };
 
 enum TaskType {
   Normal,
   Preemptive,
@@ skipping 220 matching lines @@
 };
 
 interface Factory {
   GetDatabaseNames(associated Callbacks callbacks, url.mojom.Origin origin);
   Open(int32 worker_thread, associated Callbacks callbacks,
        associated DatabaseCallbacks database_callbacks, url.mojom.Origin origin,
        mojo.common.mojom.String16 name, int64 version, int64 transaction_id);
   DeleteDatabase(associated Callbacks callbacks, url.mojom.Origin origin,
                  mojo.common.mojom.String16 name);
 };