wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 832883 - Move IDBKeyRange to WebIDL; r=khuey

Browse Source
This commit is contained in:
Ms2ger 2013-08-02 09:09:15 +02:00
parent f8a25b94f5
commit 468d7dab87
12 changed files with 184 additions and 298 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dom/base/nsDOMClassInfo.cpp
View File

@ -202,7 +202,6 @@
#include "mozilla/dom/Element.h"
#include "mozilla/dom/indexedDB/IDBWrapperCache.h"
#include "mozilla/dom/indexedDB/IDBKeyRange.h"
using mozilla::dom::indexedDB::IDBWrapperCache;
using mozilla::dom::workers::ResolveWorkerClasses;
@ -630,10 +629,6 @@ static nsDOMClassInfoData sClassInfoData[] = {
NS_DEFINE_CHROME_ONLY_CLASSINFO_DATA(ChromeMessageSender, nsDOMGenericSH,
DOM_DEFAULT_SCRIPTABLE_FLAGS)
NS_DEFINE_CLASSINFO_DATA(IDBKeyRange, nsDOMGenericSH,
DOM_DEFAULT_SCRIPTABLE_FLAGS)
NS_DEFINE_CLASSINFO_DATA(MozCSSKeyframeRule, nsDOMGenericSH,
DOM_DEFAULT_SCRIPTABLE_FLAGS)
NS_DEFINE_CLASSINFO_DATA(MozCSSKeyframesRule, nsDOMGenericSH,
@ -1518,10 +1513,6 @@ nsDOMClassInfo::Init()
DOM_CLASSINFO_MAP_ENTRY(nsIMessageSender)
DOM_CLASSINFO_MAP_END
DOM_CLASSINFO_MAP_BEGIN(IDBKeyRange, nsIIDBKeyRange)
DOM_CLASSINFO_MAP_ENTRY(nsIIDBKeyRange)
DOM_CLASSINFO_MAP_END
DOM_CLASSINFO_MAP_BEGIN(MozCSSKeyframeRule, nsIDOMMozCSSKeyframeRule)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMMozCSSKeyframeRule)
DOM_CLASSINFO_MAP_END
@ -3223,16 +3214,7 @@ nsDOMConstructor::ResolveInterfaceConstants(JSContext *cx, JS::Handle<JSObject*>
return NS_OK;
}
nsresult rv = DefineInterfaceConstants(cx, obj, class_iid);
NS_ENSURE_SUCCESS(rv, rv);
// Special case for |IDBKeyRange| which gets funny "static" functions.
if (class_iid->Equals(NS_GET_IID(nsIIDBKeyRange)) &&
!indexedDB::IDBKeyRange::DefineConstructors(cx, obj)) {
return NS_ERROR_FAILURE;
}
return NS_OK;
return DefineInterfaceConstants(cx, obj, class_iid);
}
NS_IMETHODIMP
@ -3356,12 +3338,6 @@ ResolvePrototype(nsIXPConnect *aXPConnect, nsGlobalWindow *aWin, JSContext *cx,
rv = DefineInterfaceConstants(cx, class_obj, primary_iid);
NS_ENSURE_SUCCESS(rv, rv);
// Special case for |IDBKeyRange| which gets funny "static" functions.
if (primary_iid->Equals(NS_GET_IID(nsIIDBKeyRange)) &&
!indexedDB::IDBKeyRange::DefineConstructors(cx, class_obj)) {
return NS_ERROR_FAILURE;
}
nsCOMPtr<nsIInterfaceInfoManager>
iim(do_GetService(NS_INTERFACEINFOMANAGER_SERVICE_CONTRACTID));
NS_ENSURE_TRUE(iim, NS_ERROR_NOT_AVAILABLE);

2
dom/base/nsDOMClassInfoClasses.h
View File

@ -119,8 +119,6 @@ DOMCI_CLASS(ContentFrameMessageManager)
DOMCI_CLASS(ChromeMessageBroadcaster)
DOMCI_CLASS(ChromeMessageSender)
DOMCI_CLASS(IDBKeyRange)
DOMCI_CLASS(MozCSSKeyframeRule)
DOMCI_CLASS(MozCSSKeyframesRule)

5
dom/bindings/Bindings.conf
View File

@ -591,6 +591,11 @@ DOMInterfaces = {
'nativeType': 'mozilla::dom::indexedDB::IDBTransaction',
},
'IDBKeyRange': {
'nativeType': 'mozilla::dom::indexedDB::IDBKeyRange',
'wrapperCache': False,
},
'IDBVersionChangeEvent': {
'nativeType': 'mozilla::dom::indexedDB::IDBVersionChangeEvent',
'headerFile': 'IDBEvents.h',

2
dom/indexedDB/IDBIndex.cpp
View File

@ -8,8 +8,6 @@
#include "IDBIndex.h"
#include "nsIIDBKeyRange.h"
#include "mozilla/dom/ContentChild.h"
#include "mozilla/dom/ContentParent.h"
#include "mozilla/dom/ipc/Blob.h"

315
dom/indexedDB/IDBKeyRange.cpp
View File

@ -18,54 +18,16 @@
#include "mozilla/dom/indexedDB/PIndexedDBIndex.h"
#include "mozilla/dom/indexedDB/PIndexedDBObjectStore.h"
#include "mozilla/dom/IDBKeyRangeBinding.h"
using namespace mozilla;
using namespace mozilla::dom;
USING_INDEXEDDB_NAMESPACE
using namespace mozilla::dom::indexedDB::ipc;
namespace {
inline
bool
ReturnKeyRange(JSContext* aCx,
jsval* aVp,
IDBKeyRange* aKeyRange)
{
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
NS_ASSERTION(aCx, "Null pointer!");
NS_ASSERTION(aVp, "Null pointer!");
NS_ASSERTION(aKeyRange, "Null pointer!");
nsIXPConnect* xpc = nsContentUtils::XPConnect();
NS_ASSERTION(xpc, "This should never be null!");
JSObject* global = JS::CurrentGlobalOrNull(aCx);
if (!global) {
NS_WARNING("Couldn't get global object!");
return false;
}
nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
if (NS_FAILED(xpc->WrapNative(aCx, global, aKeyRange,
NS_GET_IID(nsIIDBKeyRange),
getter_AddRefs(holder)))) {
JS_ReportError(aCx, "Couldn't wrap IDBKeyRange object.");
return false;
}
JS::Rooted<JSObject*> result(aCx, holder->GetJSObject());
if (!result) {
JS_ReportError(aCx, "Couldn't get JSObject from wrapper.");
return false;
}
JS_SET_RVAL(aCx, aVp, OBJECT_TO_JSVAL(result));
return true;
}
inline
nsresult
static inline nsresult
GetKeyFromJSVal(JSContext* aCx,
jsval aVal,
JS::Handle<JS::Value> aVal,
Key& aKey,
bool aAllowUnset = false)
{
@ -83,196 +45,121 @@ GetKeyFromJSVal(JSContext* aCx,
return NS_OK;
}
inline
void
ThrowException(JSContext* aCx,
nsresult aErrorCode)
JSObject*
IDBKeyRange::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
{
NS_ASSERTION(NS_FAILED(aErrorCode), "Not an error code!");
xpc::Throw(aCx, aErrorCode);
return IDBKeyRangeBinding::Wrap(aCx, aScope, this);
}
inline
bool
GetKeyFromJSValOrThrow(JSContext* aCx,
jsval aVal,
Key& aKey)
/* static */ already_AddRefed<IDBKeyRange>
IDBKeyRange::Only(const GlobalObject& aGlobal, JSContext* aCx,
JS::Handle<JS::Value> aValue, ErrorResult& aRv)
{
nsresult rv = GetKeyFromJSVal(aCx, aVal, aKey);
if (NS_FAILED(rv)) {
ThrowException(aCx, rv);
return false;
MOZ_ASSERT(NS_IsMainThread(), "Wrong thread!");
nsRefPtr<IDBKeyRange> keyRange = new IDBKeyRange(aGlobal.Get(), false, false, true);
aRv = GetKeyFromJSVal(aCx, aValue, keyRange->Lower());
if (aRv.Failed()) {
return nullptr;
}
return true;
return keyRange.forget();
}
JSBool
MakeOnlyKeyRange(JSContext* aCx,
unsigned aArgc,
jsval* aVp)
/* static */ already_AddRefed<IDBKeyRange>
IDBKeyRange::LowerBound(const GlobalObject& aGlobal, JSContext* aCx,
JS::Handle<JS::Value> aValue, bool aOpen,
ErrorResult& aRv)
{
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
MOZ_ASSERT(NS_IsMainThread(), "Wrong thread!");
JS::Rooted<JS::Value> val(aCx);
if (!JS_ConvertArguments(aCx, aArgc, JS_ARGV(aCx, aVp), "v", val.address())) {
return false;
nsRefPtr<IDBKeyRange> keyRange = new IDBKeyRange(aGlobal.Get(), aOpen, true, false);
aRv = GetKeyFromJSVal(aCx, aValue, keyRange->Lower());
if (aRv.Failed()) {
return nullptr;
}
nsRefPtr<IDBKeyRange> keyRange = new IDBKeyRange(false, false, true);
if (!GetKeyFromJSValOrThrow(aCx, val, keyRange->Lower())) {
return false;
}
return ReturnKeyRange(aCx, aVp, keyRange);
return keyRange.forget();
}
JSBool
MakeLowerBoundKeyRange(JSContext* aCx,
unsigned aArgc,
jsval* aVp)
/* static */ already_AddRefed<IDBKeyRange>
IDBKeyRange::UpperBound(const GlobalObject& aGlobal, JSContext* aCx,
JS::Handle<JS::Value> aValue, bool aOpen,
ErrorResult& aRv)
{
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
MOZ_ASSERT(NS_IsMainThread(), "Wrong thread!");
JS::Rooted<JS::Value> val(aCx);
JSBool open = false;
if (!JS_ConvertArguments(aCx, aArgc, JS_ARGV(aCx, aVp), "v/b", val.address(),
&open)) {
return false;
nsRefPtr<IDBKeyRange> keyRange = new IDBKeyRange(aGlobal.Get(), true, aOpen, false);
aRv = GetKeyFromJSVal(aCx, aValue, keyRange->Upper());
if (aRv.Failed()) {
return nullptr;
}
nsRefPtr<IDBKeyRange> keyRange = new IDBKeyRange(open, true, false);
if (!GetKeyFromJSValOrThrow(aCx, val, keyRange->Lower())) {
return false;
}
return ReturnKeyRange(aCx, aVp, keyRange);
return keyRange.forget();
}
JSBool
MakeUpperBoundKeyRange(JSContext* aCx,
unsigned aArgc,
jsval* aVp)
/* static */ already_AddRefed<IDBKeyRange>
IDBKeyRange::Bound(const GlobalObject& aGlobal, JSContext* aCx,
JS::Handle<JS::Value> aLower, JS::Handle<JS::Value> aUpper,
bool aLowerOpen, bool aUpperOpen, ErrorResult& aRv)
{
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
MOZ_ASSERT(NS_IsMainThread(), "Wrong thread!");
JS::Rooted<JS::Value> val(aCx);
JSBool open = false;
if (!JS_ConvertArguments(aCx, aArgc, JS_ARGV(aCx, aVp), "v/b", val.address(),
&open)) {
return false;
nsRefPtr<IDBKeyRange> keyRange = new IDBKeyRange(aGlobal.Get(), aLowerOpen,
aUpperOpen, false);
aRv = GetKeyFromJSVal(aCx, aLower, keyRange->Lower());
if (aRv.Failed()) {
return nullptr;
}
nsRefPtr<IDBKeyRange> keyRange = new IDBKeyRange(true, open, false);
if (!GetKeyFromJSValOrThrow(aCx, val, keyRange->Upper())) {
return false;
}
return ReturnKeyRange(aCx, aVp, keyRange);
}
JSBool
MakeBoundKeyRange(JSContext* aCx,
unsigned aArgc,
jsval* aVp)
{
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
JS::Rooted<JS::Value> lowerVal(aCx), upperVal(aCx);
JSBool lowerOpen = false, upperOpen = false;
if (!JS_ConvertArguments(aCx, aArgc, JS_ARGV(aCx, aVp), "vv/bb",
lowerVal.address(), upperVal.address(),
&lowerOpen, &upperOpen)) {
return false;
}
nsRefPtr<IDBKeyRange> keyRange = new IDBKeyRange(lowerOpen, upperOpen, false);
if (!GetKeyFromJSValOrThrow(aCx, lowerVal, keyRange->Lower()) ||
!GetKeyFromJSValOrThrow(aCx, upperVal, keyRange->Upper())) {
return false;
aRv = GetKeyFromJSVal(aCx, aUpper, keyRange->Upper());
if (aRv.Failed()) {
return nullptr;
}
if (keyRange->Lower() > keyRange->Upper() ||
(keyRange->Lower() == keyRange->Upper() && (lowerOpen || upperOpen))) {
ThrowException(aCx, NS_ERROR_DOM_INDEXEDDB_DATA_ERR);
return false;
(keyRange->Lower() == keyRange->Upper() && (aLowerOpen || aUpperOpen))) {
aRv.Throw(NS_ERROR_DOM_INDEXEDDB_DATA_ERR);
return nullptr;
}
return ReturnKeyRange(aCx, aVp, keyRange);
}
#define KEYRANGE_FUNCTION_FLAGS (JSPROP_ENUMERATE | JSPROP_PERMANENT)
const JSFunctionSpec gKeyRangeConstructors[] = {
JS_FN("only", MakeOnlyKeyRange, 1, KEYRANGE_FUNCTION_FLAGS),
JS_FN("lowerBound", MakeLowerBoundKeyRange, 1, KEYRANGE_FUNCTION_FLAGS),
JS_FN("upperBound", MakeUpperBoundKeyRange, 1, KEYRANGE_FUNCTION_FLAGS),
JS_FN("bound", MakeBoundKeyRange, 2, KEYRANGE_FUNCTION_FLAGS),
JS_FS_END
};
#undef KEYRANGE_FUNCTION_FLAGS
} // anonymous namespace
// static
JSBool
IDBKeyRange::DefineConstructors(JSContext* aCx,
JSObject* aObject)
{
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
NS_ASSERTION(aCx, "Null pointer!");
NS_ASSERTION(aObject, "Null pointer!");
// Add the constructor methods for key ranges.
return JS_DefineFunctions(aCx, aObject, gKeyRangeConstructors);
return keyRange.forget();
}
// static
nsresult
IDBKeyRange::FromJSVal(JSContext* aCx,
const jsval& aVal,
const jsval& aValue,
IDBKeyRange** aKeyRange)
{
nsresult rv;
JS::Rooted<JS::Value> value(aCx, aValue);
nsRefPtr<IDBKeyRange> keyRange;
if (JSVAL_IS_VOID(aVal) || JSVAL_IS_NULL(aVal)) {
if (value.isNullOrUndefined()) {
// undefined and null returns no IDBKeyRange.
}
else if (JSVAL_IS_PRIMITIVE(aVal) ||
JS_IsArrayObject(aCx, JSVAL_TO_OBJECT(aVal)) ||
JS_ObjectIsDate(aCx, JSVAL_TO_OBJECT(aVal))) {
else if (value.isPrimitive() ||
JS_IsArrayObject(aCx, &value.toObject()) ||
JS_ObjectIsDate(aCx, &value.toObject())) {
// A valid key returns an 'only' IDBKeyRange.
keyRange = new IDBKeyRange(false, false, true);
keyRange = new IDBKeyRange(nullptr, false, false, true);
rv = GetKeyFromJSVal(aCx, aVal, keyRange->Lower());
nsresult rv = GetKeyFromJSVal(aCx, value, keyRange->Lower());
if (NS_FAILED(rv)) {
return rv;
}
}
else {
MOZ_ASSERT(value.isObject());
// An object is not permitted unless it's another IDBKeyRange.
nsIXPConnect* xpc = nsContentUtils::XPConnect();
NS_ASSERTION(xpc, "This should never be null!");
nsCOMPtr<nsIXPConnectWrappedNative> wrapper;
rv = xpc->GetWrappedNativeOfJSObject(aCx, JSVAL_TO_OBJECT(aVal),
getter_AddRefs(wrapper));
if (NS_FAILED(rv)) {
if (NS_FAILED(UnwrapObject<IDBKeyRange>(aCx, &value.toObject(),
keyRange))) {
return NS_ERROR_DOM_INDEXEDDB_DATA_ERR;
}
nsCOMPtr<nsIIDBKeyRange> iface;
if (!wrapper || !(iface = do_QueryInterface(wrapper->Native()))) {
// Some random JS object?
return NS_ERROR_DOM_INDEXEDDB_DATA_ERR;
}
keyRange = static_cast<IDBKeyRange*>(iface.get());
}
keyRange.forget(aKeyRange);
@ -285,7 +172,7 @@ already_AddRefed<IDBKeyRange>
IDBKeyRange::FromSerializedKeyRange(const T& aKeyRange)
{
nsRefPtr<IDBKeyRange> keyRange =
new IDBKeyRange(aKeyRange.lowerOpen(), aKeyRange.upperOpen(),
new IDBKeyRange(nullptr, aKeyRange.lowerOpen(), aKeyRange.upperOpen(),
aKeyRange.isOnly());
keyRange->Lower() = aKeyRange.lower();
if (!keyRange->IsOnly()) {
@ -308,7 +195,9 @@ IDBKeyRange::ToSerializedKeyRange(T& aKeyRange)
}
}
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(IDBKeyRange)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mGlobal)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_SCRIPT_OBJECTS
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
@ -318,20 +207,17 @@ NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN(IDBKeyRange)
NS_IMPL_CYCLE_COLLECTION_TRACE_END
NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(IDBKeyRange)
NS_IMPL_CYCLE_COLLECTION_UNLINK(mGlobal)
tmp->DropJSObjects();
NS_IMPL_CYCLE_COLLECTION_UNLINK_END
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(IDBKeyRange)
NS_INTERFACE_MAP_ENTRY(nsISupports)
NS_INTERFACE_MAP_ENTRY(nsIIDBKeyRange)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(IDBKeyRange)
NS_INTERFACE_MAP_END
NS_IMPL_CYCLE_COLLECTING_ADDREF(IDBKeyRange)
NS_IMPL_CYCLE_COLLECTING_RELEASE(IDBKeyRange)
DOMCI_DATA(IDBKeyRange, IDBKeyRange)
void
IDBKeyRange::DropJSObjects()
{
@ -351,11 +237,10 @@ IDBKeyRange::~IDBKeyRange()
DropJSObjects();
}
NS_IMETHODIMP
IDBKeyRange::GetLower(JSContext* aCx,
jsval* aLower)
JS::Value
IDBKeyRange::GetLower(JSContext* aCx, ErrorResult& aRv)
{
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
MOZ_ASSERT(NS_IsMainThread(), "Wrong thread!");
if (!mHaveCachedLowerVal) {
if (!mRooted) {
@ -363,21 +248,21 @@ IDBKeyRange::GetLower(JSContext* aCx,
mRooted = true;
}
nsresult rv = Lower().ToJSVal(aCx, mCachedLowerVal);
NS_ENSURE_SUCCESS(rv, rv);
aRv = Lower().ToJSVal(aCx, mCachedLowerVal);
if (aRv.Failed()) {
return JS::UndefinedValue();
}
mHaveCachedLowerVal = true;
}
*aLower = mCachedLowerVal;
return NS_OK;
return mCachedLowerVal;
}
NS_IMETHODIMP
IDBKeyRange::GetUpper(JSContext* aCx,
jsval* aUpper)
JS::Value
IDBKeyRange::GetUpper(JSContext* aCx, ErrorResult& aRv)
{
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
MOZ_ASSERT(NS_IsMainThread(), "Wrong thread!");
if (!mHaveCachedUpperVal) {
if (!mRooted) {
@ -385,33 +270,15 @@ IDBKeyRange::GetUpper(JSContext* aCx,
mRooted = true;
}
nsresult rv = Upper().ToJSVal(aCx, mCachedUpperVal);
NS_ENSURE_SUCCESS(rv, rv);
aRv = Upper().ToJSVal(aCx, mCachedUpperVal);
if (aRv.Failed()) {
return JS::UndefinedValue();
}
mHaveCachedUpperVal = true;
}
*aUpper = mCachedUpperVal;
return NS_OK;
}
NS_IMETHODIMP
IDBKeyRange::GetLowerOpen(bool* aLowerOpen)
{
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
*aLowerOpen = mLowerOpen;
return NS_OK;
}
NS_IMETHODIMP
IDBKeyRange::GetUpperOpen(bool* aUpperOpen)
{
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
*aUpperOpen = mUpperOpen;
return NS_OK;
return mCachedUpperVal;
}
// Explicitly instantiate for all our key range types... Grumble.

61
dom/indexedDB/IDBKeyRange.h
View File

@ -9,13 +9,18 @@
#include "mozilla/dom/indexedDB/IndexedDatabase.h"
#include "mozilla/dom/indexedDB/Key.h"
#include "nsIIDBKeyRange.h"
#include "mozilla/ErrorResult.h"
#include "nsCycleCollectionParticipant.h"
#include "nsISupports.h"
class mozIStorageStatement;
namespace mozilla {
namespace dom {
class GlobalObject;
} // namespace dom
} // namespace mozilla
BEGIN_INDEXEDDB_NAMESPACE
namespace ipc {
@ -24,15 +29,44 @@ class KeyRange;
} // namespace FIXME_Bug_521898_objectstore
} // namespace ipc
class IDBKeyRange MOZ_FINAL : public nsIIDBKeyRange
class IDBKeyRange MOZ_FINAL : public nsISupports
{
public:
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
NS_DECL_NSIIDBKEYRANGE
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(IDBKeyRange)
static JSBool DefineConstructors(JSContext* aCx,
JSObject* aObject);
JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope);
nsISupports* GetParentObject() const
{
return mGlobal;
}
// WebIDL
JS::Value GetLower(JSContext* aCx, ErrorResult& aRv);
JS::Value GetUpper(JSContext* aCx, 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);
static nsresult FromJSVal(JSContext* aCx,
const jsval& aVal,
@ -42,10 +76,11 @@ public:
static already_AddRefed<IDBKeyRange>
FromSerializedKeyRange(const T& aKeyRange);
IDBKeyRange(bool aLowerOpen,
IDBKeyRange(nsISupports* aGlobal,
bool aLowerOpen,
bool aUpperOpen,
bool aIsOnly)
: mCachedLowerVal(JSVAL_VOID), mCachedUpperVal(JSVAL_VOID),
: mGlobal(aGlobal), mCachedLowerVal(JSVAL_VOID), mCachedUpperVal(JSVAL_VOID),
mLowerOpen(aLowerOpen), mUpperOpen(aUpperOpen), mIsOnly(aIsOnly),
mHaveCachedLowerVal(false), mHaveCachedUpperVal(false), mRooted(false)
{ }
@ -70,6 +105,7 @@ public:
return mIsOnly ? mLower : mUpper;
}
// TODO (bug 900578): Remove these in favour of LowerOpen() / UpperOpen().
bool IsLowerOpen() const
{
return mLowerOpen;
@ -155,13 +191,14 @@ public:
private:
~IDBKeyRange();
nsCOMPtr<nsISupports> mGlobal;
Key mLower;
Key mUpper;
JS::Heap<JS::Value> mCachedLowerVal;
JS::Heap<JS::Value> mCachedUpperVal;
bool mLowerOpen;
bool mUpperOpen;
bool mIsOnly;
const bool mLowerOpen;
const bool mUpperOpen;
const bool mIsOnly;
bool mHaveCachedLowerVal;
bool mHaveCachedUpperVal;
bool mRooted;

14
dom/indexedDB/IndexedDatabaseManager.cpp
View File

@ -6,6 +6,7 @@
#include "IndexedDatabaseManager.h"
#include "jsfriendapi.h"
#include "nsIConsoleService.h"
#include "nsIDiskSpaceWatcher.h"
#include "nsIDOMScriptObjectFactory.h"
@ -16,6 +17,7 @@
#include "mozilla/ClearOnShutdown.h"
#include "mozilla/CondVar.h"
#include "mozilla/dom/IDBKeyRangeBinding.h"
#include "mozilla/dom/quota/QuotaManager.h"
#include "mozilla/dom/quota/Utilities.h"
#include "mozilla/dom/TabContext.h"
@ -525,6 +527,10 @@ IndexedDatabaseManager::InitWindowless(const jsval& aObj, JSContext* aCx)
NS_ENSURE_ARG(!JSVAL_IS_PRIMITIVE(aObj));
JS::Rooted<JSObject*> obj(aCx, JSVAL_TO_OBJECT(aObj));
if (!(js::GetObjectClass(obj)->flags & JSCLASS_DOM_GLOBAL)) {
NS_WARNING("initWindowless should only be called on a DOM global object.");
return NS_ERROR_FAILURE;
}
JSBool hasIndexedDB;
if (!JS_HasProperty(aCx, obj, "indexedDB", &hasIndexedDB)) {
@ -560,14 +566,10 @@ IndexedDatabaseManager::InitWindowless(const jsval& aObj, JSContext* aCx)
return NS_ERROR_FAILURE;
}
JS::Rooted<JSObject*> keyrangeObj(aCx,
JS_NewObject(aCx, nullptr, nullptr, nullptr));
JS::Handle<JSObject*> keyrangeObj =
IDBKeyRangeBinding::GetConstructorObject(aCx, obj);
NS_ENSURE_TRUE(keyrangeObj, NS_ERROR_OUT_OF_MEMORY);
if (!IDBKeyRange::DefineConstructors(aCx, keyrangeObj)) {
return NS_ERROR_FAILURE;
}
if (!JS_DefineProperty(aCx, obj, "IDBKeyRange", OBJECT_TO_JSVAL(keyrangeObj),
nullptr, nullptr, JSPROP_ENUMERATE)) {
return NS_ERROR_FAILURE;

1
dom/indexedDB/moz.build
View File

@ -8,7 +8,6 @@ DIRS += ['ipc']
TEST_DIRS += ['test']
XPIDL_SOURCES += [
'nsIIDBKeyRange.idl',
'nsIIndexedDatabaseManager.idl',
]

25
dom/indexedDB/nsIIDBKeyRange.idl
View File

@ -1,25 +0,0 @@
/* -*- 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/. */
#include "nsISupports.idl"
/**
* IDBKeyRange interface. See
* http://dev.w3.org/2006/webapi/WebSimpleDB/#idl-def-IDBKeyRange for more
* information.
*/
[scriptable, builtinclass, uuid(8aeb8660-76b3-4651-b8c2-9894ae6dfe68)]
interface nsIIDBKeyRange : nsISupports
{
[implicit_jscontext]
readonly attribute jsval lower;
[implicit_jscontext]
readonly attribute jsval upper;
readonly attribute boolean lowerOpen;
readonly attribute boolean upperOpen;
};

29
dom/webidl/IDBKeyRange.webidl Normal file
View File

@ -0,0 +1,29 @@
/* 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/. */
/*
* The origin of this IDL file is
* https://dvcs.w3.org/hg/IndexedDB/raw-file/tip/Overview.html
*
* Copyright © 2012 W3C® (MIT, ERCIM, Keio), All Rights Reserved. W3C
* liability, trademark and document use rules apply.
*/
interface IDBKeyRange {
[Throws]
readonly attribute any lower;
[Throws]
readonly attribute any upper;
[Constant]
readonly attribute boolean lowerOpen;
[Constant]
readonly attribute boolean upperOpen;
[Creator, Throws]
static IDBKeyRange only (any value);
[Creator, Throws]
static IDBKeyRange lowerBound (any lower, optional boolean open = false);
[Creator, Throws]
static IDBKeyRange upperBound (any upper, optional boolean open = false);
[Creator, Throws]
static IDBKeyRange bound (any lower, any upper, optional boolean lowerOpen = false, optional boolean upperOpen = false);
};

1
dom/webidl/WebIDL.mk
View File

@ -169,6 +169,7 @@ webidl_files = \
IDBFactory.webidl \
IDBFileHandle.webidl \
IDBIndex.webidl \
IDBKeyRange.webidl \
IDBObjectStore.webidl \
IDBOpenDBRequest.webidl \
IDBRequest.webidl \

1
js/xpconnect/src/dom_quickstubs.qsconf
View File

@ -84,7 +84,6 @@ members = [
'nsIBoxObject.height',
# dom/indexedDB
'nsIIDBKeyRange.*',
'nsIIndexedDatabaseManager.*',
# dom/file