commit e54454446820b416df846627040a4d5c593eb223 parent 0d3216443c749fc4ff7d2fd3d033c3d37fdd4083 Author: serge-sans-paille <sguelton@mozilla.com> Date: Mon, 6 Oct 2025 06:35:10 +0000 Bug 1991864 - Remove unused mfbt/EnumSet.h inclusion r=emilio,media-playback-reviewers,dom-worker-reviewers,padenot,asuth While we're at it, also use some extra type alias Differential Revision: https://phabricator.services.mozilla.com/D267363 Diffstat:
18 files changed, 4 insertions(+), 20 deletions(-)
diff --git a/dom/media/ipc/MediaIPCUtils.h b/dom/media/ipc/MediaIPCUtils.h @@ -17,7 +17,6 @@ #include "PlatformEncoderModule.h" #include "ipc/EnumSerializer.h" #include "mozilla/CDMProxy.h" -#include "mozilla/EnumSet.h" #include "mozilla/GfxMessageUtils.h" #include "mozilla/Maybe.h" #include "mozilla/ParamTraits_TiedFields.h" diff --git a/dom/media/platforms/PDMFactory.h b/dom/media/platforms/PDMFactory.h @@ -13,7 +13,6 @@ # include "MediaCodecsSupport.h" # include "PlatformDecoderModule.h" # include "mozilla/AlreadyAddRefed.h" -# include "mozilla/EnumSet.h" # include "mozilla/MozPromise.h" # include "mozilla/RefPtr.h" # include "mozilla/ipc/UtilityProcessSandboxing.h" diff --git a/dom/media/platforms/wmf/MFMediaSource.h b/dom/media/platforms/wmf/MFMediaSource.h @@ -12,7 +12,6 @@ #include "MFMediaEngineStream.h" #include "MediaEventSource.h" #include "MediaInfo.h" -#include "mozilla/EnumSet.h" #include "mozilla/TaskQueue.h" namespace mozilla { diff --git a/dom/serviceworkers/ServiceWorkerManager.cpp b/dom/serviceworkers/ServiceWorkerManager.cpp @@ -29,7 +29,6 @@ #include "mozilla/BasePrincipal.h" #include "mozilla/ClearOnShutdown.h" #include "mozilla/ContentBlockingAllowList.h" -#include "mozilla/EnumSet.h" #include "mozilla/ErrorNames.h" #include "mozilla/LoadContext.h" #include "mozilla/MozPromise.h" diff --git a/dom/storage/LocalStorage.cpp b/dom/storage/LocalStorage.cpp @@ -9,7 +9,6 @@ #include "LocalStorageCache.h" #include "LocalStorageManager.h" #include "StorageUtils.h" -#include "mozilla/EnumSet.h" #include "mozilla/Preferences.h" #include "mozilla/dom/PermissionMessageUtils.h" #include "mozilla/dom/StorageBinding.h" diff --git a/gfx/layers/CompositorTypes.h b/gfx/layers/CompositorTypes.h @@ -14,7 +14,6 @@ #include "nsXULAppAPI.h" // for GeckoProcessType, etc #include "mozilla/gfx/Types.h" #include "mozilla/layers/SyncObject.h" -#include "mozilla/EnumSet.h" #include "mozilla/TypedEnumBits.h" diff --git a/gfx/webrender_bindings/WebRenderTypes.h b/gfx/webrender_bindings/WebRenderTypes.h @@ -9,7 +9,6 @@ #include "ImageTypes.h" #include "mozilla/webrender/webrender_ffi.h" -#include "mozilla/EnumSet.h" #include "mozilla/Maybe.h" #include "mozilla/gfx/Matrix.h" #include "mozilla/gfx/Types.h" diff --git a/js/src/builtin/ModuleObject.cpp b/js/src/builtin/ModuleObject.cpp @@ -7,7 +7,6 @@ #include "builtin/ModuleObject.h" #include "mozilla/DebugOnly.h" -#include "mozilla/EnumSet.h" #include "mozilla/ScopeExit.h" #include "builtin/Promise.h" diff --git a/js/src/builtin/temporal/PlainDate.cpp b/js/src/builtin/temporal/PlainDate.cpp @@ -8,7 +8,6 @@ #include "mozilla/Assertions.h" #include "mozilla/CheckedInt.h" -#include "mozilla/EnumSet.h" #include <cmath> #include <cstdlib> diff --git a/js/src/builtin/temporal/PlainDateTime.cpp b/js/src/builtin/temporal/PlainDateTime.cpp @@ -8,7 +8,6 @@ #include "mozilla/Assertions.h" #include "mozilla/Casting.h" -#include "mozilla/EnumSet.h" #include <algorithm> #include <utility> diff --git a/js/src/builtin/temporal/PlainMonthDay.cpp b/js/src/builtin/temporal/PlainMonthDay.cpp @@ -7,7 +7,6 @@ #include "builtin/temporal/PlainMonthDay.h" #include "mozilla/Assertions.h" -#include "mozilla/EnumSet.h" #include <utility> diff --git a/js/src/builtin/temporal/PlainYearMonth.cpp b/js/src/builtin/temporal/PlainYearMonth.cpp @@ -7,7 +7,6 @@ #include "builtin/temporal/PlainYearMonth.h" #include "mozilla/Assertions.h" -#include "mozilla/EnumSet.h" #include <utility> diff --git a/js/src/builtin/temporal/ZonedDateTime.cpp b/js/src/builtin/temporal/ZonedDateTime.cpp @@ -7,7 +7,6 @@ #include "builtin/temporal/ZonedDateTime.h" #include "mozilla/Assertions.h" -#include "mozilla/EnumSet.h" #include "mozilla/Maybe.h" #include <algorithm> diff --git a/js/src/util/StructuredSpewer.h b/js/src/util/StructuredSpewer.h @@ -12,7 +12,6 @@ # include "mozilla/Atomics.h" # include "mozilla/Attributes.h" # include "mozilla/EnumeratedArray.h" -# include "mozilla/EnumSet.h" # include "mozilla/Maybe.h" # include "mozilla/Sprintf.h" diff --git a/js/xpconnect/loader/ScriptPreloader-inl.h b/js/xpconnect/loader/ScriptPreloader-inl.h @@ -8,7 +8,6 @@ #include "mozilla/Attributes.h" #include "mozilla/Assertions.h" -#include "mozilla/EnumSet.h" #include "mozilla/Range.h" #include "mozilla/ResultExtensions.h" #include "mozilla/Unused.h" diff --git a/mfbt/EnumSet.h b/mfbt/EnumSet.h @@ -13,11 +13,10 @@ #include "mozilla/Attributes.h" #include "mozilla/MathAlgorithms.h" +#include <cstdint> #include <initializer_list> #include <type_traits> -#include <stdint.h> - namespace mozilla { /** @@ -25,8 +24,8 @@ namespace mozilla { * using a bit mask with the size of U for each value. It works both for enum * and enum class types. EnumSet also works with U being a BitSet. */ -template <typename T, typename Serialized = typename std::make_unsigned< - typename std::underlying_type<T>::type>::type> +template <typename T, + typename Serialized = std::make_unsigned_t<std::underlying_type_t<T>>> class EnumSet { public: using valueType = T; diff --git a/mozglue/misc/PreXULSkeletonUI.cpp b/mozglue/misc/PreXULSkeletonUI.cpp @@ -20,6 +20,7 @@ #include "mozilla/Attributes.h" #include "mozilla/BaseProfilerMarkers.h" #include "mozilla/CacheNtDllThunk.h" +#include "mozilla/EnumSet.h" #include "mozilla/FStream.h" #include "mozilla/GetKnownFolderPath.h" #include "mozilla/HashFunctions.h" diff --git a/mozglue/misc/PreXULSkeletonUI.h b/mozglue/misc/PreXULSkeletonUI.h @@ -8,7 +8,6 @@ #define PreXULSkeletonUI_h_ #include <windows.h> -#include "mozilla/EnumSet.h" #include "mozilla/Maybe.h" #include "mozilla/Result.h" #include "mozilla/Types.h"