Issue #2343 - replace MOZ_FALLTHROUGH with [[fallthrough]]

Basically a S&R. Removed the macro and adjusts IDL codegen accordingly.

22 files changed, 56 insertions, 56 deletions

diff --git a/layout/base/TouchManager.cpp b/layout/base/TouchManager.cpp
index 4439a3a7b0..0ca58b4360 100644
--- a/layout/base/TouchManager.cpp
+++ b/layout/base/TouchManager.cpp
@@ -213,7 +213,7 @@ TouchManager::PreHandleEvent(WidgetEvent* aEvent,
     case eTouchEnd:
       aIsHandlingUserInput = true;
       // Fall through to touchcancel code
-      MOZ_FALLTHROUGH;
+      [[fallthrough]];
     case eTouchCancel: {
       // Remove the changed touches
       // need to make sure we only remove touches that are ending here
diff --git a/layout/base/nsCSSRendering.cpp b/layout/base/nsCSSRendering.cpp
index 3084cf9085..74d0cabc6d 100644
--- a/layout/base/nsCSSRendering.cpp
+++ b/layout/base/nsCSSRendering.cpp
@@ -4404,7 +4404,7 @@ nsCSSRendering::DrawTableBorderSegment(DrawTarget&              aDrawTarget,
     break;
   case NS_STYLE_BORDER_STYLE_GROOVE:
     ridgeGroove = NS_STYLE_BORDER_STYLE_GROOVE; // and fall through to ridge
-    MOZ_FALLTHROUGH;
+    [[fallthrough]];
   case NS_STYLE_BORDER_STYLE_RIDGE:
     if ((horizontal && (twipsPerPixel >= aBorder.height)) ||
         (!horizontal && (twipsPerPixel >= aBorder.width))) {
@@ -4571,7 +4571,7 @@ nsCSSRendering::DrawTableBorderSegment(DrawTarget&              aDrawTarget,
       break;
     }
     // else fall through to solid
-    MOZ_FALLTHROUGH;
+    [[fallthrough]];
   case NS_STYLE_BORDER_STYLE_SOLID:
     DrawSolidBorderSegment(aDrawTarget, aBorder, aBorderColor,
                            aAppUnitsPerDevPixel, twipsPerPixel, aStartBevelSide,
diff --git a/layout/base/nsCSSRenderingBorders.cpp b/layout/base/nsCSSRenderingBorders.cpp
index 9720bb2dbf..5ca72075c8 100644
--- a/layout/base/nsCSSRenderingBorders.cpp
+++ b/layout/base/nsCSSRenderingBorders.cpp
@@ -1235,7 +1235,7 @@ MakeBorderColor(nscolor aColor, nscolor aBackgroundColor,
 
     case BorderColorStyleLight:
       k = 1;
-      MOZ_FALLTHROUGH;
+      [[fallthrough]];
     case BorderColorStyleDark:
       NS_GetSpecial3DColors(colors, aBackgroundColor, aColor);
       return Color::FromABGR(colors[k]);
diff --git a/layout/generic/CSSAlignUtils.cpp b/layout/generic/CSSAlignUtils.cpp
index 4cbaccd52c..ec993faf1a 100644
--- a/layout/generic/CSSAlignUtils.cpp
+++ b/layout/generic/CSSAlignUtils.cpp
@@ -133,7 +133,7 @@ CSSAlignUtils::AlignJustifySelf(uint8_t aAlignment, LogicalAxis aAxis,
       }
       break;
     case NS_STYLE_ALIGN_STRETCH:
-      MOZ_FALLTHROUGH; // ComputeSize() deals with it
+      [[fallthrough]]; // ComputeSize() deals with it
     case NS_STYLE_ALIGN_START:
       offset = marginStart;
       break;
diff --git a/layout/generic/nsFlexContainerFrame.cpp b/layout/generic/nsFlexContainerFrame.cpp
index d60308f424..2fc90e9da9 100644
--- a/layout/generic/nsFlexContainerFrame.cpp
+++ b/layout/generic/nsFlexContainerFrame.cpp
@@ -3012,7 +3012,7 @@ MainAxisPositionTracker::
       case NS_STYLE_JUSTIFY_BASELINE:
       case NS_STYLE_JUSTIFY_LAST_BASELINE:
         NS_WARNING("NYI: justify-content:left/right/baseline/last baseline");
-        MOZ_FALLTHROUGH;
+        [[fallthrough]];
       case NS_STYLE_JUSTIFY_FLEX_START:
         // All packing space should go at the end --> nothing to do here.
         break;
@@ -3220,7 +3220,7 @@ CrossAxisPositionTracker::
       case NS_STYLE_ALIGN_BASELINE:
       case NS_STYLE_ALIGN_LAST_BASELINE:
         NS_WARNING("NYI: align-items/align-self:left/right/self-start/self-end/baseline/last baseline");
-        MOZ_FALLTHROUGH;
+        [[fallthrough]];
       case NS_STYLE_ALIGN_FLEX_START:
         // All packing space should go at the end --> nothing to do here.
         break;
@@ -3522,7 +3522,7 @@ SingleLineCrossAxisPositionTracker::
     case NS_STYLE_ALIGN_SELF_START:
     case NS_STYLE_ALIGN_SELF_END:
       NS_WARNING("NYI: align-items/align-self:left/right/self-start/self-end");
-      MOZ_FALLTHROUGH;
+      [[fallthrough]];
     case NS_STYLE_ALIGN_FLEX_START:
       // No space to skip over -- we're done.
       break;
diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index a4d4427f69..0d00a35865 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -7735,7 +7735,7 @@ nsIFrame::PeekOffset(nsPeekOffsetStruct* aPos)
         aPos->mWordMovementType = eEndWord;
       }
       // Intentionally fall through the eSelectWord case.
-      MOZ_FALLTHROUGH;
+      [[fallthrough]];
     case eSelectWord:
     {
       // wordSelectEatSpace means "are we looking for a boundary between whitespace
diff --git a/layout/generic/nsGridContainerFrame.cpp b/layout/generic/nsGridContainerFrame.cpp
index 1e1afac234..5cc8189e94 100644
--- a/layout/generic/nsGridContainerFrame.cpp
+++ b/layout/generic/nsGridContainerFrame.cpp
@@ -4938,7 +4938,7 @@ nsGridContainerFrame::Tracks::AlignJustifyContent(
     case NS_STYLE_ALIGN_BASELINE:
     case NS_STYLE_ALIGN_LAST_BASELINE:
       NS_WARNING("NYI: 'first/last baseline' (bug 1151204)"); // XXX
-      MOZ_FALLTHROUGH;
+      [[fallthrough]];
     case NS_STYLE_ALIGN_START:
       distribute = false;
       break;
diff --git a/layout/generic/nsLineLayout.cpp b/layout/generic/nsLineLayout.cpp
index 579c4ae0b0..90ce6b089f 100644
--- a/layout/generic/nsLineLayout.cpp
+++ b/layout/generic/nsLineLayout.cpp
@@ -3009,7 +3009,7 @@ nsLineLayout::ExpandRubyBox(PerFrameData* aFrame, nscoord aReservedISize,
       }
       // If there are no justification opportunities for space-between,
       // fall-through to center per spec.
-      MOZ_FALLTHROUGH;
+      [[fallthrough]];
     }
     case NS_STYLE_RUBY_ALIGN_CENTER:
       // Indent all children by half of the reserved inline size.
@@ -3201,7 +3201,7 @@ nsLineLayout::TextAlignLine(nsLineBox* aLine,
         }
         // Fall through to the default case if we could not justify to fill
         // the space.
-        MOZ_FALLTHROUGH;
+        [[fallthrough]];
       }
 
       case NS_STYLE_TEXT_ALIGN_START:
diff --git a/layout/printing/nsPrintPreviewListener.cpp b/layout/printing/nsPrintPreviewListener.cpp
index 5edc0fb903..f4344b3037 100644
--- a/layout/printing/nsPrintPreviewListener.cpp
+++ b/layout/printing/nsPrintPreviewListener.cpp
@@ -195,7 +195,7 @@ nsPrintPreviewListener::HandleEvent(nsIDOMEvent* aEvent)
           }
         }
       }
-      MOZ_FALLTHROUGH;
+      [[fallthrough]];
       case eEventAction_Suppress:
         aEvent->StopPropagation();
         aEvent->PreventDefault();
diff --git a/layout/style/CSSLexer.cpp b/layout/style/CSSLexer.cpp
index f465981e7b..a38784a192 100644
--- a/layout/style/CSSLexer.cpp
+++ b/layout/style/CSSLexer.cpp
@@ -125,7 +125,7 @@ CSSLexer::NextToken(Nullable<CSSToken>& aResult)
 
     case eCSSToken_Dimension:
       resultToken.mText.Construct(token.mIdent);
-      MOZ_FALLTHROUGH;
+      [[fallthrough]];
     case eCSSToken_Number:
     case eCSSToken_Percentage:
       resultToken.mNumber.Construct(token.mNumber);
diff --git a/layout/style/Declaration.cpp b/layout/style/Declaration.cpp
index 6ef53f5db1..9a196ef27b 100644
--- a/layout/style/Declaration.cpp
+++ b/layout/style/Declaration.cpp
@@ -770,7 +770,7 @@ Declaration::GetPropertyValueInternal(
       }
       // tweak aProperty and fall through
       aProperty = eCSSProperty_border_top;
-      MOZ_FALLTHROUGH;
+      [[fallthrough]];
     }
     case eCSSProperty_border_top:
     case eCSSProperty_border_right:
@@ -1321,7 +1321,7 @@ Declaration::GetPropertyValueInternal(
         return;
       }
       // Fall through to eCSSProperty_grid_template (syntax #1)
-      MOZ_FALLTHROUGH;
+      [[fallthrough]];
     }
     case eCSSProperty_grid_template: {
       const nsCSSValue& areasValue =
@@ -1466,7 +1466,7 @@ Declaration::GetPropertyValueInternal(
           !justify || !IsSingleValue(*justify)) {
         return; // Not serializable, bail.
       }
-      MOZ_FALLTHROUGH;
+      [[fallthrough]];
     }
     case eCSSProperty_gap: {
       const nsCSSPropertyID* subprops =
diff --git a/layout/style/StyleAnimationValue.cpp b/layout/style/StyleAnimationValue.cpp
index 2332de6a6a..199bcf16d5 100644
--- a/layout/style/StyleAnimationValue.cpp
+++ b/layout/style/StyleAnimationValue.cpp
@@ -164,7 +164,7 @@ AppendFunction(nsCSSKeyword aTransformFunction)
       break;
     default:
       NS_ERROR("must be a transform function");
-      MOZ_FALLTHROUGH;
+      [[fallthrough]];
     case eCSSKeyword_translatex:
     case eCSSKeyword_translatey:
     case eCSSKeyword_translatez:
@@ -2005,7 +2005,7 @@ AddWeightedFilterFunctionImpl(double aCoeff1, const nsCSSValueList* aList1,
     case eCSSKeyword_invert:
     case eCSSKeyword_sepia:
       initialVal = 0.0f;
-      MOZ_FALLTHROUGH;
+      [[fallthrough]];
     case eCSSKeyword_brightness:
     case eCSSKeyword_contrast:
     case eCSSKeyword_opacity:
@@ -2255,7 +2255,7 @@ AddShapeFunction(nsCSSPropertyID aProperty,
                                        resultFuncArgs->Item(2))) {
         return nullptr;
       }
-      MOZ_FALLTHROUGH;  // to handle rx and center point
+      [[fallthrough]];  // to handle rx and center point
     case eCSSKeyword_circle: {
       // Add circles' |r| (or ellipses' |rx|) values:
       if (!AddCSSValuePixelPercentCalc(aRestriction == Restrictions::Enable
@@ -2471,7 +2471,7 @@ AddTransformLists(double aCoeff1, const nsCSSValueList* aList1,
                            arr->Item(4));
           break;
         }
-        MOZ_FALLTHROUGH;
+        [[fallthrough]];
       }
       case eCSSKeyword_matrix:
       case eCSSKeyword_matrix3d:
@@ -2496,7 +2496,7 @@ AddTransformLists(double aCoeff1, const nsCSSValueList* aList1,
           }
           break;
         }
-        MOZ_FALLTHROUGH;
+        [[fallthrough]];
       case eCSSKeyword_interpolatematrix: {
         // FIXME: If the matrix contains only numbers then we could decompose
         // here.
diff --git a/layout/style/nsCSSParser.cpp b/layout/style/nsCSSParser.cpp
index f66415ea9e..2469536ad5 100644
--- a/layout/style/nsCSSParser.cpp
+++ b/layout/style/nsCSSParser.cpp
@@ -4580,7 +4580,7 @@ CSSParserImpl::ParseKeyframeSelectorList(InfallibleTArray<float>& aSelectorList)
           value = 1.0f;
           break;
         }
-        MOZ_FALLTHROUGH;
+        [[fallthrough]];
       default:
         UngetToken();
         // The first time through the loop, this means we got an empty
@@ -10759,7 +10759,7 @@ CSSParserImpl::IsLegacyGradientLine(const nsCSSTokenType& aType,
       haveGradientLine = true;
       break;
     }
-    MOZ_FALLTHROUGH;
+    [[fallthrough]];
   case eCSSToken_ID:
   case eCSSToken_Hash:
     // this is a color
@@ -11442,10 +11442,10 @@ CSSParserImpl::ParseBoxProperties(const nsCSSPropertyID aPropIDs[])
   switch (count) {
     case 1: // Make right == top
       result.mRight = result.mTop;
-      MOZ_FALLTHROUGH;
+      [[fallthrough]];
     case 2: // Make bottom == top
       result.mBottom = result.mTop;
-      MOZ_FALLTHROUGH;
+      [[fallthrough]];
     case 3: // Make left == right
       result.mLeft = result.mRight;
   }
@@ -11488,10 +11488,10 @@ CSSParserImpl::ParseGroupedBoxProperty(int32_t aVariantMask,
   switch (count) {
     case 1: // Make right == top
       result.mRight = result.mTop;
-      MOZ_FALLTHROUGH;
+      [[fallthrough]];
     case 2: // Make bottom == top
       result.mBottom = result.mTop;
-      MOZ_FALLTHROUGH;
+      [[fallthrough]];
     case 3: // Make left == right
       result.mLeft = result.mRight;
   }
@@ -11589,10 +11589,10 @@ CSSParserImpl::ParseBoxCornerRadiiInternals(nsCSSValue array[])
   switch (countX) {
     case 1: // Make top-right same as top-left
       dimenX.mRight = dimenX.mTop;
-      MOZ_FALLTHROUGH;
+      [[fallthrough]];
     case 2: // Make bottom-right same as top-left
       dimenX.mBottom = dimenX.mTop;
-      MOZ_FALLTHROUGH;
+      [[fallthrough]];
     case 3: // Make bottom-left same as top-right
       dimenX.mLeft = dimenX.mRight;
   }
@@ -11600,10 +11600,10 @@ CSSParserImpl::ParseBoxCornerRadiiInternals(nsCSSValue array[])
   switch (countY) {
     case 1: // Make top-right same as top-left
       dimenY.mRight = dimenY.mTop;
-      MOZ_FALLTHROUGH;
+      [[fallthrough]];
     case 2: // Make bottom-right same as top-left
       dimenY.mBottom = dimenY.mTop;
-      MOZ_FALLTHROUGH;
+      [[fallthrough]];
     case 3: // Make bottom-left same as top-right
       dimenY.mLeft = dimenY.mRight;
   }
diff --git a/layout/style/nsComputedDOMStyle.cpp b/layout/style/nsComputedDOMStyle.cpp
index 65f42805de..e3f931ea7e 100644
--- a/layout/style/nsComputedDOMStyle.cpp
+++ b/layout/style/nsComputedDOMStyle.cpp
@@ -4109,7 +4109,7 @@ nsComputedDOMStyle::DoGetTextSizeAdjust()
   switch (StyleText()->mTextSizeAdjust) {
     default:
       NS_NOTREACHED("unexpected value");
-      MOZ_FALLTHROUGH;
+      [[fallthrough]];
     case NS_STYLE_TEXT_SIZE_ADJUST_AUTO:
       val->SetIdent(eCSSKeyword_auto);
       break;
diff --git a/layout/style/nsRuleNode.cpp b/layout/style/nsRuleNode.cpp
index 858d7feba3..3eea109db6 100644
--- a/layout/style/nsRuleNode.cpp
+++ b/layout/style/nsRuleNode.cpp
@@ -240,7 +240,7 @@ nsRuleNode::EnsureBlockDisplay(StyleDisplay& display,
       display = StyleDisplay::Block;
       break;
     } // else, fall through to share the 'break' for non-changing display vals
-    MOZ_FALLTHROUGH;
+    [[fallthrough]];
   case StyleDisplay::None:
   case StyleDisplay::Contents:
     // never change display:none or display:contents *ever*
diff --git a/layout/style/nsStyleStruct.cpp b/layout/style/nsStyleStruct.cpp
index e83a6dcf95..f6304fd833 100644
--- a/layout/style/nsStyleStruct.cpp
+++ b/layout/style/nsStyleStruct.cpp
@@ -1287,7 +1287,7 @@ nsStyleSVGPaint::Reset()
     case eStyleSVGPaintType_Server:
       mPaint.mPaintServer->Release();
       mPaint.mPaintServer = nullptr;
-      MOZ_FALLTHROUGH;
+      [[fallthrough]];
     case eStyleSVGPaintType_ContextFill:
     case eStyleSVGPaintType_ContextStroke:
       mFallbackColor = NS_RGB(0, 0, 0);
diff --git a/layout/style/nsStyleTransformMatrix.cpp b/layout/style/nsStyleTransformMatrix.cpp
index 3cc1667074..3ac6b6b478 100644
--- a/layout/style/nsStyleTransformMatrix.cpp
+++ b/layout/style/nsStyleTransformMatrix.cpp
@@ -639,7 +639,7 @@ MatrixForTransformFunction(Matrix4x4& aMatrix,
     break;
   case eCSSKeyword_rotatez:
     *aContains3dTransform = true;
-    MOZ_FALLTHROUGH;
+    [[fallthrough]];
   case eCSSKeyword_rotate:
     ProcessRotateZ(aMatrix, aData);
     break;
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
diff --git a/layout/xul/nsXULPopupManager.cpp b/layout/xul/nsXULPopupManager.cpp
index 6e8cc3dda1..99cbd421dd 100644
--- a/layout/xul/nsXULPopupManager.cpp
+++ b/layout/xul/nsXULPopupManager.cpp
@@ -2336,7 +2336,7 @@ nsXULPopupManager::HandleKeyboardEventWithKeyCode(
         Rollup(0, false, nullptr, nullptr);
         break;
       }
-      MOZ_FALLTHROUGH;
+      [[fallthrough]];
 #endif
 
     case nsIDOMKeyEvent::DOM_VK_LEFT:
@@ -2380,7 +2380,7 @@ nsXULPopupManager::HandleKeyboardEventWithKeyCode(
         break;
       }
       // Intentional fall-through to RETURN case
-      MOZ_FALLTHROUGH;
+      [[fallthrough]];
 
     case nsIDOMKeyEvent::DOM_VK_RETURN: {
       // If there is a popup open, check if the current item needs to be opened.