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

Bug 1731120 - Make truly-empty textframes return true for IsEmpty even when WhiteSpaceIsSignificant, unless they're editable or in an <input> element. r=emilio

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D128009
This commit is contained in:
Jonathan Kew
2021-10-10 15:30:55 +00:00
parent 4c4b45c7b5
commit 04fa303f57
3 changed files with 120 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
layout/generic/nsTextFrame.cpp
View File

@@ -4505,7 +4505,8 @@ class nsContinuingTextFrame final : public nsTextFrame {
auto* prev = static_cast<nsContinuingTextFrame*>(mPrevContinuation);
MOZ_ASSERT(mFirstContinuation == prev->mFirstContinuation);
} else {
MOZ_ASSERT(mFirstContinuation == mPrevContinuation->FirstContinuation());
MOZ_ASSERT(mFirstContinuation ==
mPrevContinuation->FirstContinuation());
}
} else {
MOZ_ASSERT(!mFirstContinuation);
@@ -10178,8 +10179,13 @@ bool nsTextFrame::IsEmpty() {
// XXXldb Should this check compatibility mode as well???
const nsStyleText* textStyle = StyleText();
if (textStyle->WhiteSpaceIsSignificant()) {
// XXX shouldn't we return true if the length is zero?
return false;
// When WhiteSpaceIsSignificant styles are in effect, we only treat the
// frame as empty if its content really is entirely *empty* (not just
// whitespace), AND it is NOT editable or within an <input> element.
// In these cases we consider that the whitespace-preserving style makes
// the frame behave as non-empty so that its height doesn't become zero.
return GetContentLength() == 0 && !GetContent()->IsEditable() &&
!GetContent()->GetParent()->IsHTMLElement(nsGkAtoms::input);
}
if (mState & TEXT_ISNOT_ONLY_WHITESPACE) {