diff options
author | Moonchild <moonchild@palemoon.org> | 2023-11-11 14:27:03 +0100 |
---|---|---|
committer | Moonchild <moonchild@palemoon.org> | 2023-11-11 14:27:03 +0100 |
commit | 734f0957fb8bc06ae6e5105d878f1b7007ce8b5d (patch) | |
tree | df73c5d270de365b4035aff74ef703c9f922bd30 /gfx | |
parent | c789882a294d29b3e5450a972ad67c4839c75e23 (diff) | |
download | uxp-734f0957fb8bc06ae6e5105d878f1b7007ce8b5d.tar.gz |
Issue #2343 - replace MOZ_FALLTHROUGH with [[fallthrough]]
Basically a S&R. Removed the macro and adjusts IDL codegen accordingly.
Diffstat (limited to 'gfx')
-rw-r--r-- | gfx/layers/apz/src/AsyncPanZoomController.cpp | 4 | ||||
-rw-r--r-- | gfx/layers/apz/src/GestureEventListener.cpp | 2 | ||||
-rw-r--r-- | gfx/layers/apz/util/APZEventState.cpp | 4 | ||||
-rw-r--r-- | gfx/thebes/gfxFcPlatformFontList.cpp | 2 | ||||
-rw-r--r-- | gfx/thebes/gfxFont.cpp | 8 | ||||
-rw-r--r-- | gfx/thebes/gfxTextRun.cpp | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/gfx/layers/apz/src/AsyncPanZoomController.cpp b/gfx/layers/apz/src/AsyncPanZoomController.cpp index 4808daf49c..88a2a40362 100644 --- a/gfx/layers/apz/src/AsyncPanZoomController.cpp +++ b/gfx/layers/apz/src/AsyncPanZoomController.cpp @@ -1089,7 +1089,7 @@ nsEventStatus AsyncPanZoomController::OnTouchStart(const MultiTouchInput& aEvent case PAN_MOMENTUM: MOZ_ASSERT(GetCurrentTouchBlock()); GetCurrentTouchBlock()->GetOverscrollHandoffChain()->CancelAnimations(ExcludeOverscroll); - MOZ_FALLTHROUGH; + [[fallthrough]]; case NOTHING: { mX.StartTouch(point.x, aEvent.mTime); mY.StartTouch(point.y, aEvent.mTime); @@ -1196,7 +1196,7 @@ nsEventStatus AsyncPanZoomController::OnTouchEnd(const MultiTouchInput& aEvent) case FLING: // Should never happen. NS_WARNING("Received impossible touch end in OnTouchEnd."); - MOZ_FALLTHROUGH; + [[fallthrough]]; case ANIMATING_ZOOM: case SMOOTH_SCROLL: case NOTHING: diff --git a/gfx/layers/apz/src/GestureEventListener.cpp b/gfx/layers/apz/src/GestureEventListener.cpp index 94ece07ee1..8495252571 100644 --- a/gfx/layers/apz/src/GestureEventListener.cpp +++ b/gfx/layers/apz/src/GestureEventListener.cpp @@ -438,7 +438,7 @@ void GestureEventListener::HandleInputTimeoutLongTap() // just in case MAX_TAP_TIME > ContextMenuDelay cancel MAX_TAP timer // and fall through CancelMaxTapTimeoutTask(); - MOZ_FALLTHROUGH; + [[fallthrough]]; case GESTURE_FIRST_SINGLE_TOUCH_MAX_TAP_DOWN: { SetState(GESTURE_LONG_TOUCH_DOWN); mAsyncPanZoomController->HandleGestureEvent( diff --git a/gfx/layers/apz/util/APZEventState.cpp b/gfx/layers/apz/util/APZEventState.cpp index 00a18d7b26..d61ca3fd0c 100644 --- a/gfx/layers/apz/util/APZEventState.cpp +++ b/gfx/layers/apz/util/APZEventState.cpp @@ -347,10 +347,10 @@ APZEventState::ProcessTouchEvent(const WidgetTouchEvent& aEvent, mTouchEndCancelled = true; mEndTouchIsClick = false; } - MOZ_FALLTHROUGH; + [[fallthrough]]; case eTouchCancel: mActiveElementManager->HandleTouchEndEvent(mEndTouchIsClick); - MOZ_FALLTHROUGH; + [[fallthrough]]; case eTouchMove: { if (mPendingTouchPreventedResponse) { MOZ_ASSERT(aGuid == mPendingTouchPreventedGuid); diff --git a/gfx/thebes/gfxFcPlatformFontList.cpp b/gfx/thebes/gfxFcPlatformFontList.cpp index f80196430f..903be6adfb 100644 --- a/gfx/thebes/gfxFcPlatformFontList.cpp +++ b/gfx/thebes/gfxFcPlatformFontList.cpp @@ -625,7 +625,7 @@ PrepareFontOptions(FcPattern* aPattern, // subpixel_order won't be used by the font as we won't use // CAIRO_ANTIALIAS_SUBPIXEL, but don't leave it at default for // caching reasons described above. Fall through: - MOZ_FALLTHROUGH; + [[fallthrough]]; case FC_RGBA_RGB: subpixel_order = CAIRO_SUBPIXEL_ORDER_RGB; break; diff --git a/gfx/thebes/gfxFont.cpp b/gfx/thebes/gfxFont.cpp index 3857c4cd38..9eea084fd9 100644 --- a/gfx/thebes/gfxFont.cpp +++ b/gfx/thebes/gfxFont.cpp @@ -479,7 +479,7 @@ gfxFontShaper::MergeFontFeatures( case NS_FONT_VARIANT_CAPS_ALLSMALL: mergedFeatures.Put(HB_TAG('c','2','s','c'), 1); // fall through to the small-caps case - MOZ_FALLTHROUGH; + [[fallthrough]]; case NS_FONT_VARIANT_CAPS_SMALLCAPS: mergedFeatures.Put(HB_TAG('s','m','c','p'), 1); @@ -489,7 +489,7 @@ gfxFontShaper::MergeFontFeatures( mergedFeatures.Put(aAddSmallCaps ? HB_TAG('c','2','s','c') : HB_TAG('c','2','p','c'), 1); // fall through to the petite-caps case - MOZ_FALLTHROUGH; + [[fallthrough]]; case NS_FONT_VARIANT_CAPS_PETITECAPS: mergedFeatures.Put(aAddSmallCaps ? HB_TAG('s','m','c','p') : @@ -615,7 +615,7 @@ gfxFontShaper::GetRoundOffsetsToPixels(DrawTarget* aDrawTarget, DWRITE_MEASURING_MODE_NATURAL) { return; } - MOZ_FALLTHROUGH; + [[fallthrough]]; #endif case CAIRO_FONT_TYPE_QUARTZ: // Quartz surfaces implement show_glyphs for Quartz fonts @@ -3119,7 +3119,7 @@ gfxFont::InitFakeSmallCapsRun(DrawTarget *aDrawTarget, case kUppercaseReduce: // use reduced-size font, then fall through to uppercase the text f = smallCapsFont; - MOZ_FALLTHROUGH; + [[fallthrough]]; case kUppercase: // apply uppercase transform to the string diff --git a/gfx/thebes/gfxTextRun.cpp b/gfx/thebes/gfxTextRun.cpp index 100af6da7b..896f2e1f8e 100644 --- a/gfx/thebes/gfxTextRun.cpp +++ b/gfx/thebes/gfxTextRun.cpp @@ -1758,7 +1758,7 @@ gfxFontGroup::FamilyFace::CheckState(bool& aSkipDrawing) case gfxUserFontEntry::STATUS_FAILED: SetInvalid(); // fall-thru to the default case - MOZ_FALLTHROUGH; + [[fallthrough]]; default: SetLoading(false); } |