nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1875430 part 4: Convert 'static UniquePtr' global vars to use StaticAutoPtr, in intl. r=platform-i18n-reviewers,jfkthame

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D199170
This commit is contained in:
Daniel Holbert 2024-01-23 19:00:49 +00:00
parent 6b6989bd75
commit cc54045d4d
2 changed files with 13 additions and 11 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

5
intl/locale/nsLanguageAtomService.cpp
View file

@ -15,6 +15,7 @@
#include "mozilla/intl/OSPreferences.h"
#include "mozilla/ServoBindings.h"
#include "mozilla/ServoUtils.h"
#include "mozilla/StaticPtr.h"
using namespace mozilla;
using mozilla::intl::OSPreferences;
@ -81,12 +82,12 @@ static constexpr struct {
{"Thai", nsGkAtoms::th},
{"Tibt", nsGkAtoms::x_tibt}};
static UniquePtr<nsLanguageAtomService> gLangAtomService;
static StaticAutoPtr<nsLanguageAtomService> gLangAtomService;
// static
nsLanguageAtomService* nsLanguageAtomService::GetService() {
if (!gLangAtomService) {
gLangAtomService = MakeUnique<nsLanguageAtomService>();
gLangAtomService = new nsLanguageAtomService();
}
return gLangAtomService.get();
}

19
intl/lwbrk/nsComplexBreaker.cpp
View file

@ -10,6 +10,7 @@
#include "MainThreadUtils.h"
#include "mozilla/Assertions.h"
#include "mozilla/Services.h"
#include "mozilla/StaticPtr.h"
#include "mozilla/UniquePtr.h"
#include "nsTHashMap.h"
#include "nsIObserver.h"
@ -22,7 +23,7 @@ using namespace mozilla;
using CacheMap = nsTHashMap<nsString, nsTArray<uint8_t>>;
static UniquePtr<CacheMap> sBreakCache;
static StaticAutoPtr<CacheMap> sBreakCache;
// The underlying hash table extends capacity, when it hits .75 full and uses
// powers of 2 for sizing. This cache limit will hopefully mean most pages fit
@ -31,14 +32,14 @@ static UniquePtr<CacheMap> sBreakCache;
// should still remain fast.
static const int kCacheLimit = 3072;
static UniquePtr<CacheMap> sOldBreakCache;
static StaticAutoPtr<CacheMap> sOldBreakCache;
// Simple runnable to delete caches off the main thread.
class CacheDeleter final : public Runnable {
public:
explicit CacheDeleter(UniquePtr<CacheMap> aCacheToDelete)
explicit CacheDeleter(CacheMap* aCacheToDelete)
: Runnable("ComplexBreaker CacheDeleter"),
mCacheToDelete(std::move(aCacheToDelete)) {}
mCacheToDelete(aCacheToDelete) {}
NS_IMETHOD Run() override {
MOZ_ASSERT(!NS_IsMainThread());
@ -69,10 +70,10 @@ NS_IMETHODIMP ComplexBreakObserver::Observe(nsISupports* aSubject,
if (sOldBreakCache) {
// We have an old cache, so delete that one first.
NS_DispatchBackgroundTask(
MakeAndAddRef<CacheDeleter>(std::move(sOldBreakCache)));
MakeAndAddRef<CacheDeleter>(sOldBreakCache.forget()));
} else if (sBreakCache) {
NS_DispatchBackgroundTask(
MakeAndAddRef<CacheDeleter>(std::move(sBreakCache)));
MakeAndAddRef<CacheDeleter>(sBreakCache.forget()));
}
}
@ -108,10 +109,10 @@ static void AddToCache(const char16_t* aText, uint32_t aLength,
if (sOldBreakCache) {
NS_DispatchBackgroundTask(
MakeAndAddRef<CacheDeleter>(std::move(sOldBreakCache)));
MakeAndAddRef<CacheDeleter>(sOldBreakCache.forget()));
}
sOldBreakCache = std::move(sBreakCache);
sOldBreakCache = sBreakCache.forget();
}
static void CopyAndFill(const nsTArray<uint8_t>& aCachedBreakBefore,
@ -141,7 +142,7 @@ void ComplexBreaker::GetBreaks(const char16_t* aText, uint32_t aLength,
return;
}
} else {
sBreakCache = MakeUnique<CacheMap>();
sBreakCache = new CacheMap();
}
// We keep the previous cache when we hit our limit, so that the most recently