summaryrefslogtreecommitdiff
path: root/layout/tables
diff options
context:
space:
mode:
Diffstat (limited to 'layout/tables')
-rw-r--r--layout/tables/SpanningCellSorter.cpp6
-rw-r--r--layout/tables/nsCellMap.cpp8
-rw-r--r--layout/tables/nsTableFrame.cpp20
-rw-r--r--layout/tables/nsTableRowFrame.cpp2
4 files changed, 18 insertions, 18 deletions
diff --git a/layout/tables/SpanningCellSorter.cpp b/layout/tables/SpanningCellSorter.cpp
index 9ca577cde2..13aa61f939 100644
--- a/layout/tables/SpanningCellSorter.cpp
+++ b/layout/tables/SpanningCellSorter.cpp
@@ -108,7 +108,7 @@ SpanningCellSorter::GetNext(int32_t *aColSpan)
/* prepare to enumerate the array */
mState = ENUMERATING_ARRAY;
mEnumerationIndex = 0;
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
case ENUMERATING_ARRAY:
while (mEnumerationIndex < ARRAY_SIZE && !mArray[mEnumerationIndex])
++mEnumerationIndex;
@@ -138,7 +138,7 @@ SpanningCellSorter::GetNext(int32_t *aColSpan)
SortArray, nullptr);
mSortedHashTable = sh;
}
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
case ENUMERATING_HASH:
if (mEnumerationIndex < mHashTable.EntryCount()) {
Item *result = mSortedHashTable[mEnumerationIndex]->mItems;
@@ -153,7 +153,7 @@ SpanningCellSorter::GetNext(int32_t *aColSpan)
return result;
}
mState = DONE;
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
case DONE:
;
}
diff --git a/layout/tables/nsCellMap.cpp b/layout/tables/nsCellMap.cpp
index 4852a4bdde..e0deda7824 100644
--- a/layout/tables/nsCellMap.cpp
+++ b/layout/tables/nsCellMap.cpp
@@ -913,7 +913,7 @@ nsTableCellMap::ResetBStartStart(LogicalSide aSide,
switch(aSide) {
case eLogicalSideBEnd:
aRowIndex++;
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
case eLogicalSideBStart:
cellData = (BCCellData*)aCellMap.GetDataAt(aRowIndex, aColIndex);
if (cellData) {
@@ -936,7 +936,7 @@ nsTableCellMap::ResetBStartStart(LogicalSide aSide,
break;
case eLogicalSideIEnd:
aColIndex++;
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
case eLogicalSideIStart:
cellData = (BCCellData*)aCellMap.GetDataAt(aRowIndex, aColIndex);
if (cellData) {
@@ -981,7 +981,7 @@ nsTableCellMap::SetBCBorderEdge(LogicalSide aSide,
case eLogicalSideBEnd:
rgYPos++;
yPos++;
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
case eLogicalSideBStart:
lastIndex = xPos + aLength - 1;
for (xIndex = xPos; xIndex <= lastIndex; xIndex++) {
@@ -1028,7 +1028,7 @@ nsTableCellMap::SetBCBorderEdge(LogicalSide aSide,
break;
case eLogicalSideIEnd:
xPos++;
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
case eLogicalSideIStart:
// since bStart, bEnd borders were set, there should already be a cellData entry
lastIndex = rgYPos + aLength - 1;
diff --git a/layout/tables/nsTableFrame.cpp b/layout/tables/nsTableFrame.cpp
index cf4231c01f..f6d2dd54b9 100644
--- a/layout/tables/nsTableFrame.cpp
+++ b/layout/tables/nsTableFrame.cpp
@@ -6893,7 +6893,7 @@ BCBlockDirSeg::Paint(BCPaintBorderIterator& aIter,
if (!aIter.IsTableIEndMost() && (relColIndex > 0)) {
col = aIter.mBlockDirInfo[relColIndex - 1].mCol;
}
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
case eColGroupOwner:
if (col) {
owner = col->GetParent();
@@ -6904,13 +6904,13 @@ BCBlockDirSeg::Paint(BCPaintBorderIterator& aIter,
if (!aIter.IsTableIEndMost() && (relColIndex > 0)) {
col = aIter.mBlockDirInfo[relColIndex - 1].mCol;
}
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
case eColOwner:
owner = col;
break;
case eAjaRowGroupOwner:
NS_ERROR("a neighboring rowgroup can never own a vertical border");
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
case eRowGroupOwner:
NS_ASSERTION(aIter.IsTableIStartMost() || aIter.IsTableIEndMost(),
"row group can own border only at table edge");
@@ -6918,7 +6918,7 @@ BCBlockDirSeg::Paint(BCPaintBorderIterator& aIter,
break;
case eAjaRowOwner:
NS_ERROR("program error");
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
case eRowOwner:
NS_ASSERTION(aIter.IsTableIStartMost() || aIter.IsTableIEndMost(),
"row can own border only at table edge");
@@ -6927,7 +6927,7 @@ BCBlockDirSeg::Paint(BCPaintBorderIterator& aIter,
case eAjaCellOwner:
side = eLogicalSideIEnd;
cell = mAjaCell;
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
case eCellOwner:
owner = cell;
break;
@@ -7104,7 +7104,7 @@ BCInlineDirSeg::Paint(BCPaintBorderIterator& aIter, DrawTarget& aDrawTarget)
break;
case eAjaColGroupOwner:
NS_ERROR("neighboring colgroups can never own an inline-dir border");
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
case eColGroupOwner:
NS_ASSERTION(aIter.IsTableBStartMost() || aIter.IsTableBEndMost(),
"col group can own border only at the table edge");
@@ -7114,7 +7114,7 @@ BCInlineDirSeg::Paint(BCPaintBorderIterator& aIter, DrawTarget& aDrawTarget)
break;
case eAjaColOwner:
NS_ERROR("neighboring column can never own an inline-dir border");
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
case eColOwner:
NS_ASSERTION(aIter.IsTableBStartMost() || aIter.IsTableBEndMost(),
"col can own border only at the table edge");
@@ -7123,14 +7123,14 @@ BCInlineDirSeg::Paint(BCPaintBorderIterator& aIter, DrawTarget& aDrawTarget)
case eAjaRowGroupOwner:
side = eLogicalSideBEnd;
rg = (aIter.IsTableBEndMost()) ? aIter.mRg : aIter.mPrevRg;
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
case eRowGroupOwner:
owner = rg;
break;
case eAjaRowOwner:
side = eLogicalSideBEnd;
row = (aIter.IsTableBEndMost()) ? aIter.mRow : aIter.mPrevRow;
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
case eRowOwner:
owner = row;
break;
@@ -7139,7 +7139,7 @@ BCInlineDirSeg::Paint(BCPaintBorderIterator& aIter, DrawTarget& aDrawTarget)
// if this is null due to the damage area origin-y > 0, then the border
// won't show up anyway
cell = mAjaCell;
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
case eCellOwner:
owner = cell;
break;
diff --git a/layout/tables/nsTableRowFrame.cpp b/layout/tables/nsTableRowFrame.cpp
index 374bb2562e..9bcced1048 100644
--- a/layout/tables/nsTableRowFrame.cpp
+++ b/layout/tables/nsTableRowFrame.cpp
@@ -653,7 +653,7 @@ nsTableRowFrame::CalculateCellActualBSize(nsTableCellFrame* aCellFrame,
break;
}
// Fall through to the coord case
- MOZ_FALLTHROUGH;
+ [[fallthrough]];
}
case eStyleUnit_Coord: {
// In quirks mode, table cell isize should be content-box, but bsize
generated by cgit v1.2.3 (git 2.26.2) at 2024-09-05 07:38:23 +0000