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

Bug 1932150 - Allow using flat tree order for point comparing in selection r=jjaschke,smaug,dom-core

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D231588
This commit is contained in:
Sean Feng
2025-05-07 15:05:09 +00:00
committed by sefeng@mozilla.com
parent 793c2453f1
commit 2ba73e1639
11 changed files with 363 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
dom/base/Selection.cpp
View File

@@ -928,9 +928,15 @@ static int32_t CompareToRangeStart(
return 1;
}
// The points are in the same subtree, hence there has to be an order.
return *nsContentUtils::ComparePoints(
aCompareBoundary, aRange.MayCrossShadowBoundaryStartRef(), aCache);
nsINode* start = aRange.GetMayCrossShadowBoundaryStartContainer();
uint32_t startOffset = aRange.MayCrossShadowBoundaryStartOffset();
if (StaticPrefs::dom_shadowdom_selection_across_boundary_enabled()) {
return *nsContentUtils::ComparePoints<TreeKind::Flat>(
aCompareBoundary, ConstRawRangeBoundary{start, startOffset}, aCache);
}
return *nsContentUtils::ComparePoints<TreeKind::ShadowIncludingDOM>(
aCompareBoundary, ConstRawRangeBoundary{start, startOffset}, aCache);
}
template <typename PT, typename RT>
@@ -956,9 +962,14 @@ static int32_t CompareToRangeEnd(
return 1;
}
// The points are in the same subtree, hence there has to be an order.
return *nsContentUtils::ComparePoints(aCompareBoundary,
aRange.MayCrossShadowBoundaryEndRef());
nsINode* end = aRange.GetMayCrossShadowBoundaryEndContainer();
uint32_t endOffset = aRange.MayCrossShadowBoundaryEndOffset();
if (StaticPrefs::dom_shadowdom_selection_across_boundary_enabled()) {
return *nsContentUtils::ComparePoints<TreeKind::Flat>(
aCompareBoundary, ConstRawRangeBoundary{end, endOffset});
}
return *nsContentUtils::ComparePoints<TreeKind::ShadowIncludingDOM>(
aCompareBoundary, ConstRawRangeBoundary{end, endOffset});
}
// static
@@ -3123,17 +3134,24 @@ void Selection::Extend(nsINode& aContainer, uint32_t aOffset,
const uint32_t endOffset = range->MayCrossShadowBoundaryEndOffset();
bool shouldClearRange = false;
auto ComparePoints = [](const nsINode* aNode1, const uint32_t aOffset1,
const nsINode* aNode2, const uint32_t aOffset2) {
if (StaticPrefs::dom_shadowdom_selection_across_boundary_enabled()) {
return nsContentUtils::ComparePointsWithIndices<TreeKind::Flat>(
aNode1, aOffset1, aNode2, aOffset2);
}
return nsContentUtils::ComparePointsWithIndices<
TreeKind::ShadowIncludingDOM>(aNode1, aOffset1, aNode2, aOffset2);
};
const Maybe<int32_t> anchorOldFocusOrder =
nsContentUtils::ComparePointsWithIndices(anchorNode, anchorOffset,
focusNode, focusOffset);
ComparePoints(anchorNode, anchorOffset, focusNode, focusOffset);
shouldClearRange |= !anchorOldFocusOrder;
const Maybe<int32_t> oldFocusNewFocusOrder =
nsContentUtils::ComparePointsWithIndices(focusNode, focusOffset,
&aContainer, aOffset);
ComparePoints(focusNode, focusOffset, &aContainer, aOffset);
shouldClearRange |= !oldFocusNewFocusOrder;
const Maybe<int32_t> anchorNewFocusOrder =
nsContentUtils::ComparePointsWithIndices(anchorNode, anchorOffset,
&aContainer, aOffset);
ComparePoints(anchorNode, anchorOffset, &aContainer, aOffset);
shouldClearRange |= !anchorNewFocusOrder;
// If the points are disconnected, the range will be collapsed below,
@@ -4231,7 +4249,10 @@ void Selection::SetBaseAndExtentInternal(InLimiter aInLimiter,
// new nsRange instance?
SelectionBatcher batch(this, __FUNCTION__);
const Maybe<int32_t> order =
nsContentUtils::ComparePoints(aAnchorRef, aFocusRef);
StaticPrefs::dom_shadowdom_selection_across_boundary_enabled()
? nsContentUtils::ComparePoints<TreeKind::Flat>(aAnchorRef, aFocusRef)
: nsContentUtils::ComparePoints<TreeKind::ShadowIncludingDOM>(
aAnchorRef, aFocusRef);
if (order && (*order <= 0)) {
SetStartAndEndInternal(aInLimiter, aAnchorRef, aFocusRef, eDirNext, aRv);
return;