From 33c8d5d9714ecf3a2730b3c509bd05d4fcf85ce4 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Fri, 4 May 2018 16:15:59 +0200 Subject: Issue #325 Part 7: Remove non-Intl legacy code paths from IndexedDB. --- dom/indexedDB/ActorsParent.cpp | 14 -------------- dom/indexedDB/IDBCursor.cpp | 10 ---------- dom/indexedDB/IDBCursor.h | 2 -- dom/indexedDB/IDBObjectStore.cpp | 10 ---------- dom/indexedDB/IndexedDatabaseManager.cpp | 6 ------ dom/indexedDB/IndexedDatabaseManager.h | 4 ---- dom/indexedDB/Key.cpp | 6 ------ dom/indexedDB/Key.h | 4 ---- dom/indexedDB/moz.build | 3 +-- 9 files changed, 1 insertion(+), 58 deletions(-) (limited to 'dom/indexedDB') diff --git a/dom/indexedDB/ActorsParent.cpp b/dom/indexedDB/ActorsParent.cpp index 9d4e72f2f..b0800728f 100644 --- a/dom/indexedDB/ActorsParent.cpp +++ b/dom/indexedDB/ActorsParent.cpp @@ -7767,12 +7767,10 @@ private: virtual void SendResults() override; -#ifdef ENABLE_INTL_API static nsresult UpdateLocaleAwareIndex(mozIStorageConnection* aConnection, const IndexMetadata& aIndexMetadata, const nsCString& aLocale); -#endif }; class OpenDatabaseOp::VersionChangeOp final @@ -20064,9 +20062,6 @@ DatabaseOperationBase::BindKeyRangeToStatement( mozIStorageStatement* aStatement, const nsCString& aLocale) { -#ifndef ENABLE_INTL_API - return BindKeyRangeToStatement(aKeyRange, aStatement); -#else MOZ_ASSERT(!IsOnBackgroundThread()); MOZ_ASSERT(aStatement); MOZ_ASSERT(!aLocale.IsEmpty()); @@ -20104,7 +20099,6 @@ DatabaseOperationBase::BindKeyRangeToStatement( } return NS_OK; -#endif } // static @@ -22197,7 +22191,6 @@ OpenDatabaseOp::LoadDatabaseInformation(mozIStorageConnection* aConnection) indexMetadata->mCommonMetadata.multiEntry() = !!scratch; -#ifdef ENABLE_INTL_API const bool localeAware = !stmt->IsNull(6); if (localeAware) { rv = stmt->GetUTF8String(6, indexMetadata->mCommonMetadata.locale()); @@ -22227,7 +22220,6 @@ OpenDatabaseOp::LoadDatabaseInformation(mozIStorageConnection* aConnection) } } } -#endif if (NS_WARN_IF(!objectStoreMetadata->mIndexes.Put(indexId, indexMetadata, fallible))) { @@ -22253,7 +22245,6 @@ OpenDatabaseOp::LoadDatabaseInformation(mozIStorageConnection* aConnection) return NS_OK; } -#ifdef ENABLE_INTL_API /* static */ nsresult OpenDatabaseOp::UpdateLocaleAwareIndex(mozIStorageConnection* aConnection, @@ -22371,7 +22362,6 @@ OpenDatabaseOp::UpdateLocaleAwareIndex(mozIStorageConnection* aConnection, rv = metaStmt->Execute(); return rv; } -#endif nsresult OpenDatabaseOp::BeginVersionChange() @@ -28191,15 +28181,12 @@ OpenOp::GetRangeKeyInfo(bool aLowerBound, Key* aKey, bool* aOpen) if (range.isOnly()) { *aKey = range.lower(); *aOpen = false; -#ifdef ENABLE_INTL_API if (mCursor->IsLocaleAware()) { range.lower().ToLocaleBasedKey(*aKey, mCursor->mLocale); } -#endif } else { *aKey = aLowerBound ? range.lower() : range.upper(); *aOpen = aLowerBound ? range.lowerOpen() : range.upperOpen(); -#ifdef ENABLE_INTL_API if (mCursor->IsLocaleAware()) { if (aLowerBound) { range.lower().ToLocaleBasedKey(*aKey, mCursor->mLocale); @@ -28207,7 +28194,6 @@ OpenOp::GetRangeKeyInfo(bool aLowerBound, Key* aKey, bool* aOpen) range.upper().ToLocaleBasedKey(*aKey, mCursor->mLocale); } } -#endif } } else { *aOpen = false; diff --git a/dom/indexedDB/IDBCursor.cpp b/dom/indexedDB/IDBCursor.cpp index e5d8913f9..7ae35e981 100644 --- a/dom/indexedDB/IDBCursor.cpp +++ b/dom/indexedDB/IDBCursor.cpp @@ -65,13 +65,11 @@ IDBCursor::IDBCursor(Type aType, } } -#ifdef ENABLE_INTL_API bool IDBCursor::IsLocaleAware() const { return mSourceIndex && !mSourceIndex->Locale().IsEmpty(); } -#endif IDBCursor::~IDBCursor() { @@ -437,7 +435,6 @@ IDBCursor::Continue(JSContext* aCx, return; } -#ifdef ENABLE_INTL_API if (IsLocaleAware() && !key.IsUnset()) { Key tmp; aRv = key.ToLocaleBasedKey(tmp, mSourceIndex->Locale()); @@ -448,9 +445,6 @@ IDBCursor::Continue(JSContext* aCx, } const Key& sortKey = IsLocaleAware() ? mSortKey : mKey; -#else - const Key& sortKey = mKey; -#endif if (!key.IsUnset()) { switch (mDirection) { @@ -547,7 +541,6 @@ IDBCursor::ContinuePrimaryKey(JSContext* aCx, return; } -#ifdef ENABLE_INTL_API if (IsLocaleAware() && !key.IsUnset()) { Key tmp; aRv = key.ToLocaleBasedKey(tmp, mSourceIndex->Locale()); @@ -558,9 +551,6 @@ IDBCursor::ContinuePrimaryKey(JSContext* aCx, } const Key& sortKey = IsLocaleAware() ? mSortKey : mKey; -#else - const Key& sortKey = mKey; -#endif if (key.IsUnset()) { aRv.Throw(NS_ERROR_DOM_INDEXEDDB_DATA_ERR); diff --git a/dom/indexedDB/IDBCursor.h b/dom/indexedDB/IDBCursor.h index 25be16bee..3a4bedcda 100644 --- a/dom/indexedDB/IDBCursor.h +++ b/dom/indexedDB/IDBCursor.h @@ -205,11 +205,9 @@ private: ~IDBCursor(); -#ifdef ENABLE_INTL_API // Checks if this is a locale aware cursor (ie. the index's sortKey is unset) bool IsLocaleAware() const; -#endif void DropJSObjects(); diff --git a/dom/indexedDB/IDBObjectStore.cpp b/dom/indexedDB/IDBObjectStore.cpp index c9ab24970..cf62f49c3 100644 --- a/dom/indexedDB/IDBObjectStore.cpp +++ b/dom/indexedDB/IDBObjectStore.cpp @@ -1086,9 +1086,7 @@ IDBObjectStore::AppendIndexUpdateInfo( { nsresult rv; -#ifdef ENABLE_INTL_API const bool localeAware = !aLocale.IsEmpty(); -#endif if (!aMultiEntry) { Key key; @@ -1106,14 +1104,12 @@ IDBObjectStore::AppendIndexUpdateInfo( IndexUpdateInfo* updateInfo = aUpdateInfoArray.AppendElement(); updateInfo->indexId() = aIndexID; updateInfo->value() = key; -#ifdef ENABLE_INTL_API if (localeAware) { rv = key.ToLocaleBasedKey(updateInfo->localizedValue(), aLocale); if (NS_WARN_IF(NS_FAILED(rv))) { return NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR; } } -#endif return NS_OK; } @@ -1153,14 +1149,12 @@ IDBObjectStore::AppendIndexUpdateInfo( IndexUpdateInfo* updateInfo = aUpdateInfoArray.AppendElement(); updateInfo->indexId() = aIndexID; updateInfo->value() = value; -#ifdef ENABLE_INTL_API if (localeAware) { rv = value.ToLocaleBasedKey(updateInfo->localizedValue(), aLocale); if (NS_WARN_IF(NS_FAILED(rv))) { return NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR; } } -#endif } } else { @@ -1174,14 +1168,12 @@ IDBObjectStore::AppendIndexUpdateInfo( IndexUpdateInfo* updateInfo = aUpdateInfoArray.AppendElement(); updateInfo->indexId() = aIndexID; updateInfo->value() = value; -#ifdef ENABLE_INTL_API if (localeAware) { rv = value.ToLocaleBasedKey(updateInfo->localizedValue(), aLocale); if (NS_WARN_IF(NS_FAILED(rv))) { return NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR; } } -#endif } return NS_OK; @@ -2052,11 +2044,9 @@ IDBObjectStore::CreateIndex(const nsAString& aName, // Valid locale names are always ASCII as per BCP-47. nsCString locale = NS_LossyConvertUTF16toASCII(aOptionalParameters.mLocale); bool autoLocale = locale.EqualsASCII("auto"); -#ifdef ENABLE_INTL_API if (autoLocale) { locale = IndexedDatabaseManager::GetLocale(); } -#endif IndexMetadata* metadata = indexes.AppendElement( IndexMetadata(transaction->NextIndexId(), nsString(aName), keyPath, diff --git a/dom/indexedDB/IndexedDatabaseManager.cpp b/dom/indexedDB/IndexedDatabaseManager.cpp index 2590b0127..f65381fe8 100644 --- a/dom/indexedDB/IndexedDatabaseManager.cpp +++ b/dom/indexedDB/IndexedDatabaseManager.cpp @@ -59,10 +59,8 @@ #include "mozilla/dom/IDBTransactionBinding.h" #include "mozilla/dom/IDBVersionChangeEventBinding.h" -#ifdef ENABLE_INTL_API #include "nsCharSeparatedTokenizer.h" #include "unicode/locid.h" -#endif #define IDB_STR "indexedDB" @@ -430,7 +428,6 @@ IndexedDatabaseManager::Init() Preferences::RegisterCallbackAndCall(MaxSerializedMsgSizePrefChangeCallback, kPrefMaxSerilizedMsgSize); -#ifdef ENABLE_INTL_API const nsAdoptingCString& acceptLang = Preferences::GetLocalizedCString("intl.accept_languages"); @@ -449,7 +446,6 @@ IndexedDatabaseManager::Init() if (mLocale.IsEmpty()) { mLocale.AssignLiteral("en_US"); } -#endif return NS_OK; } @@ -1088,7 +1084,6 @@ IndexedDatabaseManager::LoggingModePrefChangedCallback( } } -#ifdef ENABLE_INTL_API // static const nsCString& IndexedDatabaseManager::GetLocale() @@ -1098,7 +1093,6 @@ IndexedDatabaseManager::GetLocale() return idbManager->mLocale; } -#endif NS_IMPL_ADDREF(IndexedDatabaseManager) NS_IMPL_RELEASE_WITH_DESTROY(IndexedDatabaseManager, Destroy()) diff --git a/dom/indexedDB/IndexedDatabaseManager.h b/dom/indexedDB/IndexedDatabaseManager.h index 8bb9d7003..d63c548ec 100644 --- a/dom/indexedDB/IndexedDatabaseManager.h +++ b/dom/indexedDB/IndexedDatabaseManager.h @@ -186,10 +186,8 @@ public: nsresult FlushPendingFileDeletions(); -#ifdef ENABLE_INTL_API static const nsCString& GetLocale(); -#endif static mozilla::Mutex& FileMutex() @@ -238,9 +236,7 @@ private: // and FileInfo.mSliceRefCnt mozilla::Mutex mFileMutex; -#ifdef ENABLE_INTL_API nsCString mLocale; -#endif indexedDB::BackgroundUtilsChild* mBackgroundActor; diff --git a/dom/indexedDB/Key.cpp b/dom/indexedDB/Key.cpp index 945320dd5..0f693b2c6 100644 --- a/dom/indexedDB/Key.cpp +++ b/dom/indexedDB/Key.cpp @@ -22,9 +22,7 @@ #include "ReportInternalError.h" #include "xpcpublic.h" -#ifdef ENABLE_INTL_API #include "unicode/ucol.h" -#endif namespace mozilla { namespace dom { @@ -108,7 +106,6 @@ namespace indexedDB { [1, 2] // 0x60 bf f0 0 0 0 0 0 0 0x10 c0 [[]] // 0x80 */ -#ifdef ENABLE_INTL_API nsresult Key::ToLocaleBasedKey(Key& aTarget, const nsCString& aLocale) const { @@ -202,7 +199,6 @@ Key::ToLocaleBasedKey(Key& aTarget, const nsCString& aLocale) const aTarget.TrimBuffer(); return NS_OK; } -#endif nsresult Key::EncodeJSValInternal(JSContext* aCx, JS::Handle aVal, @@ -483,7 +479,6 @@ Key::EncodeAsString(const T* aStart, const T* aEnd, uint8_t aType) NS_ASSERTION(buffer == mBuffer.EndReading(), "Wrote wrong number of bytes"); } -#ifdef ENABLE_INTL_API nsresult Key::EncodeLocaleString(const nsDependentString& aString, uint8_t aTypeOffset, const nsCString& aLocale) @@ -522,7 +517,6 @@ Key::EncodeLocaleString(const nsDependentString& aString, uint8_t aTypeOffset, aTypeOffset); return NS_OK; } -#endif // static nsresult diff --git a/dom/indexedDB/Key.h b/dom/indexedDB/Key.h index 856089c97..9d70ce6ad 100644 --- a/dom/indexedDB/Key.h +++ b/dom/indexedDB/Key.h @@ -214,10 +214,8 @@ public: nsresult AppendItem(JSContext* aCx, bool aFirstOfArray, JS::Handle aVal); -#ifdef ENABLE_INTL_API nsresult ToLocaleBasedKey(Key& aTarget, const nsCString& aLocale) const; -#endif void FinishArray() @@ -298,11 +296,9 @@ private: void EncodeAsString(const T* aStart, const T* aEnd, uint8_t aType); -#ifdef ENABLE_INTL_API nsresult EncodeLocaleString(const nsDependentString& aString, uint8_t aTypeOffset, const nsCString& aLocale); -#endif void EncodeNumber(double aFloat, uint8_t aType); diff --git a/dom/indexedDB/moz.build b/dom/indexedDB/moz.build index 1fb01135c..d8c217f38 100644 --- a/dom/indexedDB/moz.build +++ b/dom/indexedDB/moz.build @@ -17,8 +17,7 @@ XPCSHELL_TESTS_MANIFESTS += [ 'test/unit/xpcshell-parent-process.ini' ] -if CONFIG['ENABLE_INTL_API']: - MOCHITEST_MANIFESTS += ['test/mochitest-intl-api.ini'] +MOCHITEST_MANIFESTS += ['test/mochitest-intl-api.ini'] EXPORTS.mozilla.dom += [ 'IDBCursor.h', -- cgit v1.2.3