diff -r 000000000000 -r 6474c204b198 dom/indexedDB/IDBKeyRange.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dom/indexedDB/IDBKeyRange.h	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,223 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef mozilla_dom_indexeddb_idbkeyrange_h__
+#define mozilla_dom_indexeddb_idbkeyrange_h__
+
+#include "mozilla/dom/indexedDB/IndexedDatabase.h"
+#include "mozilla/dom/indexedDB/Key.h"
+
+#include "nsISupports.h"
+
+#include "mozilla/ErrorResult.h"
+#include "nsCycleCollectionParticipant.h"
+
+class mozIStorageStatement;
+
+namespace mozilla {
+namespace dom {
+class GlobalObject;
+} // namespace dom
+} // namespace mozilla
+
+BEGIN_INDEXEDDB_NAMESPACE
+
+namespace ipc {
+class KeyRange;
+} // namespace ipc
+
+class IDBKeyRange MOZ_FINAL : public nsISupports
+{
+public:
+  NS_DECL_CYCLE_COLLECTING_ISUPPORTS
+  NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(IDBKeyRange)
+
+  static nsresult FromJSVal(JSContext* aCx,
+                            JS::Handle<JS::Value> aVal,
+                            IDBKeyRange** aKeyRange);
+
+  template <class T>
+  static already_AddRefed<IDBKeyRange>
+  FromSerializedKeyRange(const T& aKeyRange);
+
+  const Key& Lower() const
+  {
+    return mLower;
+  }
+
+  Key& Lower()
+  {
+    return mLower;
+  }
+
+  const Key& Upper() const
+  {
+    return mIsOnly ? mLower : mUpper;
+  }
+
+  Key& Upper()
+  {
+    return mIsOnly ? mLower : mUpper;
+  }
+
+  // TODO: Remove these in favour of LowerOpen() / UpperOpen(), bug 900578.
+  bool IsLowerOpen() const
+  {
+    return mLowerOpen;
+  }
+
+  bool IsUpperOpen() const
+  {
+    return mUpperOpen;
+  }
+
+  bool IsOnly() const
+  {
+    return mIsOnly;
+  }
+
+  void GetBindingClause(const nsACString& aKeyColumnName,
+                        nsACString& _retval) const
+  {
+    NS_NAMED_LITERAL_CSTRING(andStr, " AND ");
+    NS_NAMED_LITERAL_CSTRING(spacecolon, " :");
+    NS_NAMED_LITERAL_CSTRING(lowerKey, "lower_key");
+
+    if (IsOnly()) {
+      // Both keys are set and they're equal.
+      _retval = andStr + aKeyColumnName + NS_LITERAL_CSTRING(" =") +
+                spacecolon + lowerKey;
+    }
+    else {
+      nsAutoCString clause;
+
+      if (!Lower().IsUnset()) {
+        // Lower key is set.
+        clause.Append(andStr + aKeyColumnName);
+        clause.AppendLiteral(" >");
+        if (!IsLowerOpen()) {
+          clause.AppendLiteral("=");
+        }
+        clause.Append(spacecolon + lowerKey);
+      }
+
+      if (!Upper().IsUnset()) {
+        // Upper key is set.
+        clause.Append(andStr + aKeyColumnName);
+        clause.AppendLiteral(" <");
+        if (!IsUpperOpen()) {
+          clause.AppendLiteral("=");
+        }
+        clause.Append(spacecolon + NS_LITERAL_CSTRING("upper_key"));
+      }
+
+      _retval = clause;
+    }
+  }
+
+  nsresult BindToStatement(mozIStorageStatement* aStatement) const
+  {
+    NS_NAMED_LITERAL_CSTRING(lowerKey, "lower_key");
+
+    if (IsOnly()) {
+      return Lower().BindToStatement(aStatement, lowerKey);
+    }
+
+    nsresult rv;
+
+    if (!Lower().IsUnset()) {
+      rv = Lower().BindToStatement(aStatement, lowerKey);
+      NS_ENSURE_SUCCESS(rv, NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR);
+    }
+
+    if (!Upper().IsUnset()) {
+      rv = Upper().BindToStatement(aStatement, NS_LITERAL_CSTRING("upper_key"));
+      NS_ENSURE_SUCCESS(rv, NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR);
+    }
+
+    return NS_OK;
+  }
+
+  template <class T>
+  void ToSerializedKeyRange(T& aKeyRange);
+
+  void DropJSObjects();
+
+  // WebIDL
+  JSObject*
+  WrapObject(JSContext* aCx);
+
+  nsISupports*
+  GetParentObject() const
+  {
+    return mGlobal;
+  }
+
+  void
+  GetLower(JSContext* aCx, JS::MutableHandle<JS::Value> aResult,
+           ErrorResult& aRv);
+
+  void
+  GetUpper(JSContext* aCx, JS::MutableHandle<JS::Value> aResult,
+           ErrorResult& aRv);
+
+  bool
+  LowerOpen() const
+  {
+    return mLowerOpen;
+  }
+
+  bool
+  UpperOpen() const
+  {
+    return mUpperOpen;
+  }
+
+  static already_AddRefed<IDBKeyRange>
+  Only(const GlobalObject& aGlobal, JSContext* aCx,
+       JS::Handle<JS::Value> aValue, ErrorResult& aRv);
+
+  static already_AddRefed<IDBKeyRange>
+  LowerBound(const GlobalObject& aGlobal, JSContext* aCx,
+             JS::Handle<JS::Value> aValue, bool aOpen, ErrorResult& aRv);
+
+  static already_AddRefed<IDBKeyRange>
+  UpperBound(const GlobalObject& aGlobal, JSContext* aCx,
+             JS::Handle<JS::Value> aValue, bool aOpen, ErrorResult& aRv);
+
+  static already_AddRefed<IDBKeyRange>
+  Bound(const GlobalObject& aGlobal, JSContext* aCx,
+        JS::Handle<JS::Value> aLower, JS::Handle<JS::Value> aUpper,
+        bool aLowerOpen, bool aUpperOpen, ErrorResult& aRv);
+
+private:
+  IDBKeyRange(nsISupports* aGlobal,
+              bool aLowerOpen,
+              bool aUpperOpen,
+              bool aIsOnly)
+  : mGlobal(aGlobal), mCachedLowerVal(JSVAL_VOID), mCachedUpperVal(JSVAL_VOID),
+    mLowerOpen(aLowerOpen), mUpperOpen(aUpperOpen), mIsOnly(aIsOnly),
+    mHaveCachedLowerVal(false), mHaveCachedUpperVal(false), mRooted(false)
+  { }
+
+  ~IDBKeyRange();
+
+  nsCOMPtr<nsISupports> mGlobal;
+  Key mLower;
+  Key mUpper;
+  JS::Heap<JS::Value> mCachedLowerVal;
+  JS::Heap<JS::Value> mCachedUpperVal;
+  const bool mLowerOpen;
+  const bool mUpperOpen;
+  const bool mIsOnly;
+  bool mHaveCachedLowerVal;
+  bool mHaveCachedUpperVal;
+  bool mRooted;
+};
+
+END_INDEXEDDB_NAMESPACE
+
+#endif // mozilla_dom_indexeddb_idbkeyrange_h__