wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-04 06:48:38 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue #2112 - Part 11: Remove dead off-thread Stylo functions in nsStyleStruct

Browse source
This commit is contained in:
FranklinDM 2024-03-25 21:11:28 +08:00 • committed by roytam1
commit 4b44df794b
2 changed files with 3 additions and 171 deletions
Download patch file Download diff file Expand all files Collapse all files

80
layout/style/nsStyleStruct.cpp
View file

@ -449,14 +449,6 @@ nsStyleBorder::~nsStyleBorder()
}
}
void
nsStyleBorder::FinishStyle(nsPresContext* aPresContext)
{
MOZ_ASSERT(NS_IsMainThread());
mBorderImageSource.ResolveImage(aPresContext);
}
nsMargin
nsStyleBorder::GetImageOutset() const
{
@ -671,16 +663,6 @@ nsStyleList::nsStyleList(const nsStyleList& aSource)
MOZ_COUNT_CTOR(nsStyleList);
}
void
nsStyleList::FinishStyle(nsPresContext* aPresContext)
{
MOZ_ASSERT(NS_IsMainThread());
if (mListStyleImage && !mListStyleImage->IsResolved()) {
mListStyleImage->Resolve(aPresContext);
}
}
void
nsStyleList::SetQuotesInherit(const nsStyleList* aOther)
{
@ -1202,13 +1184,6 @@ nsStyleSVGReset::Destroy(nsPresContext* aContext)
FreeByObjectID(mozilla::eArenaObjectID_nsStyleSVGReset, this);
}
void
nsStyleSVGReset::FinishStyle(nsPresContext* aPresContext)
{
MOZ_ASSERT(NS_IsMainThread());
mMask.ResolveImages(aPresContext);
}
nsChangeHint
nsStyleSVGReset::CalcDifference(const nsStyleSVGReset& aNewData) const
@ -1965,7 +1940,6 @@ nsStyleImageRequest::nsStyleImageRequest(Mode aModeFlags,
, mImageValue(aImageValue)
, mImageTracker(aImageTracker)
, mModeFlags(aModeFlags)
, mResolved(true)
{
MOZ_ASSERT(NS_IsMainThread());
MOZ_ASSERT(aRequestProxy);
@ -1975,19 +1949,6 @@ nsStyleImageRequest::nsStyleImageRequest(Mode aModeFlags,
MaybeTrackAndLock();
}
nsStyleImageRequest::nsStyleImageRequest(
Mode aModeFlags,
nsStringBuffer* aURLBuffer,
already_AddRefed<PtrHolder<nsIURI>> aBaseURI,
already_AddRefed<PtrHolder<nsIURI>> aReferrer,
already_AddRefed<PtrHolder<nsIPrincipal>> aPrincipal)
: mModeFlags(aModeFlags)
, mResolved(false)
{
mImageValue = new css::ImageValue(aURLBuffer, Move(aBaseURI),
Move(aReferrer), Move(aPrincipal));
}
nsStyleImageRequest::~nsStyleImageRequest()
{
// We may or may not be being destroyed on the main thread. To clean
@ -2011,43 +1972,10 @@ nsStyleImageRequest::~nsStyleImageRequest()
MOZ_ASSERT(!mImageTracker);
}
bool
nsStyleImageRequest::Resolve(nsPresContext* aPresContext)
{
MOZ_ASSERT(NS_IsMainThread());
MOZ_ASSERT(!IsResolved(), "already resolved");
mResolved = true;
// For now, just have unique nsCSSValue/ImageValue objects. We should
// really store the ImageValue on the Servo specified value, so that we can
// share imgRequestProxys that come from the same rule in the same
// document.
mImageValue->Initialize(aPresContext->Document());
nsCSSValue value;
value.SetImageValue(mImageValue);
mRequestProxy = value.GetPossiblyStaticImageValue(aPresContext->Document(),
aPresContext);
if (!mRequestProxy) {
// The URL resolution or image load failed.
return false;
}
if (mModeFlags & Mode::Track) {
mImageTracker = aPresContext->Document()->ImageTracker();
}
MaybeTrackAndLock();
return true;
}
void
nsStyleImageRequest::MaybeTrackAndLock()
{
MOZ_ASSERT(NS_IsMainThread());
MOZ_ASSERT(IsResolved());
MOZ_ASSERT(mRequestProxy);
if (mModeFlags & Mode::Track) {
@ -2938,14 +2866,6 @@ nsStyleBackground::Destroy(nsPresContext* aContext)
FreeByObjectID(eArenaObjectID_nsStyleBackground, this);
}
void
nsStyleBackground::FinishStyle(nsPresContext* aPresContext)
{
MOZ_ASSERT(NS_IsMainThread());
mImage.ResolveImages(aPresContext);
}
nsChangeHint
nsStyleBackground::CalcDifference(const nsStyleBackground& aNewData) const
{