Migrate the IndexedDB backend from Blink to Chromium

content/common/indexed_db/indexed_db_key.cc

 // 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.h"
 
+#include <string>
 #include "base/logging.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebVector.h"
 
 namespace content {
 
 using WebKit::WebIDBKey;
 using WebKit::WebVector;
 
 namespace {
@@ skipping 36 matching lines @@
   return result;
 }
 
 static IndexedDBKey::KeyArray CopyKeyArray(const WebIDBKey& other) {
   IndexedDBKey::KeyArray result;
   if (other.type() == WebIDBKey::ArrayType) {
     result = CopyKeyArray(other.array());
   }
   return result;
 }
-} // namespace
+}  // namespace
 
 IndexedDBKey::IndexedDBKey()
     : type_(WebIDBKey::NullType),
       date_(0),
       number_(0),
       size_estimate_(kOverheadSize) {}
 
 IndexedDBKey::IndexedDBKey(WebIDBKey::Type type)
     : type_(type), date_(0), number_(0), size_estimate_(kOverheadSize) {
   DCHECK(type == WebIDBKey::NullType || type == WebIDBKey::InvalidType);
@@ skipping 23 matching lines @@
       date_(key.type() == WebIDBKey::DateType ? key.date() : 0),
       number_(key.type() == WebIDBKey::NumberType ? key.number() : 0),
       size_estimate_(kOverheadSize + CalculateKeySize(key)) {}
 
 IndexedDBKey::IndexedDBKey(const string16& key)
     : type_(WebIDBKey::StringType), string_(key) {}
 
 IndexedDBKey::~IndexedDBKey() {}
 
 int IndexedDBKey::Compare(const IndexedDBKey& other) const {
+  DCHECK(IsValid());
+  DCHECK(other.IsValid());
   if (type_ != other.type_)
     return type_ > other.type_ ? -1 : 1;
 
   switch (type_) {
     case WebIDBKey::ArrayType:
       for (size_t i = 0; i < array_.size() && i < other.array_.size(); ++i) {
         if (int result = array_[i].Compare(other.array_[i]))
           return result;
       }
       if (array_.size() < other.array_.size())
         return -1;
       if (array_.size() > other.array_.size())
         return 1;
       return 0;
     case WebIDBKey::StringType:
       return -other.string_.compare(string_);
     case WebIDBKey::DateType:
+      return (date_ < other.date_) ? -1 : (date_ > other.date_) ? 1 : 0;
     case WebIDBKey::NumberType:
       return (number_ < other.number_) ? -1 : (number_ > other.number_) ? 1 : 0;
     case WebIDBKey::InvalidType:
     case WebIDBKey::NullType:
-    default:
-      // This is a placeholder for WebKit::WebIDBKey::MinType
+    case WebIDBKey::MinType:
       NOTREACHED();
       return 0;
   }
+  NOTREACHED();
+  return 0;
 }
 
 bool IndexedDBKey::IsLessThan(const IndexedDBKey& other) const {
   return Compare(other) < 0;
 }
 
 bool IndexedDBKey::IsEqual(const IndexedDBKey& other) const {
   return !Compare(other);
 }
 
+bool IndexedDBKey::IsValid() const {
+  if (type_ == WebIDBKey::InvalidType || type_ == WebIDBKey::NullType)
+    return false;
+
+  if (type_ == WebIDBKey::ArrayType) {
+    for (size_t i = 0; i < array_.size(); i++) {
+      if (!array_[i].IsValid())
+        return false;
+    }
+  }
+
+  return true;
+}
+
 IndexedDBKey::operator WebIDBKey() const {
   switch (type_) {
     case WebIDBKey::ArrayType:
       return WebIDBKey::createArray(array_);
     case WebIDBKey::StringType:
       return WebIDBKey::createString(string_);
     case WebIDBKey::DateType:
       return WebIDBKey::createDate(date_);
     case WebIDBKey::NumberType:
       return WebIDBKey::createNumber(number_);
     case WebIDBKey::InvalidType:
       return WebIDBKey::createInvalid();
     case WebIDBKey::NullType:
       return WebIDBKey::createNull();
-    default:
-      // This is a placeholder for WebKit::WebIDBKey::MinType
+    case WebIDBKey::MinType:
       NOTREACHED();
       return WebIDBKey::createInvalid();
   }
+  NOTREACHED();
+  return WebIDBKey::createInvalid();
 }
 
 }  // namespace content