зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1498755 - Part 3: Merge AssertIsMainThreadOrServo{FontMetrics,LangFontPrefsCache}Locked r=emilio
Depends on D8644 Differential Revision: https://phabricator.services.mozilla.com/D8645 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Родитель
ab29a5a596
Коммит
4f45ef2141
|
@ -96,7 +96,7 @@ nsLanguageAtomService::GetLanguageGroup(nsAtom *aLanguage, bool* aNeedsToCache)
|
|||
RefPtr<nsAtom> uncached = GetUncachedLanguageGroup(aLanguage);
|
||||
retVal = uncached.get();
|
||||
|
||||
AssertIsMainThreadOrServoLangFontPrefsCacheLocked();
|
||||
AssertIsMainThreadOrServoFontMetricsLocked();
|
||||
// The hashtable will keep an owning reference to the atom
|
||||
mLangToGroup.Put(aLanguage, uncached);
|
||||
}
|
||||
|
|
|
@ -265,7 +265,7 @@ StaticPresData::GetFontPrefsForLangHelper(nsAtom* aLanguage,
|
|||
*aNeedsToCache = true;
|
||||
return nullptr;
|
||||
}
|
||||
AssertIsMainThreadOrServoLangFontPrefsCacheLocked();
|
||||
AssertIsMainThreadOrServoFontMetricsLocked();
|
||||
// nothing cached, so go on and fetch the prefs for this lang group:
|
||||
prefs = prefs->mNext = new LangGroupFontPrefs;
|
||||
}
|
||||
|
@ -275,7 +275,7 @@ StaticPresData::GetFontPrefsForLangHelper(nsAtom* aLanguage,
|
|||
return nullptr;
|
||||
}
|
||||
|
||||
AssertIsMainThreadOrServoLangFontPrefsCacheLocked();
|
||||
AssertIsMainThreadOrServoFontMetricsLocked();
|
||||
prefs->Initialize(langGroupAtom);
|
||||
|
||||
return prefs;
|
||||
|
|
|
@ -124,13 +124,6 @@ ThreadSafeGetDefaultFontHelper(const nsPresContext* aPresContext,
|
|||
return retval;
|
||||
}
|
||||
|
||||
void
|
||||
AssertIsMainThreadOrServoLangFontPrefsCacheLocked()
|
||||
{
|
||||
MOZ_ASSERT(NS_IsMainThread() || sServoFFILock->LockedForWritingByCurrentThread());
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Does this child count as significant for selector matching?
|
||||
*
|
||||
|
|
|
@ -13,8 +13,6 @@
|
|||
#include "mozilla/TypeTraits.h"
|
||||
#include "MainThreadUtils.h"
|
||||
|
||||
void AssertIsMainThreadOrServoLangFontPrefsCacheLocked();
|
||||
|
||||
namespace mozilla {
|
||||
|
||||
// Defined in GeckoBindings.cpp.
|
||||
|
|
Загрузка…
Ссылка в новой задаче