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

Revert "Bug 1932150 - Make selection code to correctly iterate flattened tree r=smaug"

Browse Source 
This reverts commit bce1570f96.
This commit is contained in:
Serban Stanca
2025-05-08 22:53:03 +03:00
committed by sstanca@mozilla.com
parent 552eb50c64
commit 456ace9a5f
2 changed files with 32 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
dom/base/Selection.cpp
View File

@@ -26,7 +26,7 @@
#include "mozilla/dom/SelectionBinding.h"
#include "mozilla/dom/ShadowRoot.h"
#include "mozilla/dom/StaticRange.h"
#include "mozilla/dom/TreeIterator.h"
#include "mozilla/dom/ShadowIncludingTreeIterator.h"
#include "mozilla/ErrorResult.h"
#include "mozilla/HTMLEditor.h"
#include "mozilla/IntegerRange.h"
@@ -333,7 +333,7 @@ const nsTHashSet<const nsINode*>& SelectionNodeCache::MaybeCollect(
for (size_t rangeIndex = 0; rangeIndex < sel->RangeCount(); ++rangeIndex) {
AbstractRange* range = sel->GetAbstractRangeAt(rangeIndex);
MOZ_ASSERT(range);
if (range->AreNormalRangeAndCrossShadowBoundaryRangeCollapsed()) {
if (range->Collapsed()) {
continue;
}
if (range->IsStaticRange() && !range->AsStaticRange()->IsValid()) {
@@ -346,44 +346,19 @@ const nsTHashSet<const nsINode*>& SelectionNodeCache::MaybeCollect(
startRef.IsStartOfContainer() ? nullptr : startRef.GetContainer();
const nsINode* endContainer =
endRef.IsEndOfContainer() ? nullptr : endRef.GetContainer();
auto AddNodeIfFullySelected = [&](const nsINode* aNode) {
if (!aNode) {
return;
}
// Only collect start and end container if they are fully
// selected (they are null in that case).
if (aNode == startContainer || aNode == endContainer) {
return;
}
fullySelectedNodes.Insert(aNode);
};
if (!StaticPrefs::dom_shadowdom_selection_across_boundary_enabled()) {
UnsafePreContentIterator iter;
nsresult rv = iter.Init(range);
if (NS_FAILED(rv)) {
continue;
}
for (; !iter.IsDone(); iter.Next()) {
AddNodeIfFullySelected(iter.GetCurrentNode());
}
} else {
ContentSubtreeIterator subtreeIter;
nsresult rv = subtreeIter.InitWithAllowCrossShadowBoundary(range);
if (NS_FAILED(rv)) {
continue;
}
for (; !subtreeIter.IsDone(); subtreeIter.Next()) {
MOZ_DIAGNOSTIC_ASSERT(subtreeIter.GetCurrentNode());
if (subtreeIter.GetCurrentNode()->IsContent()) {
TreeIterator<FlattenedChildIterator> iter(
*(subtreeIter.GetCurrentNode()->AsContent()));
for (; iter.GetCurrent(); iter.GetNext()) {
AddNodeIfFullySelected(iter.GetCurrent());
}
UnsafePreContentIterator iter;
nsresult rv = iter.Init(range);
if (NS_FAILED(rv)) {
continue;
}
for (; !iter.IsDone(); iter.Next()) {
if (const nsINode* node = iter.GetCurrentNode()) {
// Only collect start and end container if they are fully
// selected (they are null in that case).
if (node == startContainer || node == endContainer) {
continue;
}
fullySelectedNodes.Insert(node);
}
}
}
@@ -943,8 +918,8 @@ static int32_t CompareToRangeStart(
const AbstractRange& aRange, nsContentUtils::NodeIndexCache* aCache) {
MOZ_ASSERT(aCompareBoundary.IsSet());
MOZ_ASSERT(aRange.GetMayCrossShadowBoundaryStartContainer());
// If the nodes that we're comparing are not in the same document, assume
// that aCompareNode will fall at the end of the ranges.
// If the nodes that we're comparing are not in the same document, assume that
// aCompareNode will fall at the end of the ranges.
if (aCompareBoundary.GetComposedDoc() !=
aRange.MayCrossShadowBoundaryStartRef().GetComposedDoc() ||
!aRange.MayCrossShadowBoundaryStartRef().IsSetAndInComposedDoc()) {
@@ -1881,6 +1856,16 @@ nsresult Selection::SelectFramesOfInclusiveDescendantsOfContent(
return NS_OK;
}
void Selection::SelectFramesOfShadowIncludingDescendantsOfContent(
nsIContent* aContent, bool aSelected) const {
MOZ_ASSERT(aContent);
MOZ_ASSERT(StaticPrefs::dom_shadowdom_selection_across_boundary_enabled());
for (nsINode* node : ShadowIncludingTreeIterator(*aContent)) {
nsIContent* innercontent = node->IsContent() ? node->AsContent() : nullptr;
SelectFramesOf(innercontent, aSelected);
}
}
void Selection::SelectFramesInAllRanges(nsPresContext* aPresContext) {
// this method is currently only called in a user-initiated context.
// therefore it is safe to assume that we are not in a Highlight selection
@@ -2009,7 +1994,7 @@ nsresult Selection::SelectFrames(nsPresContext* aPresContext,
if (nsIContent* const content =
nsIContent::FromNodeOrNull(subtreeIter.GetCurrentNode())) {
if (StaticPrefs::dom_shadowdom_selection_across_boundary_enabled()) {
SelectFramesOfFlattenedTreeOfContent(content, aSelect);
SelectFramesOfShadowIncludingDescendantsOfContent(content, aSelect);
} else {
SelectFramesOfInclusiveDescendantsOfContent(postOrderIter, content,
aSelect);
@@ -2032,16 +2017,6 @@ nsresult Selection::SelectFrames(nsPresContext* aPresContext,
return NS_OK;
}
void Selection::SelectFramesOfFlattenedTreeOfContent(nsIContent* aContent,
bool aSelected) const {
MOZ_ASSERT(aContent);
MOZ_ASSERT(StaticPrefs::dom_shadowdom_selection_across_boundary_enabled());
TreeIterator<FlattenedChildIterator> iter(*aContent);
for (; iter.GetCurrent(); iter.GetNext()) {
SelectFramesOf(iter.GetCurrent(), aSelected);
}
}
// Selection::LookUpSelection
//
// This function is called when a node wants to know where the selection is