commit 8217236cccae84afe73e93814de8c23970bea0a2
parent 5c04a9395033766adb7011f79f12b23a204036f6
Author: Andrew McCreight <continuation@gmail.com>
Date: Fri, 3 Oct 2025 19:33:35 +0000
Bug 1880093 - part 5: Use nsTArray for nsFrameSetFrame::mVerBorders and ::mHorBorders. r=layout-reviewers,dholbert
Differential Revision: https://phabricator.services.mozilla.com/D267084
Diffstat:
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/layout/generic/nsFrameSetFrame.cpp b/layout/generic/nsFrameSetFrame.cpp
@@ -232,15 +232,15 @@ void nsHTMLFramesetFrame::Init(nsIContent* aContent, nsContainerFrame* aParent,
static_assert(NS_MAX_FRAMESET_SPEC_COUNT <
UINT_MAX / sizeof(nsHTMLFramesetBorderFrame*),
"Should not overflow nsHTMLFramesetBorderFrame");
- mVerBorders = MakeUnique<nsHTMLFramesetBorderFrame*[]>(
- mNumCols); // 1 more than number of ver borders
+ mVerBorders.Clear();
+ mVerBorders.SetLength(mNumCols); // 1 more than number of ver borders
for (int verX = 0; verX < mNumCols; verX++) {
mVerBorders[verX] = nullptr;
}
- mHorBorders = MakeUnique<nsHTMLFramesetBorderFrame*[]>(
- mNumRows); // 1 more than number of hor borders
+ mHorBorders.Clear();
+ mHorBorders.SetLength(mNumRows); // 1 more than number of hor borders
for (int horX = 0; horX < mNumRows; horX++) {
mHorBorders[horX] = nullptr;
diff --git a/layout/generic/nsFrameSetFrame.h b/layout/generic/nsFrameSetFrame.h
@@ -174,8 +174,8 @@ class nsHTMLFramesetFrame final : public nsContainerFrame {
nsBorderColor mEdgeColors;
nsHTMLFramesetBorderFrame* mDragger;
nsHTMLFramesetFrame* mTopLevelFrameset;
- UniquePtr<nsHTMLFramesetBorderFrame*[]> mVerBorders; // vertical borders
- UniquePtr<nsHTMLFramesetBorderFrame*[]> mHorBorders; // horizontal borders
+ nsTArray<nsHTMLFramesetBorderFrame*> mVerBorders; // vertical borders
+ nsTArray<nsHTMLFramesetBorderFrame*> mHorBorders; // horizontal borders
UniquePtr<nsFrameborder[]>
mChildFrameborder; // the frameborder attr of children
UniquePtr<nsBorderColor[]> mChildBorderColors;