Use WebIDBKeyPath type in WebKit API, implement IndexedDBKeyPath type.

content/common/indexed_db/indexed_db_key_path.cc

Index: content/common/indexed_db/indexed_db_key_path.cc
diff --git a/content/common/indexed_db/indexed_db_key_path.cc b/content/common/indexed_db/indexed_db_key_path.cc
new file mode 100644
index 0000000000000000000000000000000000000000..7649e7ab1b3034fb8dc25f7d099f9cef1623ccd5
--- /dev/null
+++ b/content/common/indexed_db/indexed_db_key_path.cc
@@ -0,0 +1,75 @@
+// Copyright (c) 2012 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.
+
+#include "content/common/indexed_db/indexed_db_key_path.h"
+
+#include "base/logging.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h"
+
+using WebKit::WebIDBKeyPath;
+using WebKit::WebString;
+using WebKit::WebVector;
+
+IndexedDBKeyPath::IndexedDBKeyPath()
+    : type_(WebIDBKeyPath::NullType) {
+}
+
+IndexedDBKeyPath::IndexedDBKeyPath(const WebIDBKeyPath& key) {
+  Set(key);
+}
+
+IndexedDBKeyPath::~IndexedDBKeyPath() {
+}
+
+void IndexedDBKeyPath::SetNull() {
+  type_ = WebIDBKeyPath::NullType;
+}
+
+void IndexedDBKeyPath::SetArray(const std::vector<string16>& array) {
+  type_ = WebIDBKeyPath::ArrayType;
+  array_ = array;
+}
+
+void IndexedDBKeyPath::SetString(const string16& string) {
+  type_ = WebIDBKeyPath::StringType;
+  string_ = string;
+}
+
+void IndexedDBKeyPath::Set(const WebIDBKeyPath& keyPath) {
+  type_ = keyPath.type();
+  array_.clear();
+  string_.clear();
+  switch (type_) {
+    case WebIDBKeyPath::ArrayType:
+      {

[jam, 2012/04/30 16:01:29]

nit: i think this tabbing isn't per the style guide, i.e. the brace bracket
should be on the previous line and the code in the case statement should be
moved left by 2 spaces

[jsbell, 2012/04/30 18:08:23]

Done.

+        WebVector<WebString> array = keyPath.array();
+        for (size_t i = 0; i < array.size(); ++i)
+          array_.push_back(static_cast<string16>(array[i]));
+        break;
+      }
+    case WebIDBKeyPath::NullType:
+      break;
+    case WebIDBKeyPath::StringType:
+      string_ = static_cast<string16>(keyPath.string());
+  }
+}
+
+bool IndexedDBKeyPath::IsValid() const {
+  WebIDBKeyPath key_path = *this;
+  return key_path.isValid();
+}
+
+IndexedDBKeyPath::operator WebIDBKeyPath() const {
+  switch (type_) {
+    case WebIDBKeyPath::ArrayType:
+      return WebIDBKeyPath::create(array_);
+    case WebIDBKeyPath::StringType:
+      return WebIDBKeyPath::create(WebString(string_));
+    case WebIDBKeyPath::NullType:
+      return WebIDBKeyPath::createNull();
+  }
+  NOTREACHED();
+  return WebIDBKeyPath::createNull();
+}