CMXSL.org/trisquel-icecat
2
0
Fork 0
Code Issues Pull requests Projects Releases 9 Packages Wiki Activity Actions

icecat: add release icecat-140.7.0-1gnu1 for aramo

Browse source
This commit is contained in:
Ark74 2026-01-18 00:16:18 -06:00
parent 17ba0259bf
commit 86c0c0ca33
156 changed files with 9131 additions and 4525 deletions
Download patch file Download diff file Expand all files Collapse all files

26
icecat/editor/libeditor/WhiteSpaceVisibilityKeeper.cpp
View file

@ -3503,8 +3503,10 @@ WhiteSpaceVisibilityKeeper::DeleteContentNodeAndJoinTextNodesAroundIt(
WSRunScanner::ScanInclusiveNextVisibleNodeOrBlockBoundary(
Scan::All, pointToPutCaret,
BlockInlineCheck::UseComputedDisplayOutsideStyle);
if (nextThingOfCaretPoint.ReachedBRElement() ||
nextThingOfCaretPoint.ReachedPreformattedLineBreak()) {
Maybe<EditorLineBreak> lineBreak;
if (nextThingOfCaretPoint.ReachedLineBreak()) {
lineBreak.emplace(
nextThingOfCaretPoint.CreateEditorLineBreak<EditorLineBreak>());
nextThingOfCaretPoint =
WSRunScanner::ScanInclusiveNextVisibleNodeOrBlockBoundary(
Scan::All,
@ -3530,6 +3532,26 @@ WhiteSpaceVisibilityKeeper::DeleteContentNodeAndJoinTextNodesAroundIt(
if (NS_WARN_IF(!aContentToDelete.IsInComposedDoc())) {
return Err(NS_ERROR_EDITOR_UNEXPECTED_DOM_TREE);
}
// If the previous content ends with an invisible line break, let's
// delete it.
if (lineBreak.isSome() && lineBreak->IsInComposedDoc()) {
const WSScanResult prevThing =
WSRunScanner::ScanPreviousVisibleNodeOrBlockBoundary(
WSRunScanner::Scan::All,
lineBreak->To<EditorRawDOMPoint>(),
BlockInlineCheck::UseComputedDisplayStyle, &aEditingHost);
if (!prevThing.ReachedLineBoundary()) {
Result<EditorDOMPoint, nsresult> pointOrError =
aHTMLEditor.DeleteLineBreakWithTransaction(
lineBreak.ref(), nsIEditor::eStrip, aEditingHost);
if (MOZ_UNLIKELY(pointOrError.isErr())) {
NS_WARNING(
"HTMLEditor::DeleteLineBreakWithTransaction() failed");
return pointOrError.propagateErr();
}
trackPointToPutCaret->Flush(StopTracking::No);
}
}
}
}
// Similarly, we may put caret into the following block (this is the