Bug 1879731: Address clang-tidy concerns in BCMapCellIterator. r=layout-reviewers,emilio

Differential Revision: https://phabricator.services.mozilla.com/D202316
This commit is contained in:
David Shin 2024-02-27 15:55:40 +00:00
parent 9184cb608d
commit 0c24333993

View file

@ -3903,14 +3903,14 @@ class BCMapCellIterator {
public: public:
BCMapCellIterator(nsTableFrame* aTableFrame, const TableArea& aDamageArea); BCMapCellIterator(nsTableFrame* aTableFrame, const TableArea& aDamageArea);
void First(BCMapCellInfo& aMapCellInfo); void First(BCMapCellInfo& aMapInfo);
void Next(BCMapCellInfo& aMapCellInfo); void Next(BCMapCellInfo& aMapInfo);
void PeekIEnd(const BCMapCellInfo& aRefInfo, uint32_t aRowIndex, void PeekIEnd(const BCMapCellInfo& aRefInfo, int32_t aRowIndex,
BCMapCellInfo& aAjaInfo); BCMapCellInfo& aAjaInfo);
void PeekBEnd(const BCMapCellInfo& aRefInfo, uint32_t aColIndex, void PeekBEnd(const BCMapCellInfo& aRefInfo, int32_t aColIndex,
BCMapCellInfo& aAjaInfo); BCMapCellInfo& aAjaInfo);
void PeekIStart(const BCMapCellInfo& aRefInfo, int32_t aRowIndex, void PeekIStart(const BCMapCellInfo& aRefInfo, int32_t aRowIndex,
@ -4190,13 +4190,13 @@ void BCMapCellIterator::Next(BCMapCellInfo& aMapInfo) {
} }
void BCMapCellIterator::PeekIEnd(const BCMapCellInfo& aRefInfo, void BCMapCellIterator::PeekIEnd(const BCMapCellInfo& aRefInfo,
uint32_t aRowIndex, BCMapCellInfo& aAjaInfo) { int32_t aRowIndex, BCMapCellInfo& aAjaInfo) {
PeekIAt(aRefInfo, static_cast<int32_t>(aRowIndex), PeekIAt(aRefInfo, aRowIndex, aRefInfo.mColIndex + aRefInfo.mColSpan,
aRefInfo.mColIndex + aRefInfo.mColSpan, aAjaInfo); aAjaInfo);
} }
void BCMapCellIterator::PeekBEnd(const BCMapCellInfo& aRefInfo, void BCMapCellIterator::PeekBEnd(const BCMapCellInfo& aRefInfo,
uint32_t aColIndex, BCMapCellInfo& aAjaInfo) { int32_t aColIndex, BCMapCellInfo& aAjaInfo) {
aAjaInfo.ResetCellInfo(); aAjaInfo.ResetCellInfo();
int32_t rowIndex = aRefInfo.mRowIndex + aRefInfo.mRowSpan; int32_t rowIndex = aRefInfo.mRowIndex + aRefInfo.mRowSpan;
int32_t rgRowIndex = rowIndex - mRowGroupStart; int32_t rgRowIndex = rowIndex - mRowGroupStart;
@ -4236,7 +4236,7 @@ void BCMapCellIterator::PeekBEnd(const BCMapCellInfo& aRefInfo,
if (!cellData) ABORT0(); if (!cellData) ABORT0();
} }
if (cellData->IsColSpan()) { if (cellData->IsColSpan()) {
aColIndex -= cellData->GetColSpanOffset(); aColIndex -= static_cast<int32_t>(cellData->GetColSpanOffset());
cellData = cellData =
static_cast<BCCellData*>(cellMap->GetDataAt(rgRowIndex, aColIndex)); static_cast<BCCellData*>(cellMap->GetDataAt(rgRowIndex, aColIndex));
} }