diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
commit | 8dd16259287f58f9273002717ec4d27e97127719 (patch) | |
tree | 3863e62a53829a84037444beab3abd4ed9dfc7d0 /editor/libeditor/HTMLStyleEditor.cpp | |
parent | Releasing progress-linux version 126.0.1-1~progress7.99u1. (diff) | |
download | firefox-8dd16259287f58f9273002717ec4d27e97127719.tar.xz firefox-8dd16259287f58f9273002717ec4d27e97127719.zip |
Merging upstream version 127.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'editor/libeditor/HTMLStyleEditor.cpp')
-rw-r--r-- | editor/libeditor/HTMLStyleEditor.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/editor/libeditor/HTMLStyleEditor.cpp b/editor/libeditor/HTMLStyleEditor.cpp index 2ca7b06c29..5aaff15ba4 100644 --- a/editor/libeditor/HTMLStyleEditor.cpp +++ b/editor/libeditor/HTMLStyleEditor.cpp @@ -1914,8 +1914,8 @@ HTMLEditor::AutoInlineStyleSetter::ExtendOrShrinkRangeToApplyTheStyle( // range to contain the <br> element. EditorDOMRange range(aRange); if (range.EndRef().IsInContentNode()) { - WSScanResult nextContentData = - WSRunScanner::ScanNextVisibleNodeOrBlockBoundary( + const WSScanResult nextContentData = + WSRunScanner::ScanInclusiveNextVisibleNodeOrBlockBoundary( &aEditingHost, range.EndRef(), BlockInlineCheck::UseComputedDisplayOutsideStyle); if (nextContentData.ReachedInvisibleBRElement() && @@ -2076,7 +2076,7 @@ HTMLEditor::SplitAncestorStyledInlineElementsAtRangeEdges( return result; } tracker.FlushAndStopTracking(); - if (NS_WARN_IF(result.inspect().Handled())) { + if (result.inspect().Handled()) { auto endOfRange = result.inspect().AtSplitPoint<EditorDOMPoint>(); if (!endOfRange.IsSet()) { result.inspect().IgnoreCaretPointSuggestion(); |