corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out 5 changesets (bug 1926015) for causing crashtest failures @1730506.html. CLOSED TREE

Browse Source 
Backed out changeset 7df628ab162c (bug 1926015)
Backed out changeset a3524c96da73 (bug 1926015)
Backed out changeset cfbf0fa7bf8d (bug 1926015)
Backed out changeset 2c2f56268bd7 (bug 1926015)
Backed out changeset 55175ed82058 (bug 1926015)
This commit is contained in:
Adi
2024-11-21 21:28:08 +02:00
parent 894015d261
commit b34823b0fe
22 changed files with 94 additions and 380 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
layout/generic/nsBlockFrame.cpp
View File

@@ -765,7 +765,8 @@ static bool RemoveFirstLine(nsLineList& aFromLines, nsFrameList& aFromFrames,
/* virtual */
void nsBlockFrame::MarkIntrinsicISizesDirty() {
nsBlockFrame* dirtyBlock = static_cast<nsBlockFrame*>(FirstContinuation());
dirtyBlock->mCachedIntrinsics.Clear();
dirtyBlock->mCachedMinISize = NS_INTRINSIC_ISIZE_UNKNOWN;
dirtyBlock->mCachedPrefISize = NS_INTRINSIC_ISIZE_UNKNOWN;
if (!HasAnyStateBits(NS_BLOCK_NEEDS_BIDI_RESOLUTION)) {
for (nsIFrame* frame = dirtyBlock; frame;
frame = frame->GetNextContinuation()) {
@@ -783,7 +784,8 @@ void nsBlockFrame::CheckIntrinsicCacheAgainstShrinkWrapState() {
}
bool inflationEnabled = !presContext->mInflationDisabledForShrinkWrap;
if (inflationEnabled != HasAnyStateBits(NS_BLOCK_INTRINSICS_INFLATED)) {
mCachedIntrinsics.Clear();
mCachedMinISize = NS_INTRINSIC_ISIZE_UNKNOWN;
mCachedPrefISize = NS_INTRINSIC_ISIZE_UNKNOWN;
AddOrRemoveStateBits(NS_BLOCK_INTRINSICS_INFLATED, inflationEnabled);
}
}
@@ -821,10 +823,17 @@ nscoord nsBlockFrame::IntrinsicISize(const IntrinsicSizeInput& aInput,
CheckIntrinsicCacheAgainstShrinkWrapState();
return mCachedIntrinsics.GetOrSet(*this, aType, aInput, [&] {
return aType == IntrinsicISizeType::MinISize ? MinISize(aInput)
: PrefISize(aInput);
});
if (aType == IntrinsicISizeType::MinISize) {
if (mCachedMinISize == NS_INTRINSIC_ISIZE_UNKNOWN) {
mCachedMinISize = MinISize(aInput);
}
return mCachedMinISize;
}
if (mCachedPrefISize == NS_INTRINSIC_ISIZE_UNKNOWN) {
mCachedPrefISize = PrefISize(aInput);
}
return mCachedPrefISize;
}
/* virtual */