diff --git a/dom/indexedDB/IDBKeyRange.cpp b/dom/indexedDB/IDBKeyRange.cpp index b09205084136..0ab2d56df20a 100644 --- a/dom/indexedDB/IDBKeyRange.cpp +++ b/dom/indexedDB/IDBKeyRange.cpp @@ -35,10 +35,8 @@ void GetKeyFromJSVal(JSContext* aCx, JS::Handle aVal, Key& aKey, } // namespace -IDBKeyRange::IDBKeyRange(nsISupports* aGlobal, bool aLowerOpen, bool aUpperOpen, - bool aIsOnly) - : mGlobal(aGlobal), - mCachedLowerVal(JS::UndefinedValue()), +IDBKeyRange::IDBKeyRange(bool aLowerOpen, bool aUpperOpen, bool aIsOnly) + : mCachedLowerVal(JS::UndefinedValue()), mCachedUpperVal(JS::UndefinedValue()), mLowerOpen(aLowerOpen), mUpperOpen(aUpperOpen), @@ -75,7 +73,7 @@ void IDBKeyRange::FromJSVal(JSContext* aCx, JS::Handle aVal, } // A valid key returns an 'only' IDBKeyRange. - keyRange = new IDBKeyRange(nullptr, false, false, true); + keyRange = new IDBKeyRange(false, false, true); GetKeyFromJSVal(aCx, aVal, keyRange->Lower(), aRv); if (!aRv.Failed()) { *aKeyRange = std::move(keyRange); @@ -85,9 +83,8 @@ void IDBKeyRange::FromJSVal(JSContext* aCx, JS::Handle aVal, // static RefPtr IDBKeyRange::FromSerialized( const SerializedKeyRange& aKeyRange) { - RefPtr keyRange = - new IDBKeyRange(nullptr, aKeyRange.lowerOpen(), aKeyRange.upperOpen(), - aKeyRange.isOnly()); + RefPtr keyRange = new IDBKeyRange( + aKeyRange.lowerOpen(), aKeyRange.upperOpen(), aKeyRange.isOnly()); keyRange->Lower() = aKeyRange.lower(); if (!keyRange->IsOnly()) { keyRange->Upper() = aKeyRange.upper(); @@ -109,7 +106,6 @@ void IDBKeyRange::ToSerialized(SerializedKeyRange& aKeyRange) const { NS_IMPL_CYCLE_COLLECTION_CLASS(IDBKeyRange) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(IDBKeyRange) - NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mGlobal) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN(IDBKeyRange) @@ -118,7 +114,6 @@ 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 @@ -227,8 +222,7 @@ bool IDBKeyRange::Includes(JSContext* aCx, JS::Handle aValue, RefPtr IDBKeyRange::Only(const GlobalObject& aGlobal, JS::Handle aValue, ErrorResult& aRv) { - RefPtr keyRange = - new IDBKeyRange(aGlobal.GetAsSupports(), false, false, true); + RefPtr keyRange = new IDBKeyRange(false, false, true); GetKeyFromJSVal(aGlobal.Context(), aValue, keyRange->Lower(), aRv); if (aRv.Failed()) { @@ -242,8 +236,7 @@ RefPtr IDBKeyRange::Only(const GlobalObject& aGlobal, RefPtr IDBKeyRange::LowerBound(const GlobalObject& aGlobal, JS::Handle aValue, bool aOpen, ErrorResult& aRv) { - RefPtr keyRange = - new IDBKeyRange(aGlobal.GetAsSupports(), aOpen, true, false); + RefPtr keyRange = new IDBKeyRange(aOpen, true, false); GetKeyFromJSVal(aGlobal.Context(), aValue, keyRange->Lower(), aRv); if (aRv.Failed()) { @@ -257,8 +250,7 @@ RefPtr IDBKeyRange::LowerBound(const GlobalObject& aGlobal, RefPtr IDBKeyRange::UpperBound(const GlobalObject& aGlobal, JS::Handle aValue, bool aOpen, ErrorResult& aRv) { - RefPtr keyRange = - new IDBKeyRange(aGlobal.GetAsSupports(), true, aOpen, false); + RefPtr keyRange = new IDBKeyRange(true, aOpen, false); GetKeyFromJSVal(aGlobal.Context(), aValue, keyRange->Upper(), aRv); if (aRv.Failed()) { @@ -274,8 +266,7 @@ RefPtr IDBKeyRange::Bound(const GlobalObject& aGlobal, JS::Handle aUpper, bool aLowerOpen, bool aUpperOpen, ErrorResult& aRv) { - RefPtr keyRange = - new IDBKeyRange(aGlobal.GetAsSupports(), aLowerOpen, aUpperOpen, false); + RefPtr keyRange = new IDBKeyRange(aLowerOpen, aUpperOpen, false); GetKeyFromJSVal(aGlobal.Context(), aLower, keyRange->Lower(), aRv); if (aRv.Failed()) { diff --git a/dom/indexedDB/IDBKeyRange.h b/dom/indexedDB/IDBKeyRange.h index 07c55cd72f2b..416aa9e7e9f2 100644 --- a/dom/indexedDB/IDBKeyRange.h +++ b/dom/indexedDB/IDBKeyRange.h @@ -14,7 +14,6 @@ #include "mozilla/dom/indexedDB/Key.h" #include "nsCOMPtr.h" #include "nsCycleCollectionParticipant.h" -#include "nsISupports.h" #include "nsString.h" class mozIStorageStatement; @@ -33,7 +32,6 @@ class SerializedKeyRange; class IDBKeyRange { protected: - nsCOMPtr mGlobal; indexedDB::Key mLower; indexedDB::Key mUpper; JS::Heap mCachedLowerVal; @@ -99,8 +97,6 @@ class IDBKeyRange { bool WrapObject(JSContext* aCx, JS::Handle aGivenProto, JS::MutableHandle aReflector); - nsISupports* GetParentObject() const { return mGlobal; } - void GetLower(JSContext* aCx, JS::MutableHandle aResult, ErrorResult& aRv); @@ -112,8 +108,7 @@ class IDBKeyRange { bool UpperOpen() const { return mUpperOpen; } protected: - IDBKeyRange(nsISupports* aGlobal, bool aLowerOpen, bool aUpperOpen, - bool aIsOnly); + IDBKeyRange(bool aLowerOpen, bool aUpperOpen, bool aIsOnly); virtual ~IDBKeyRange(); };