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

Revert "Bug 1924195: Support multiple anchors with the same name. r=layout-reviewers,emilio" for causing build bustages at PresShell.cpp

Browse Source 
This reverts commit 03056ee940.
This commit is contained in:
Cristina Horotan
2025-05-14 17:17:25 +03:00
committed by chorotan@mozilla.com
parent 5901b2c539
commit 83b31dd55c
2 changed files with 8 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
layout/base/PresShell.cpp
View File

@@ -11508,59 +11508,23 @@ nsIFrame* PresShell::GetAbsoluteContainingBlock(nsIFrame* aFrame) {
nsIFrame* PresShell::GetAnchorPosAnchor(const nsAtom* aName) const {
MOZ_ASSERT(aName);
if (const auto& entry = mAnchorPosAnchors.Lookup(aName)) {
return entry->SafeLastElement(nullptr);
if (auto entry = mAnchorPosAnchors.Lookup(aName)) {
return entry.Data();
}
return nullptr;
}
void PresShell::AddAnchorPosAnchor(const nsAtom* aName, nsIFrame* aFrame) {
MOZ_ASSERT(aName);
auto& entry = mAnchorPosAnchors.LookupOrInsertWith(
aName, []() { return nsTArray<nsIFrame*>(); });
if (entry.IsEmpty()) {
entry.AppendElement(aFrame);
return;
}
struct FrameTreeComparator {
nsIFrame* mFrame;
constexpr int32_t operator()(nsIFrame* aOther) const {
return nsLayoutUtils::CompareTreePosition(aOther, mFrame, nullptr);
}
};
FrameTreeComparator cmp{aFrame};
size_t matchOrInsertionIdx = entry.Length();
// If the same element is already in the array,
// someone forgot to call RemoveAnchorPosAnchor.
if (BinarySearchIf(entry, 0, entry.Length(), cmp, &matchOrInsertionIdx)) {
MOZ_ASSERT_UNREACHABLE("Anchor added already");
return;
}
*entry.InsertElementAt(matchOrInsertionIdx) = aFrame;
mAnchorPosAnchors.InsertOrUpdate(aName, aFrame);
}
void PresShell::RemoveAnchorPosAnchor(const nsAtom* aName, nsIFrame* aFrame) {
MOZ_ASSERT(aName);
auto entry = mAnchorPosAnchors.Lookup(aName);
if (!entry) {
return; // Nothing to remove.
}
auto& anchorArray = entry.Data();
MOZ_ASSERT(!anchorArray.IsEmpty());
MOZ_ASSERT(anchorArray.Contains(aFrame));
anchorArray.RemoveElement(aFrame);
if (anchorArray.IsEmpty()) {
entry.Remove();
if (auto entry = mAnchorPosAnchors.Lookup(aName)) {
if (entry.Data() == aFrame) {
entry.Remove();
}
}
}

2
layout/base/PresShell.h
View File

@@ -3029,7 +3029,7 @@ class PresShell final : public nsStubDocumentObserver,
// A hash table of heap allocated weak frames.
nsTHashSet<WeakFrame*> mWeakFrames;
nsTHashMap<RefPtr<const nsAtom>, nsTArray<nsIFrame*>> mAnchorPosAnchors;
nsTHashMap<RefPtr<const nsAtom>, nsIFrame*> mAnchorPosAnchors;
// Reflow roots that need to be reflowed.
DepthOrderedFrameList mDirtyRoots;