Bug 1286464 part.4 ContentEventHandler::SetRangeFromFlatTextOffset() should set end of the range to after a line break when the range is end between a set of native line breakers r=smaug
Currently, ContentEventHandler::SetRangeFromFlatTextOffset() sets end point to before a line breaker when the end of queried range is between a set of native line breakers (i.e., "\r]\n" on Windows). This causes unexpected empty range (e.g., "[]\n") when it queries a text rect at [\r]\n.
Therefore, it should select an XP line breaker in such case (i.e., the range should be "[\n]" when it queries "[\r]\n" or "\r[\n]").
Note that we don't need to do anything at setting selection start because it's always aligned to before the line breaker.
MozReview-Commit-ID: 6ht8QNAhibY
--- a/dom/events/ContentEventHandler.cpp
+++ b/dom/events/ContentEventHandler.cpp
@@ -1066,17 +1066,29 @@ ContentEventHandler::SetRangeFromFlatTex
// range.
if (endOffset <= offset + textLength) {
MOZ_ASSERT(startSet,
"The start of the range should've been set already");
if (content->IsNodeOfType(nsINode::eTEXT)) {
// Rule #2.1: ]textNode or text]Node or textNode]
uint32_t xpOffset = endOffset - offset;
if (aLineBreakType == LINE_BREAK_TYPE_NATIVE) {
- xpOffset = ConvertToXPOffset(content, xpOffset);
+ uint32_t xpOffsetCurrent = ConvertToXPOffset(content, xpOffset);
+ if (xpOffset && GetBRLength(aLineBreakType) > 1) {
+ MOZ_ASSERT(GetBRLength(aLineBreakType) == 2);
+ uint32_t xpOffsetPre = ConvertToXPOffset(content, xpOffset - 1);
+ // If previous character's XP offset is same as current character's,
+ // it means that the end offset is between \r and \n. So, the
+ // range end should be after the \n.
+ if (xpOffsetPre == xpOffsetCurrent) {
+ xpOffset = xpOffsetCurrent + 1;
+ } else {
+ xpOffset = xpOffsetCurrent;
+ }
+ }
}
if (aExpandToClusterBoundaries) {
rv = ExpandToClusterBoundary(content, true, &xpOffset);
if (NS_WARN_IF(NS_FAILED(rv))) {
return rv;
}
}
NS_ASSERTION(xpOffset <= INT32_MAX,