diff --git a/accessible/windows/msaa/CompatibilityUIA.cpp b/accessible/windows/msaa/CompatibilityUIA.cpp index 7d803dd102323..547d997ae0288 100644 --- a/accessible/windows/msaa/CompatibilityUIA.cpp +++ b/accessible/windows/msaa/CompatibilityUIA.cpp @@ -6,6 +6,7 @@ #include "Compatibility.h" +#include "mozilla/ScopeExit.h" #include "mozilla/Telemetry.h" #include "mozilla/UniquePtrExtensions.h" #include "mozilla/WindowsVersion.h" diff --git a/browser/app/winlauncher/DllBlocklistInit.cpp b/browser/app/winlauncher/DllBlocklistInit.cpp index 11e79f5ac90cb..9e1a12c31073b 100644 --- a/browser/app/winlauncher/DllBlocklistInit.cpp +++ b/browser/app/winlauncher/DllBlocklistInit.cpp @@ -12,6 +12,7 @@ #include "mozilla/BinarySearch.h" #include "mozilla/ImportDir.h" #include "mozilla/NativeNt.h" +#include "mozilla/ScopeExit.h" #include "mozilla/Types.h" #include "mozilla/WindowsDllBlocklist.h" #include "mozilla/WinHeaderOnlyUtils.h" diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index b4438c11349fd..1fbfe002a7881 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -33,6 +33,7 @@ #include "mozilla/PresShell.h" #include "mozilla/ResultExtensions.h" #include "mozilla/SchedulerGroup.h" +#include "mozilla/ScopeExit.h" #include "mozilla/ScrollTypes.h" #include "mozilla/Services.h" #include "mozilla/StaticPrefs_browser.h" diff --git a/docshell/base/nsDocShellTreeOwner.cpp b/docshell/base/nsDocShellTreeOwner.cpp index 4c57ee9b9955d..b2313c8c72740 100644 --- a/docshell/base/nsDocShellTreeOwner.cpp +++ b/docshell/base/nsDocShellTreeOwner.cpp @@ -12,6 +12,7 @@ #include "nsContentUtils.h" #include "nsSize.h" #include "mozilla/ReflowInput.h" +#include "mozilla/ScopeExit.h" #include "nsComponentManagerUtils.h" #include "nsString.h" #include "nsAtom.h" diff --git a/dom/animation/DocumentTimeline.cpp b/dom/animation/DocumentTimeline.cpp index 6d1bebe03afef..c69f7da56f95d 100644 --- a/dom/animation/DocumentTimeline.cpp +++ b/dom/animation/DocumentTimeline.cpp @@ -5,7 +5,6 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "DocumentTimeline.h" -#include "mozilla/ScopeExit.h" #include "mozilla/dom/DocumentInlines.h" #include "mozilla/dom/DocumentTimelineBinding.h" #include "AnimationUtils.h" diff --git a/dom/base/BodyConsumer.cpp b/dom/base/BodyConsumer.cpp index dea928b7839e2..8d271b1c05705 100644 --- a/dom/base/BodyConsumer.cpp +++ b/dom/base/BodyConsumer.cpp @@ -22,6 +22,7 @@ #include "mozilla/dom/WorkerRunnable.h" #include "mozilla/dom/WorkerScope.h" #include "mozilla/ipc/PBackgroundSharedTypes.h" +#include "mozilla/ScopeExit.h" #include "nsComponentManagerUtils.h" #include "nsIFile.h" #include "nsIThreadRetargetableRequest.h" diff --git a/dom/base/BodyStream.cpp b/dom/base/BodyStream.cpp index edbc5a6ffdc11..12ed7fce2f99f 100644 --- a/dom/base/BodyStream.cpp +++ b/dom/base/BodyStream.cpp @@ -12,6 +12,7 @@ #include "mozilla/dom/WorkerPrivate.h" #include "mozilla/dom/WorkerRunnable.h" #include "mozilla/Maybe.h" +#include "mozilla/ScopeExit.h" #include "mozilla/Unused.h" #include "nsProxyRelease.h" #include "nsStreamUtils.h" diff --git a/dom/base/ChromeUtils.cpp b/dom/base/ChromeUtils.cpp index f71835da96bc3..0362d06d09c58 100644 --- a/dom/base/ChromeUtils.cpp +++ b/dom/base/ChromeUtils.cpp @@ -20,6 +20,7 @@ #include "mozilla/Preferences.h" #include "mozilla/ProcInfo.h" #include "mozilla/ResultExtensions.h" +#include "mozilla/ScopeExit.h" #include "mozilla/SharedStyleSheetCache.h" #include "mozilla/TimeStamp.h" #include "mozilla/dom/ContentParent.h" diff --git a/dom/base/nsFrameLoader.cpp b/dom/base/nsFrameLoader.cpp index 43a3b41c85b74..6e50a38c0d382 100644 --- a/dom/base/nsFrameLoader.cpp +++ b/dom/base/nsFrameLoader.cpp @@ -78,6 +78,7 @@ #include "mozilla/Preferences.h" #include "mozilla/PresShell.h" #include "mozilla/PresShellInlines.h" +#include "mozilla/ScopeExit.h" #include "mozilla/StaticPrefs_fission.h" #include "mozilla/Unused.h" #include "mozilla/dom/ChromeMessageSender.h" diff --git a/dom/bindings/BindingUtils.cpp b/dom/bindings/BindingUtils.cpp index 03fd54c94f4c0..5e403568edc33 100644 --- a/dom/bindings/BindingUtils.cpp +++ b/dom/bindings/BindingUtils.cpp @@ -14,6 +14,7 @@ #include "mozilla/Encoding.h" #include "mozilla/FloatingPoint.h" #include "mozilla/Preferences.h" +#include "mozilla/ScopeExit.h" #include "mozilla/StaticPrefs_dom.h" #include "mozilla/UniquePtr.h" #include "mozilla/Unused.h" diff --git a/dom/canvas/IpdlQueue.h b/dom/canvas/IpdlQueue.h index c5021b967cc95..676dece991ed6 100644 --- a/dom/canvas/IpdlQueue.h +++ b/dom/canvas/IpdlQueue.h @@ -18,6 +18,7 @@ #include "mozilla/ipc/Shmem.h" #include "mozilla/ipc/ProtocolUtils.h" #include "mozilla/Logging.h" +#include "mozilla/ScopeExit.h" #include "mozilla/TimeStamp.h" #include "mozilla/TypeTraits.h" #include "nsString.h" diff --git a/dom/canvas/WebGLTexture.cpp b/dom/canvas/WebGLTexture.cpp index 20a2d98ab0f60..b2056e4969326 100644 --- a/dom/canvas/WebGLTexture.cpp +++ b/dom/canvas/WebGLTexture.cpp @@ -13,6 +13,7 @@ #include "mozilla/IntegerRange.h" #include "mozilla/MathAlgorithms.h" #include "mozilla/Scoped.h" +#include "mozilla/ScopeExit.h" #include "mozilla/Unused.h" #include "ScopedGLHelpers.h" #include "WebGLContext.h" diff --git a/dom/canvas/WebGLTextureUpload.cpp b/dom/canvas/WebGLTextureUpload.cpp index 6911b5299f9a5..6c0463efbef6e 100644 --- a/dom/canvas/WebGLTextureUpload.cpp +++ b/dom/canvas/WebGLTextureUpload.cpp @@ -21,6 +21,7 @@ #include "mozilla/dom/ImageData.h" #include "mozilla/MathAlgorithms.h" #include "mozilla/Scoped.h" +#include "mozilla/ScopeExit.h" #include "mozilla/StaticPrefs_webgl.h" #include "mozilla/Unused.h" #include "nsLayoutUtils.h" diff --git a/dom/clients/manager/ClientManagerService.cpp b/dom/clients/manager/ClientManagerService.cpp index 3e0c5d767f8f0..b4f87e0a26080 100644 --- a/dom/clients/manager/ClientManagerService.cpp +++ b/dom/clients/manager/ClientManagerService.cpp @@ -20,6 +20,7 @@ #include "mozilla/ClearOnShutdown.h" #include "mozilla/MozPromise.h" #include "mozilla/SchedulerGroup.h" +#include "mozilla/ScopeExit.h" #include "jsfriendapi.h" #include "nsIAsyncShutdown.h" #include "nsIXULRuntime.h" diff --git a/dom/debugger/DebuggerNotificationManager.cpp b/dom/debugger/DebuggerNotificationManager.cpp index e2fbb10f82d8d..773fdc0c5aa31 100644 --- a/dom/debugger/DebuggerNotificationManager.cpp +++ b/dom/debugger/DebuggerNotificationManager.cpp @@ -6,7 +6,6 @@ #include "DebuggerNotificationManager.h" -#include "mozilla/ScopeExit.h" #include "nsIGlobalObject.h" namespace mozilla::dom { diff --git a/dom/events/EventStateManager.cpp b/dom/events/EventStateManager.cpp index 0300f914769b7..a6b3b557f1b52 100644 --- a/dom/events/EventStateManager.cpp +++ b/dom/events/EventStateManager.cpp @@ -16,6 +16,7 @@ #include "mozilla/MathAlgorithms.h" #include "mozilla/MouseEvents.h" #include "mozilla/PresShell.h" +#include "mozilla/ScopeExit.h" #include "mozilla/ScrollTypes.h" #include "mozilla/TextComposition.h" #include "mozilla/TextEditor.h" diff --git a/dom/file/uri/BlobURLChannel.cpp b/dom/file/uri/BlobURLChannel.cpp index 0d52ebd2e6dfa..a042dc168d4bb 100644 --- a/dom/file/uri/BlobURLChannel.cpp +++ b/dom/file/uri/BlobURLChannel.cpp @@ -8,7 +8,6 @@ #include "mozilla/dom/BlobImpl.h" #include "mozilla/dom/BlobURL.h" #include "mozilla/dom/BlobURLInputStream.h" -#include "mozilla/ScopeExit.h" using namespace mozilla::dom; @@ -72,4 +71,4 @@ nsresult BlobURLChannel::OpenContentStream(bool aAsync, inputStream.forget(aResult); return NS_OK; -} \ No newline at end of file +} diff --git a/dom/file/uri/BlobURLInputStream.cpp b/dom/file/uri/BlobURLInputStream.cpp index 87b06c5161a80..9ad8a92798ea3 100644 --- a/dom/file/uri/BlobURLInputStream.cpp +++ b/dom/file/uri/BlobURLInputStream.cpp @@ -9,6 +9,7 @@ #include "BlobURLChannel.h" #include "BlobURLProtocolHandler.h" +#include "mozilla/ScopeExit.h" #include "mozilla/dom/ContentChild.h" #include "mozilla/dom/IPCBlobUtils.h" #include "nsStreamUtils.h" diff --git a/dom/file/uri/BlobURLProtocolHandler.cpp b/dom/file/uri/BlobURLProtocolHandler.cpp index e1649a868c789..3d91495cb0b4f 100644 --- a/dom/file/uri/BlobURLProtocolHandler.cpp +++ b/dom/file/uri/BlobURLProtocolHandler.cpp @@ -23,6 +23,7 @@ #include "mozilla/OriginAttributes.h" #include "mozilla/Preferences.h" #include "mozilla/SchedulerGroup.h" +#include "mozilla/ScopeExit.h" #include "nsClassHashtable.h" #include "nsContentUtils.h" #include "nsError.h" diff --git a/dom/filesystem/FileSystemRequestParent.cpp b/dom/filesystem/FileSystemRequestParent.cpp index 0a38e8f56b6a8..d6db4644b34f5 100644 --- a/dom/filesystem/FileSystemRequestParent.cpp +++ b/dom/filesystem/FileSystemRequestParent.cpp @@ -18,6 +18,7 @@ #include "mozilla/ipc/BackgroundParent.h" #include "mozilla/dom/OSFileSystem.h" #include "mozilla/Preferences.h" +#include "mozilla/ScopeExit.h" #include "mozilla/Unused.h" #include "nsProxyRelease.h" diff --git a/dom/html/HTMLMediaElement.cpp b/dom/html/HTMLMediaElement.cpp index 70cc1e60a1c7f..77623053e6547 100644 --- a/dom/html/HTMLMediaElement.cpp +++ b/dom/html/HTMLMediaElement.cpp @@ -56,6 +56,7 @@ #include "mozilla/NotNull.h" #include "mozilla/Preferences.h" #include "mozilla/PresShell.h" +#include "mozilla/ScopeExit.h" #include "mozilla/Sprintf.h" #include "mozilla/StaticPrefs_media.h" #include "mozilla/SVGObserverUtils.h" diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp index 642622b403e34..ba467c391a717 100644 --- a/dom/ipc/ContentChild.cpp +++ b/dom/ipc/ContentChild.cpp @@ -38,6 +38,7 @@ #include "mozilla/RemoteDecoderManagerChild.h" #include "mozilla/RemoteLazyInputStreamChild.h" #include "mozilla/SchedulerGroup.h" +#include "mozilla/ScopeExit.h" #include "mozilla/SharedStyleSheetCache.h" #include "mozilla/SpinEventLoopUntil.h" #include "mozilla/StaticPrefs_dom.h" diff --git a/dom/ipc/WindowGlobalParent.cpp b/dom/ipc/WindowGlobalParent.cpp index 226661259b11b..6f7e5daf8e3f6 100644 --- a/dom/ipc/WindowGlobalParent.cpp +++ b/dom/ipc/WindowGlobalParent.cpp @@ -26,6 +26,7 @@ #include "mozilla/dom/ChromeUtils.h" #include "mozilla/dom/ipc/IdType.h" #include "mozilla/dom/ipc/StructuredCloneData.h" +#include "mozilla/ScopeExit.h" #include "mozilla/ServoCSSParser.h" #include "mozilla/ServoStyleSet.h" #include "mozilla/StaticPrefs_network.h" diff --git a/dom/ipc/jsactor/JSActorManager.cpp b/dom/ipc/jsactor/JSActorManager.cpp index 7e85d1cb0abec..fda2cf7efc010 100644 --- a/dom/ipc/jsactor/JSActorManager.cpp +++ b/dom/ipc/jsactor/JSActorManager.cpp @@ -8,6 +8,7 @@ #include "mozilla/dom/JSActorService.h" #include "mozilla/dom/PWindowGlobal.h" #include "mozilla/ipc/ProtocolUtils.h" +#include "mozilla/ScopeExit.h" #include "mozJSComponentLoader.h" #include "jsapi.h" #include "nsContentUtils.h" diff --git a/dom/media/FileBlockCache.cpp b/dom/media/FileBlockCache.cpp index 4d6ee02f3a059..44bb92133c65e 100644 --- a/dom/media/FileBlockCache.cpp +++ b/dom/media/FileBlockCache.cpp @@ -12,6 +12,7 @@ #include "nsAnonymousTemporaryFile.h" #include "nsIThreadManager.h" #include "mozilla/dom/ContentChild.h" +#include "mozilla/ScopeExit.h" #include "nsXULAppAPI.h" namespace mozilla { diff --git a/dom/media/gmp/ChromiumCDMParent.cpp b/dom/media/gmp/ChromiumCDMParent.cpp index 4399ce015c712..28e3a96578f31 100644 --- a/dom/media/gmp/ChromiumCDMParent.cpp +++ b/dom/media/gmp/ChromiumCDMParent.cpp @@ -16,6 +16,7 @@ #include "GMPUtils.h" #include "mozilla/dom/MediaKeyMessageEventBinding.h" #include "mozilla/gmp/GMPTypes.h" +#include "mozilla/ScopeExit.h" #include "mozilla/StaticPrefs_media.h" #include "mozilla/Unused.h" #include "AnnexB.h" diff --git a/dom/media/systemservices/video_engine/tab_capturer.cc b/dom/media/systemservices/video_engine/tab_capturer.cc index f42d0489e8e2c..37776771851fc 100644 --- a/dom/media/systemservices/video_engine/tab_capturer.cc +++ b/dom/media/systemservices/video_engine/tab_capturer.cc @@ -34,6 +34,7 @@ #include "mozilla/dom/PromiseNativeHandler.h" #include "mozilla/dom/WindowGlobalParent.h" #include "mozilla/gfx/2D.h" +#include "mozilla/ScopeExit.h" #include "mozilla/StaticPrefs_media.h" #include "MediaUtils.h" diff --git a/dom/media/webaudio/AudioWorkletNode.cpp b/dom/media/webaudio/AudioWorkletNode.cpp index 4480e33e757ca..5a99390e13da0 100644 --- a/dom/media/webaudio/AudioWorkletNode.cpp +++ b/dom/media/webaudio/AudioWorkletNode.cpp @@ -22,6 +22,7 @@ #include "AudioDestinationNode.h" #include "mozilla/dom/MessageChannel.h" #include "mozilla/dom/MessagePort.h" +#include "mozilla/ScopeExit.h" #include "nsReadableUtils.h" #include "mozilla/Span.h" #include "PlayingRefChangeHandler.h" diff --git a/dom/media/webspeech/recognition/OnlineSpeechRecognitionService.cpp b/dom/media/webspeech/recognition/OnlineSpeechRecognitionService.cpp index b2efc209949ae..940d8fddc264b 100644 --- a/dom/media/webspeech/recognition/OnlineSpeechRecognitionService.cpp +++ b/dom/media/webspeech/recognition/OnlineSpeechRecognitionService.cpp @@ -16,6 +16,7 @@ #include "nsIObserverService.h" #include "mozilla/dom/Document.h" #include "mozilla/Preferences.h" +#include "mozilla/ScopeExit.h" #include "mozilla/StaticPrefs_media.h" #include "mozilla/Services.h" #include "nsDirectoryServiceDefs.h" diff --git a/dom/script/ScriptLoadHandler.cpp b/dom/script/ScriptLoadHandler.cpp index 9ed51ede0b149..0828329d4bed5 100644 --- a/dom/script/ScriptLoadHandler.cpp +++ b/dom/script/ScriptLoadHandler.cpp @@ -17,6 +17,7 @@ #include "mozilla/dom/Document.h" #include "mozilla/dom/ScriptDecoding.h" // mozilla::dom::ScriptDecoding #include "mozilla/Telemetry.h" +#include "mozilla/ScopeExit.h" #include "mozilla/StaticPrefs_dom.h" namespace mozilla { diff --git a/dom/serviceworkers/ServiceWorkerContainerProxy.cpp b/dom/serviceworkers/ServiceWorkerContainerProxy.cpp index 289faecc73330..9574e062e378b 100644 --- a/dom/serviceworkers/ServiceWorkerContainerProxy.cpp +++ b/dom/serviceworkers/ServiceWorkerContainerProxy.cpp @@ -10,6 +10,7 @@ #include "mozilla/dom/ServiceWorkerManager.h" #include "mozilla/ipc/BackgroundParent.h" #include "mozilla/SchedulerGroup.h" +#include "mozilla/ScopeExit.h" namespace mozilla { namespace dom { diff --git a/dom/serviceworkers/ServiceWorkerManager.cpp b/dom/serviceworkers/ServiceWorkerManager.cpp index 86af3792d93ed..ab0c6aadc0889 100644 --- a/dom/serviceworkers/ServiceWorkerManager.cpp +++ b/dom/serviceworkers/ServiceWorkerManager.cpp @@ -58,6 +58,7 @@ #include "mozilla/ipc/PBackgroundSharedTypes.h" #include "mozilla/dom/ScriptLoader.h" #include "mozilla/PermissionManager.h" +#include "mozilla/ScopeExit.h" #include "mozilla/StaticPrefs_extensions.h" #include "mozilla/Unused.h" #include "mozilla/EnumSet.h" diff --git a/dom/serviceworkers/ServiceWorkerProxy.cpp b/dom/serviceworkers/ServiceWorkerProxy.cpp index 90944d04ba555..227f43a89d4dd 100644 --- a/dom/serviceworkers/ServiceWorkerProxy.cpp +++ b/dom/serviceworkers/ServiceWorkerProxy.cpp @@ -10,6 +10,7 @@ #include "ServiceWorkerParent.h" #include "mozilla/SchedulerGroup.h" +#include "mozilla/ScopeExit.h" #include "mozilla/dom/ClientState.h" #include "mozilla/ipc/BackgroundParent.h" #include "ServiceWorkerInfo.h" diff --git a/dom/serviceworkers/ServiceWorkerRegistration.cpp b/dom/serviceworkers/ServiceWorkerRegistration.cpp index 6d224a5a2ccee..59a7615b75be2 100644 --- a/dom/serviceworkers/ServiceWorkerRegistration.cpp +++ b/dom/serviceworkers/ServiceWorkerRegistration.cpp @@ -14,6 +14,7 @@ #include "mozilla/dom/ServiceWorkerRegistrationBinding.h" #include "mozilla/dom/ServiceWorkerUtils.h" #include "mozilla/dom/WorkerPrivate.h" +#include "mozilla/ScopeExit.h" #include "nsCycleCollectionParticipant.h" #include "nsPIDOMWindow.h" #include "RemoteServiceWorkerRegistrationImpl.h" diff --git a/dom/serviceworkers/ServiceWorkerRegistrationProxy.cpp b/dom/serviceworkers/ServiceWorkerRegistrationProxy.cpp index 8c34b3552f2ba..4a5ae61c1d87b 100644 --- a/dom/serviceworkers/ServiceWorkerRegistrationProxy.cpp +++ b/dom/serviceworkers/ServiceWorkerRegistrationProxy.cpp @@ -8,6 +8,7 @@ #include "mozilla/SchedulerGroup.h" #include "mozilla/ipc/BackgroundParent.h" +#include "mozilla/ScopeExit.h" #include "ServiceWorkerManager.h" #include "ServiceWorkerRegistrationParent.h" #include "ServiceWorkerUnregisterCallback.h" diff --git a/dom/serviceworkers/ServiceWorkerScriptCache.cpp b/dom/serviceworkers/ServiceWorkerScriptCache.cpp index ffb5c473030af..0acef07de45f5 100644 --- a/dom/serviceworkers/ServiceWorkerScriptCache.cpp +++ b/dom/serviceworkers/ServiceWorkerScriptCache.cpp @@ -18,6 +18,7 @@ #include "mozilla/ipc/BackgroundUtils.h" #include "mozilla/ipc/PBackgroundSharedTypes.h" #include "mozilla/net/CookieJarSettings.h" +#include "mozilla/ScopeExit.h" #include "mozilla/StaticPrefs_extensions.h" #include "nsICacheInfoChannel.h" #include "nsIHttpChannel.h" diff --git a/dom/workers/RuntimeService.cpp b/dom/workers/RuntimeService.cpp index 00fb122caf09d..206cbe139399e 100644 --- a/dom/workers/RuntimeService.cpp +++ b/dom/workers/RuntimeService.cpp @@ -48,6 +48,7 @@ #include "mozilla/ipc/BackgroundChild.h" #include "mozilla/DebugOnly.h" #include "mozilla/Preferences.h" +#include "mozilla/ScopeExit.h" #include "mozilla/dom/Navigator.h" #include "mozilla/Monitor.h" #include "nsContentUtils.h" diff --git a/dom/workers/remoteworkers/RemoteWorkerController.cpp b/dom/workers/remoteworkers/RemoteWorkerController.cpp index 22ba207decce4..f0fe1f140f9a7 100644 --- a/dom/workers/remoteworkers/RemoteWorkerController.cpp +++ b/dom/workers/remoteworkers/RemoteWorkerController.cpp @@ -15,7 +15,6 @@ #include "mozilla/Maybe.h" #include "mozilla/RemoteLazyInputStreamUtils.h" #include "mozilla/RemoteLazyInputStreamStorage.h" -#include "mozilla/ScopeExit.h" #include "mozilla/dom/FetchEventOpParent.h" #include "mozilla/dom/FetchEventOpProxyParent.h" #include "mozilla/dom/MessagePortParent.h" diff --git a/extensions/permissions/PermissionManager.cpp b/extensions/permissions/PermissionManager.cpp index 4a61121db8c4a..b3708c6b130a8 100644 --- a/extensions/permissions/PermissionManager.cpp +++ b/extensions/permissions/PermissionManager.cpp @@ -15,6 +15,7 @@ #include "mozilla/Permission.h" #include "mozilla/PermissionManager.h" #include "mozilla/Preferences.h" +#include "mozilla/ScopeExit.h" #include "mozilla/StaticPrefs_permissions.h" #include "mozilla/Telemetry.h" diff --git a/gfx/gl/GLContextProviderWGL.cpp b/gfx/gl/GLContextProviderWGL.cpp index 6aede51c5fdd9..b65042d6aba26 100644 --- a/gfx/gl/GLContextProviderWGL.cpp +++ b/gfx/gl/GLContextProviderWGL.cpp @@ -17,6 +17,7 @@ #include "mozilla/gfx/gfxVars.h" #include "mozilla/Preferences.h" +#include "mozilla/ScopeExit.h" #include "mozilla/StaticPtr.h" #include "mozilla/layers/CompositorOptions.h" #include "mozilla/webrender/RenderThread.h" diff --git a/gfx/layers/CompositorAnimationStorage.cpp b/gfx/layers/CompositorAnimationStorage.cpp index eac3a945d7fec..0a004cfa9efa4 100644 --- a/gfx/layers/CompositorAnimationStorage.cpp +++ b/gfx/layers/CompositorAnimationStorage.cpp @@ -14,6 +14,7 @@ #include "mozilla/layers/LayerManagerComposite.h" // for LayerComposite, etc #include "mozilla/layers/LayerMetricsWrapper.h" // for LayerMetricsWrapper #include "mozilla/layers/OMTAController.h" // for OMTAController +#include "mozilla/ScopeExit.h" #include "mozilla/ServoStyleConsts.h" #include "mozilla/webrender/WebRenderTypes.h" // for ToWrTransformProperty, etc #include "nsDeviceContext.h" // for AppUnitsPerCSSPixel diff --git a/ipc/glue/IdleSchedulerParent.cpp b/ipc/glue/IdleSchedulerParent.cpp index 6748164d69171..c27ba230f9563 100644 --- a/ipc/glue/IdleSchedulerParent.cpp +++ b/ipc/glue/IdleSchedulerParent.cpp @@ -4,7 +4,6 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "mozilla/ScopeExit.h" #include "mozilla/StaticPrefs_page_load.h" #include "mozilla/Unused.h" #include "mozilla/ipc/IdleSchedulerParent.h" diff --git a/js/src/frontend/Parser.cpp b/js/src/frontend/Parser.cpp index 2aa263b34f36f..87f0972975d91 100644 --- a/js/src/frontend/Parser.cpp +++ b/js/src/frontend/Parser.cpp @@ -23,7 +23,6 @@ #include "mozilla/Casting.h" #include "mozilla/DebugOnly.h" #include "mozilla/Range.h" -#include "mozilla/ScopeExit.h" #include "mozilla/Sprintf.h" #include "mozilla/Unused.h" #include "mozilla/Utf8.h" diff --git a/js/src/jit/BaselineIC.cpp b/js/src/jit/BaselineIC.cpp index fa1b5bba8be38..f9875563aa4ba 100644 --- a/js/src/jit/BaselineIC.cpp +++ b/js/src/jit/BaselineIC.cpp @@ -9,7 +9,6 @@ #include "mozilla/Casting.h" #include "mozilla/DebugOnly.h" #include "mozilla/IntegerPrintfMacros.h" -#include "mozilla/ScopeExit.h" #include "mozilla/Sprintf.h" #include "mozilla/TemplateLib.h" #include "mozilla/Unused.h" diff --git a/js/src/proxy/CrossCompartmentWrapper.cpp b/js/src/proxy/CrossCompartmentWrapper.cpp index 04cd1d8396344..0671eebf7fde8 100644 --- a/js/src/proxy/CrossCompartmentWrapper.cpp +++ b/js/src/proxy/CrossCompartmentWrapper.cpp @@ -4,8 +4,6 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "mozilla/ScopeExit.h" - #include "gc/PublicIterators.h" #include "js/friend/WindowProxy.h" // js::IsWindow, js::IsWindowProxy #include "js/Wrapper.h" diff --git a/js/src/vm/StringType.cpp b/js/src/vm/StringType.cpp index 32f6a05dcf6c4..a30230085fe9c 100644 --- a/js/src/vm/StringType.cpp +++ b/js/src/vm/StringType.cpp @@ -15,7 +15,6 @@ #include "mozilla/MemoryReporting.h" #include "mozilla/PodOperations.h" #include "mozilla/RangedPtr.h" -#include "mozilla/ScopeExit.h" #include "mozilla/TextUtils.h" #include "mozilla/Unused.h" #include "mozilla/Utf8.h" diff --git a/js/src/vm/TraceLogging.cpp b/js/src/vm/TraceLogging.cpp index b8535b6c55aed..a2a09a081bd76 100644 --- a/js/src/vm/TraceLogging.cpp +++ b/js/src/vm/TraceLogging.cpp @@ -8,7 +8,6 @@ #include "mozilla/EndianUtils.h" #include "mozilla/MemoryReporting.h" -#include "mozilla/ScopeExit.h" #include #include diff --git a/js/src/wasm/WasmSignalHandlers.cpp b/js/src/wasm/WasmSignalHandlers.cpp index a74ce62e258ca..46767e7a6ba27 100644 --- a/js/src/wasm/WasmSignalHandlers.cpp +++ b/js/src/wasm/WasmSignalHandlers.cpp @@ -19,7 +19,6 @@ #include "wasm/WasmSignalHandlers.h" #include "mozilla/DebugOnly.h" -#include "mozilla/ScopeExit.h" #include "mozilla/ThreadLocal.h" #include "threading/Thread.h" diff --git a/layout/base/PresShell.cpp b/layout/base/PresShell.cpp index 3417830d2068a..81094c10007f2 100644 --- a/layout/base/PresShell.cpp +++ b/layout/base/PresShell.cpp @@ -28,6 +28,7 @@ #include "mozilla/PerfStats.h" #include "mozilla/PresShellInlines.h" #include "mozilla/RangeUtils.h" +#include "mozilla/ScopeExit.h" #include "mozilla/Sprintf.h" #include "mozilla/StaticPrefs_apz.h" #include "mozilla/StaticPrefs_dom.h" diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp index cb6b0e6afc1cf..1700b717cb5e0 100644 --- a/layout/base/nsCSSFrameConstructor.cpp +++ b/layout/base/nsCSSFrameConstructor.cpp @@ -30,6 +30,7 @@ #include "mozilla/PresShell.h" #include "mozilla/PresShellInlines.h" #include "mozilla/PrintedSheetFrame.h" +#include "mozilla/ScopeExit.h" #include "mozilla/ServoBindings.h" #include "mozilla/ServoStyleSetInlines.h" #include "mozilla/StaticPrefs_layout.h" diff --git a/layout/base/nsRefreshDriver.cpp b/layout/base/nsRefreshDriver.cpp index bfce7ec5ca828..fb48f013ae81d 100644 --- a/layout/base/nsRefreshDriver.cpp +++ b/layout/base/nsRefreshDriver.cpp @@ -73,6 +73,7 @@ #include "nsDocShell.h" #include "nsISimpleEnumerator.h" #include "nsJSEnvironment.h" +#include "mozilla/ScopeExit.h" #include "mozilla/Telemetry.h" #include "BackgroundChild.h" @@ -428,9 +429,9 @@ class SimpleTimerBasedRefreshDriverTimer : public RefreshDriverTimer { class VsyncRefreshDriverTimer : public RefreshDriverTimer { public: VsyncRefreshDriverTimer() - : mVsyncDispatcher(nullptr), - mVsyncChild(nullptr), - mVsyncRate(TimeDuration::Forever()) { + : mVsyncDispatcher(nullptr), + mVsyncChild(nullptr), + mVsyncRate(TimeDuration::Forever()) { MOZ_ASSERT(XRE_IsParentProcess()); MOZ_ASSERT(NS_IsMainThread()); mVsyncSource = gfxPlatform::GetPlatform()->GetHardwareVsync(); diff --git a/layout/generic/nsGfxScrollFrame.cpp b/layout/generic/nsGfxScrollFrame.cpp index 9bba776c1bf68..781edebad8b1d 100644 --- a/layout/generic/nsGfxScrollFrame.cpp +++ b/layout/generic/nsGfxScrollFrame.cpp @@ -45,6 +45,7 @@ #include "mozilla/EventDispatcher.h" #include "mozilla/Preferences.h" #include "mozilla/PresShell.h" +#include "mozilla/ScopeExit.h" #include "mozilla/ScrollbarPreferences.h" #include "mozilla/SVGOuterSVGFrame.h" #include "mozilla/ViewportUtils.h" diff --git a/layout/style/StreamLoader.cpp b/layout/style/StreamLoader.cpp index 4083ab44e27a8..dec4dc55303a3 100644 --- a/layout/style/StreamLoader.cpp +++ b/layout/style/StreamLoader.cpp @@ -7,7 +7,6 @@ #include "mozilla/css/StreamLoader.h" #include "mozilla/Encoding.h" -#include "mozilla/ScopeExit.h" #include "nsContentUtils.h" #include "nsIChannel.h" #include "nsIInputStream.h" diff --git a/layout/style/nsComputedDOMStyle.cpp b/layout/style/nsComputedDOMStyle.cpp index 9df6c6670c081..b9ace99a8364f 100644 --- a/layout/style/nsComputedDOMStyle.cpp +++ b/layout/style/nsComputedDOMStyle.cpp @@ -14,6 +14,7 @@ #include "mozilla/Preferences.h" #include "mozilla/PresShell.h" #include "mozilla/PresShellInlines.h" +#include "mozilla/ScopeExit.h" #include "mozilla/StaticPtr.h" #include "mozilla/StaticPrefs_layout.h" diff --git a/media/ffvpx/mozva/mozva.cpp b/media/ffvpx/mozva/mozva.cpp index e8674752c9d72..ada8544edbbfb 100644 --- a/media/ffvpx/mozva/mozva.cpp +++ b/media/ffvpx/mozva/mozva.cpp @@ -10,103 +10,83 @@ #pragma GCC visibility pop #include "mozilla/Types.h" -#include "mozilla/ScopeExit.h" #include #include #include -#define GET_FUNC(func, lib) \ - func##Fn = \ - (decltype(func##Fn))dlsym(lib, #func) \ +#define GET_FUNC(func, lib) func##Fn = (decltype(func##Fn))dlsym(lib, #func) -#define IS_FUNC_LOADED(func) \ - (func##Fn != nullptr) \ +#define IS_FUNC_LOADED(func) (func##Fn != nullptr) static VAStatus (*vaDestroyBufferFn)(VADisplay dpy, VABufferID buffer_id); static VAStatus (*vaBeginPictureFn)(VADisplay dpy, VAContextID context, VASurfaceID render_target); static VAStatus (*vaEndPictureFn)(VADisplay dpy, VAContextID context); static VAStatus (*vaRenderPictureFn)(VADisplay dpy, VAContextID context, - VABufferID *buffers, int num_buffers); + VABufferID* buffers, int num_buffers); static int (*vaMaxNumProfilesFn)(VADisplay dpy); static VAStatus (*vaCreateContextFn)(VADisplay dpy, VAConfigID config_id, int picture_width, int picture_height, - int flag, VASurfaceID *render_targets, + int flag, VASurfaceID* render_targets, int num_render_targets, - VAContextID *context /* out */); -static VAStatus (*vaDestroyContextFn)( VADisplay dpy, VAContextID context); + VAContextID* context /* out */); +static VAStatus (*vaDestroyContextFn)(VADisplay dpy, VAContextID context); static VAStatus (*vaCreateBufferFn)(VADisplay dpy, VAContextID context, - VABufferType type, /* in */ - unsigned int size, /* in */ + VABufferType type, /* in */ + unsigned int size, /* in */ unsigned int num_elements, /* in */ - void *data, /* in */ - VABufferID *buf_id /* out */); -static VAStatus (*vaQuerySurfaceAttributesFn)(VADisplay dpy, - VAConfigID config, - VASurfaceAttrib *attrib_list, - unsigned int *num_attribs); + void* data, /* in */ + VABufferID* buf_id /* out */); +static VAStatus (*vaQuerySurfaceAttributesFn)(VADisplay dpy, VAConfigID config, + VASurfaceAttrib* attrib_list, + unsigned int* num_attribs); static VAStatus (*vaQueryConfigProfilesFn)(VADisplay dpy, - VAProfile *profile_list, /* out */ - int *num_profiles /* out */); + VAProfile* profile_list, /* out */ + int* num_profiles /* out */); static const char* (*vaErrorStrFn)(VAStatus error_status); static VAStatus (*vaCreateConfigFn)(VADisplay dpy, VAProfile profile, VAEntrypoint entrypoint, - VAConfigAttrib *attrib_list, + VAConfigAttrib* attrib_list, int num_attribs, - VAConfigID *config_id /* out */); + VAConfigID* config_id /* out */); static VAStatus (*vaDestroyConfigFn)(VADisplay dpy, VAConfigID config_id); static int (*vaMaxNumImageFormatsFn)(VADisplay dpy); static VAStatus (*vaQueryImageFormatsFn)(VADisplay dpy, - VAImageFormat *format_list, /* out */ - int *num_formats /* out */); -static const char * (*vaQueryVendorStringFn)(VADisplay dpy); -static VAStatus (*vaDestroySurfacesFn)(VADisplay dpy, VASurfaceID *surfaces, + VAImageFormat* format_list, /* out */ + int* num_formats /* out */); +static const char* (*vaQueryVendorStringFn)(VADisplay dpy); +static VAStatus (*vaDestroySurfacesFn)(VADisplay dpy, VASurfaceID* surfaces, int num_surfaces); -static VAStatus (*vaCreateSurfacesFn)(VADisplay dpy, - unsigned int format, - unsigned int width, - unsigned int height, - VASurfaceID *surfaces, - unsigned int num_surfaces, - VASurfaceAttrib *attrib_list, - unsigned int num_attribs); +static VAStatus (*vaCreateSurfacesFn)(VADisplay dpy, unsigned int format, + unsigned int width, unsigned int height, + VASurfaceID* surfaces, + unsigned int num_surfaces, + VASurfaceAttrib* attrib_list, + unsigned int num_attribs); static VAStatus (*vaDeriveImageFn)(VADisplay dpy, VASurfaceID surface, - VAImage *image /* out */); + VAImage* image /* out */); static VAStatus (*vaDestroyImageFn)(VADisplay dpy, VAImageID image); -static VAStatus (*vaPutImageFn)(VADisplay dpy, - VASurfaceID surface, - VAImageID image, - int src_x, - int src_y, - unsigned int src_width, - unsigned int src_height, - int dest_x, - int dest_y, - unsigned int dest_width, +static VAStatus (*vaPutImageFn)(VADisplay dpy, VASurfaceID surface, + VAImageID image, int src_x, int src_y, + unsigned int src_width, unsigned int src_height, + int dest_x, int dest_y, unsigned int dest_width, unsigned int dest_height); static VAStatus (*vaSyncSurfaceFn)(VADisplay dpy, VASurfaceID render_target); -static VAStatus (*vaCreateImageFn)(VADisplay dpy, - VAImageFormat *format, - int width, - int height, - VAImage *image /* out */); -static VAStatus (*vaGetImageFn)(VADisplay dpy, - VASurfaceID surface, - int x, /* coordinates of the upper left source pixel */ - int y, - unsigned int width, /* width and height of the region */ - unsigned int height, - VAImageID image); -static VAStatus (*vaMapBufferFn)(VADisplay dpy, - VABufferID buf_id, /* in */ - void **pbuf /* out */); -static VAStatus (*vaUnmapBufferFn)(VADisplay dpy, - VABufferID buf_id /* in */); +static VAStatus (*vaCreateImageFn)(VADisplay dpy, VAImageFormat* format, + int width, int height, + VAImage* image /* out */); +static VAStatus (*vaGetImageFn)( + VADisplay dpy, VASurfaceID surface, + int x, /* coordinates of the upper left source pixel */ + int y, unsigned int width, /* width and height of the region */ + unsigned int height, VAImageID image); +static VAStatus (*vaMapBufferFn)(VADisplay dpy, VABufferID buf_id, /* in */ + void** pbuf /* out */); +static VAStatus (*vaUnmapBufferFn)(VADisplay dpy, VABufferID buf_id /* in */); static VAStatus (*vaTerminateFn)(VADisplay dpy); -static VAStatus (*vaInitializeFn)(VADisplay dpy, - int *major_version, /* out */ - int *minor_version /* out */); -static VAStatus (*vaSetDriverNameFn)(VADisplay dpy, char *driver_name); +static VAStatus (*vaInitializeFn)(VADisplay dpy, int* major_version, /* out */ + int* minor_version /* out */); +static VAStatus (*vaSetDriverNameFn)(VADisplay dpy, char* driver_name); bool LoadVALibrary() { static bool vaLibraryLoaded = []() { @@ -144,43 +124,31 @@ bool LoadVALibrary() { GET_FUNC(vaInitialize, sVALib); GET_FUNC(vaSetDriverName, sVALib); - return (IS_FUNC_LOADED(vaDestroyBuffer) && - IS_FUNC_LOADED(vaBeginPicture) && - IS_FUNC_LOADED(vaEndPicture) && - IS_FUNC_LOADED(vaRenderPicture) && - IS_FUNC_LOADED(vaMaxNumProfiles) && - IS_FUNC_LOADED(vaCreateContext) && - IS_FUNC_LOADED(vaDestroyContext) && - IS_FUNC_LOADED(vaCreateBuffer) && - IS_FUNC_LOADED(vaQuerySurfaceAttributes) && - IS_FUNC_LOADED(vaQueryConfigProfiles) && - IS_FUNC_LOADED(vaErrorStr) && - IS_FUNC_LOADED(vaCreateConfig) && - IS_FUNC_LOADED(vaDestroyConfig) && - IS_FUNC_LOADED(vaMaxNumImageFormats) && - IS_FUNC_LOADED(vaQueryImageFormats) && - IS_FUNC_LOADED(vaQueryVendorString) && - IS_FUNC_LOADED(vaDestroySurfaces) && - IS_FUNC_LOADED(vaCreateSurfaces) && - IS_FUNC_LOADED(vaDeriveImage) && - IS_FUNC_LOADED(vaDestroyImage) && - IS_FUNC_LOADED(vaPutImage) && - IS_FUNC_LOADED(vaSyncSurface) && - IS_FUNC_LOADED(vaCreateImage) && - IS_FUNC_LOADED(vaGetImage) && - IS_FUNC_LOADED(vaMapBuffer) && - IS_FUNC_LOADED(vaUnmapBuffer) && - IS_FUNC_LOADED(vaTerminate) && - IS_FUNC_LOADED(vaInitialize) && - IS_FUNC_LOADED(vaSetDriverName)); + return ( + IS_FUNC_LOADED(vaDestroyBuffer) && IS_FUNC_LOADED(vaBeginPicture) && + IS_FUNC_LOADED(vaEndPicture) && IS_FUNC_LOADED(vaRenderPicture) && + IS_FUNC_LOADED(vaMaxNumProfiles) && IS_FUNC_LOADED(vaCreateContext) && + IS_FUNC_LOADED(vaDestroyContext) && IS_FUNC_LOADED(vaCreateBuffer) && + IS_FUNC_LOADED(vaQuerySurfaceAttributes) && + IS_FUNC_LOADED(vaQueryConfigProfiles) && IS_FUNC_LOADED(vaErrorStr) && + IS_FUNC_LOADED(vaCreateConfig) && IS_FUNC_LOADED(vaDestroyConfig) && + IS_FUNC_LOADED(vaMaxNumImageFormats) && + IS_FUNC_LOADED(vaQueryImageFormats) && + IS_FUNC_LOADED(vaQueryVendorString) && + IS_FUNC_LOADED(vaDestroySurfaces) && IS_FUNC_LOADED(vaCreateSurfaces) && + IS_FUNC_LOADED(vaDeriveImage) && IS_FUNC_LOADED(vaDestroyImage) && + IS_FUNC_LOADED(vaPutImage) && IS_FUNC_LOADED(vaSyncSurface) && + IS_FUNC_LOADED(vaCreateImage) && IS_FUNC_LOADED(vaGetImage) && + IS_FUNC_LOADED(vaMapBuffer) && IS_FUNC_LOADED(vaUnmapBuffer) && + IS_FUNC_LOADED(vaTerminate) && IS_FUNC_LOADED(vaInitialize) && + IS_FUNC_LOADED(vaSetDriverName)); }(); return vaLibraryLoaded; } #pragma GCC visibility push(default) -VAStatus vaDestroyBuffer(VADisplay dpy, VABufferID buffer_id) -{ +VAStatus vaDestroyBuffer(VADisplay dpy, VABufferID buffer_id) { if (LoadVALibrary()) { return vaDestroyBufferFn(dpy, buffer_id); } @@ -188,16 +156,14 @@ VAStatus vaDestroyBuffer(VADisplay dpy, VABufferID buffer_id) } VAStatus vaBeginPicture(VADisplay dpy, VAContextID context, - VASurfaceID render_target) -{ + VASurfaceID render_target) { if (LoadVALibrary()) { return vaBeginPictureFn(dpy, context, render_target); } return VA_STATUS_ERROR_UNIMPLEMENTED; } -VAStatus vaEndPicture(VADisplay dpy, VAContextID context) -{ +VAStatus vaEndPicture(VADisplay dpy, VAContextID context) { if (LoadVALibrary()) { return vaEndPictureFn(dpy, context); } @@ -205,39 +171,33 @@ VAStatus vaEndPicture(VADisplay dpy, VAContextID context) } VAStatus vaRenderPicture(VADisplay dpy, VAContextID context, - VABufferID *buffers, int num_buffers) -{ + VABufferID* buffers, int num_buffers) { if (LoadVALibrary()) { return vaRenderPictureFn(dpy, context, buffers, num_buffers); } return VA_STATUS_ERROR_UNIMPLEMENTED; } -int vaMaxNumProfiles(VADisplay dpy) -{ +int vaMaxNumProfiles(VADisplay dpy) { if (LoadVALibrary()) { return vaMaxNumProfilesFn(dpy); } return 0; } -VAStatus vaCreateContext(VADisplay dpy, VAConfigID config_id, - int picture_width, int picture_height, - int flag, VASurfaceID *render_targets, - int num_render_targets, - VAContextID *context /* out */) -{ +VAStatus vaCreateContext(VADisplay dpy, VAConfigID config_id, int picture_width, + int picture_height, int flag, + VASurfaceID* render_targets, int num_render_targets, + VAContextID* context /* out */) { if (LoadVALibrary()) { return vaCreateContextFn(dpy, config_id, picture_width, picture_height, - flag, render_targets, num_render_targets, - context); + flag, render_targets, num_render_targets, context); } *context = 0; return VA_STATUS_ERROR_UNIMPLEMENTED; } -VAStatus vaDestroyContext( VADisplay dpy, VAContextID context) -{ +VAStatus vaDestroyContext(VADisplay dpy, VAContextID context) { if (LoadVALibrary()) { return vaDestroyContextFn(dpy, context); } @@ -245,44 +205,38 @@ VAStatus vaDestroyContext( VADisplay dpy, VAContextID context) } VAStatus vaCreateBuffer(VADisplay dpy, VAContextID context, - VABufferType type, /* in */ - unsigned int size, /* in */ + VABufferType type, /* in */ + unsigned int size, /* in */ unsigned int num_elements, /* in */ - void *data, /* in */ - VABufferID *buf_id /* out */) -{ + void* data, /* in */ + VABufferID* buf_id /* out */) { if (LoadVALibrary()) { - return vaCreateBufferFn(dpy, context, type, size, num_elements, - data, buf_id); + return vaCreateBufferFn(dpy, context, type, size, num_elements, data, + buf_id); } *buf_id = 0; return VA_STATUS_ERROR_UNIMPLEMENTED; } -VAStatus vaQuerySurfaceAttributes(VADisplay dpy, - VAConfigID config, - VASurfaceAttrib *attrib_list, - unsigned int *num_attribs) -{ +VAStatus vaQuerySurfaceAttributes(VADisplay dpy, VAConfigID config, + VASurfaceAttrib* attrib_list, + unsigned int* num_attribs) { if (LoadVALibrary()) { return vaQuerySurfaceAttributesFn(dpy, config, attrib_list, num_attribs); } return VA_STATUS_ERROR_UNIMPLEMENTED; } -VAStatus vaQueryConfigProfiles(VADisplay dpy, - VAProfile *profile_list, /* out */ - int *num_profiles /* out */) -{ +VAStatus vaQueryConfigProfiles(VADisplay dpy, VAProfile* profile_list, /* out */ + int* num_profiles /* out */) { if (LoadVALibrary()) { - return vaQueryConfigProfilesFn(dpy, profile_list, num_profiles); + return vaQueryConfigProfilesFn(dpy, profile_list, num_profiles); } *num_profiles = 0; return VA_STATUS_ERROR_UNIMPLEMENTED; } -const char *vaErrorStr(VAStatus error_status) -{ +const char* vaErrorStr(VAStatus error_status) { if (LoadVALibrary()) { return vaErrorStrFn(error_status); } @@ -291,11 +245,8 @@ const char *vaErrorStr(VAStatus error_status) } VAStatus vaCreateConfig(VADisplay dpy, VAProfile profile, - VAEntrypoint entrypoint, - VAConfigAttrib *attrib_list, - int num_attribs, - VAConfigID *config_id /* out */) -{ + VAEntrypoint entrypoint, VAConfigAttrib* attrib_list, + int num_attribs, VAConfigID* config_id /* out */) { if (LoadVALibrary()) { return vaCreateConfigFn(dpy, profile, entrypoint, attrib_list, num_attribs, config_id); @@ -304,170 +255,138 @@ VAStatus vaCreateConfig(VADisplay dpy, VAProfile profile, return VA_STATUS_ERROR_UNIMPLEMENTED; } -VAStatus vaDestroyConfig(VADisplay dpy, VAConfigID config_id) -{ +VAStatus vaDestroyConfig(VADisplay dpy, VAConfigID config_id) { if (LoadVALibrary()) { return vaDestroyConfigFn(dpy, config_id); } return VA_STATUS_ERROR_UNIMPLEMENTED; } -int vaMaxNumImageFormats(VADisplay dpy) -{ +int vaMaxNumImageFormats(VADisplay dpy) { if (LoadVALibrary()) { return vaMaxNumImageFormatsFn(dpy); } return 0; } -VAStatus vaQueryImageFormats(VADisplay dpy, - VAImageFormat *format_list, - int *num_formats) -{ +VAStatus vaQueryImageFormats(VADisplay dpy, VAImageFormat* format_list, + int* num_formats) { if (LoadVALibrary()) { return vaQueryImageFormatsFn(dpy, format_list, num_formats); } return VA_STATUS_ERROR_UNIMPLEMENTED; } -const char * vaQueryVendorString(VADisplay dpy) -{ +const char* vaQueryVendorString(VADisplay dpy) { if (LoadVALibrary()) { return vaQueryVendorStringFn(dpy); } return nullptr; } -VAStatus vaDestroySurfaces(VADisplay dpy, VASurfaceID *surfaces, - int num_surfaces) -{ +VAStatus vaDestroySurfaces(VADisplay dpy, VASurfaceID* surfaces, + int num_surfaces) { if (LoadVALibrary()) { return vaDestroySurfacesFn(dpy, surfaces, num_surfaces); } return VA_STATUS_ERROR_UNIMPLEMENTED; } -VAStatus vaCreateSurfaces(VADisplay dpy, - unsigned int format, - unsigned int width, - unsigned int height, - VASurfaceID *surfaces, - unsigned int num_surfaces, - VASurfaceAttrib *attrib_list, - unsigned int num_attribs) -{ +VAStatus vaCreateSurfaces(VADisplay dpy, unsigned int format, + unsigned int width, unsigned int height, + VASurfaceID* surfaces, unsigned int num_surfaces, + VASurfaceAttrib* attrib_list, + unsigned int num_attribs) { if (LoadVALibrary()) { - return vaCreateSurfacesFn(dpy, format, width, height, - surfaces, num_surfaces, attrib_list, num_attribs); + return vaCreateSurfacesFn(dpy, format, width, height, surfaces, + num_surfaces, attrib_list, num_attribs); } return VA_STATUS_ERROR_UNIMPLEMENTED; } VAStatus vaDeriveImage(VADisplay dpy, VASurfaceID surface, - VAImage *image /* out */) -{ + VAImage* image /* out */) { if (LoadVALibrary()) { return vaDeriveImageFn(dpy, surface, image); } return VA_STATUS_ERROR_UNIMPLEMENTED; } -VAStatus vaDestroyImage(VADisplay dpy, VAImageID image) -{ +VAStatus vaDestroyImage(VADisplay dpy, VAImageID image) { if (LoadVALibrary()) { return vaDestroyImageFn(dpy, image); } return VA_STATUS_ERROR_UNIMPLEMENTED; } -VAStatus vaPutImage(VADisplay dpy, - VASurfaceID surface, - VAImageID image, - int src_x, - int src_y, - unsigned int src_width, - unsigned int src_height, - int dest_x, - int dest_y, - unsigned int dest_width, - unsigned int dest_height) -{ +VAStatus vaPutImage(VADisplay dpy, VASurfaceID surface, VAImageID image, + int src_x, int src_y, unsigned int src_width, + unsigned int src_height, int dest_x, int dest_y, + unsigned int dest_width, unsigned int dest_height) { if (LoadVALibrary()) { - return vaPutImageFn(dpy, surface, image, src_x, src_y, src_width, src_height, - dest_x, dest_y, dest_width, dest_height); + return vaPutImageFn(dpy, surface, image, src_x, src_y, src_width, + src_height, dest_x, dest_y, dest_width, dest_height); } return VA_STATUS_ERROR_UNIMPLEMENTED; } -VAStatus vaSyncSurface(VADisplay dpy, VASurfaceID render_target) -{ +VAStatus vaSyncSurface(VADisplay dpy, VASurfaceID render_target) { if (LoadVALibrary()) { return vaSyncSurfaceFn(dpy, render_target); } return VA_STATUS_ERROR_UNIMPLEMENTED; } -VAStatus vaCreateImage(VADisplay dpy, VAImageFormat *format, - int width, int height, VAImage *image /* out */) -{ +VAStatus vaCreateImage(VADisplay dpy, VAImageFormat* format, int width, + int height, VAImage* image /* out */) { if (LoadVALibrary()) { return vaCreateImageFn(dpy, format, width, height, image); } return VA_STATUS_ERROR_UNIMPLEMENTED; } -VAStatus vaGetImage(VADisplay dpy, - VASurfaceID surface, - int x, /* coordinates of the upper left source pixel */ +VAStatus vaGetImage(VADisplay dpy, VASurfaceID surface, + int x, /* coordinates of the upper left source pixel */ int y, unsigned int width, /* width and height of the region */ - unsigned int height, - VAImageID image) -{ + unsigned int height, VAImageID image) { if (LoadVALibrary()) { return vaGetImageFn(dpy, surface, x, y, width, height, image); } return VA_STATUS_ERROR_UNIMPLEMENTED; } -VAStatus vaMapBuffer(VADisplay dpy, - VABufferID buf_id, /* in */ - void **pbuf /* out */) -{ +VAStatus vaMapBuffer(VADisplay dpy, VABufferID buf_id, /* in */ + void** pbuf /* out */) { if (LoadVALibrary()) { - return vaMapBufferFn(dpy, buf_id, pbuf); + return vaMapBufferFn(dpy, buf_id, pbuf); } return VA_STATUS_ERROR_UNIMPLEMENTED; } -VAStatus vaUnmapBuffer(VADisplay dpy, VABufferID buf_id /* in */) -{ +VAStatus vaUnmapBuffer(VADisplay dpy, VABufferID buf_id /* in */) { if (LoadVALibrary()) { return vaUnmapBufferFn(dpy, buf_id); } return VA_STATUS_ERROR_UNIMPLEMENTED; } -VAStatus vaTerminate(VADisplay dpy) -{ +VAStatus vaTerminate(VADisplay dpy) { if (LoadVALibrary()) { return vaTerminateFn(dpy); } return VA_STATUS_ERROR_UNIMPLEMENTED; } -VAStatus vaInitialize(VADisplay dpy, - int *major_version, /* out */ - int *minor_version /* out */) -{ +VAStatus vaInitialize(VADisplay dpy, int* major_version, /* out */ + int* minor_version /* out */) { if (LoadVALibrary()) { - return vaInitializeFn(dpy, major_version, minor_version); + return vaInitializeFn(dpy, major_version, minor_version); } return VA_STATUS_ERROR_UNIMPLEMENTED; } -VAStatus vaSetDriverName(VADisplay dpy, char *driver_name) -{ +VAStatus vaSetDriverName(VADisplay dpy, char* driver_name) { if (LoadVALibrary()) { return vaSetDriverNameFn(dpy, driver_name); } diff --git a/mozglue/baseprofiler/core/ProfileBufferEntry.cpp b/mozglue/baseprofiler/core/ProfileBufferEntry.cpp index 48b4883d4c25b..3d3f68b655607 100644 --- a/mozglue/baseprofiler/core/ProfileBufferEntry.cpp +++ b/mozglue/baseprofiler/core/ProfileBufferEntry.cpp @@ -10,6 +10,7 @@ #include #include "mozilla/Logging.h" +#include "mozilla/ScopeExit.h" #include "mozilla/Sprintf.h" #include "mozilla/StackWalk.h" diff --git a/mozglue/baseprofiler/public/ProfileChunkedBuffer.h b/mozglue/baseprofiler/public/ProfileChunkedBuffer.h index f66dea1848742..b2c86494bf15d 100644 --- a/mozglue/baseprofiler/public/ProfileChunkedBuffer.h +++ b/mozglue/baseprofiler/public/ProfileChunkedBuffer.h @@ -14,6 +14,7 @@ #include "mozilla/ProfileBufferEntrySerialization.h" #include "mozilla/RefCounted.h" #include "mozilla/RefPtr.h" +#include "mozilla/ScopeExit.h" #include "mozilla/Unused.h" #include diff --git a/mozglue/dllservices/WindowsDllBlocklist.cpp b/mozglue/dllservices/WindowsDllBlocklist.cpp index d1c3a265428e6..bacd6ad7999bd 100644 --- a/mozglue/dllservices/WindowsDllBlocklist.cpp +++ b/mozglue/dllservices/WindowsDllBlocklist.cpp @@ -16,7 +16,6 @@ #include "nsWindowsDllInterceptor.h" #include "mozilla/CmdLineAndEnvUtils.h" #include "mozilla/DebugOnly.h" -#include "mozilla/ScopeExit.h" #include "mozilla/StackWalk_windows.h" #include "mozilla/TimeStamp.h" #include "mozilla/UniquePtr.h" diff --git a/netwerk/base/nsNetworkInfoService.cpp b/netwerk/base/nsNetworkInfoService.cpp index 69610b9ef1c75..4d3da66a8e4ce 100644 --- a/netwerk/base/nsNetworkInfoService.cpp +++ b/netwerk/base/nsNetworkInfoService.cpp @@ -11,7 +11,6 @@ #endif #include "nsNetworkInfoService.h" -#include "mozilla/ScopeExit.h" #if defined(XP_MACOSX) || defined(XP_WIN) || defined(XP_LINUX) # include "NetworkInfoServiceImpl.h" diff --git a/netwerk/base/nsStandardURL.cpp b/netwerk/base/nsStandardURL.cpp index 3eea15138accd..181e3c3d53ed0 100644 --- a/netwerk/base/nsStandardURL.cpp +++ b/netwerk/base/nsStandardURL.cpp @@ -19,6 +19,7 @@ #include "nsNetCID.h" #include "mozilla/MemoryReporting.h" #include "mozilla/ipc/URIUtils.h" +#include "mozilla/ScopeExit.h" #include "mozilla/StaticPrefs_network.h" #include "mozilla/TextUtils.h" #include diff --git a/netwerk/cookie/CookiePersistentStorage.cpp b/netwerk/cookie/CookiePersistentStorage.cpp index ecb491fad187a..acd898837a45a 100644 --- a/netwerk/cookie/CookiePersistentStorage.cpp +++ b/netwerk/cookie/CookiePersistentStorage.cpp @@ -9,6 +9,7 @@ #include "CookiePersistentStorage.h" #include "mozilla/FileUtils.h" +#include "mozilla/ScopeExit.h" #include "mozilla/Telemetry.h" #include "mozIStorageAsyncStatement.h" #include "mozIStorageError.h" diff --git a/netwerk/ipc/DocumentChannelChild.cpp b/netwerk/ipc/DocumentChannelChild.cpp index 284ff90c3e016..78478a6813c06 100644 --- a/netwerk/ipc/DocumentChannelChild.cpp +++ b/netwerk/ipc/DocumentChannelChild.cpp @@ -10,6 +10,7 @@ #include "mozilla/extensions/StreamFilterParent.h" #include "mozilla/net/HttpBaseChannel.h" #include "mozilla/net/NeckoChild.h" +#include "mozilla/ScopeExit.h" #include "nsHashPropertyBag.h" #include "nsIHttpChannelInternal.h" #include "nsIObjectLoadingContent.h" diff --git a/netwerk/ipc/DocumentLoadListener.cpp b/netwerk/ipc/DocumentLoadListener.cpp index afc6b6a968441..f0ac15b335f5f 100644 --- a/netwerk/ipc/DocumentLoadListener.cpp +++ b/netwerk/ipc/DocumentLoadListener.cpp @@ -11,6 +11,7 @@ #include "mozilla/DebugOnly.h" #include "mozilla/LoadInfo.h" #include "mozilla/MozPromiseInlines.h" // For MozPromise::FromDomPromise +#include "mozilla/ScopeExit.h" #include "mozilla/StaticPrefs_extensions.h" #include "mozilla/StaticPrefs_fission.h" #include "mozilla/StaticPrefs_security.h" diff --git a/netwerk/protocol/ftp/FTPChannelChild.cpp b/netwerk/protocol/ftp/FTPChannelChild.cpp index 078dc530f2e03..63edaff4cd87a 100644 --- a/netwerk/protocol/ftp/FTPChannelChild.cpp +++ b/netwerk/protocol/ftp/FTPChannelChild.cpp @@ -22,6 +22,7 @@ #include "mozilla/ipc/BackgroundUtils.h" #include "nsIURIMutator.h" #include "nsContentSecurityManager.h" +#include "mozilla/ScopeExit.h" using mozilla::dom::ContentChild; using namespace mozilla::ipc; diff --git a/netwerk/protocol/http/CachePushChecker.cpp b/netwerk/protocol/http/CachePushChecker.cpp index 3a402439d1b26..11dd509846420 100644 --- a/netwerk/protocol/http/CachePushChecker.cpp +++ b/netwerk/protocol/http/CachePushChecker.cpp @@ -7,6 +7,7 @@ #include "CachePushChecker.h" #include "LoadContextInfo.h" +#include "mozilla/ScopeExit.h" #include "mozilla/net/SocketProcessChild.h" #include "nsICacheEntry.h" #include "nsICacheStorageService.h" diff --git a/netwerk/protocol/http/ClassifierDummyChannelParent.cpp b/netwerk/protocol/http/ClassifierDummyChannelParent.cpp index 40de808d80641..043b7390440c8 100644 --- a/netwerk/protocol/http/ClassifierDummyChannelParent.cpp +++ b/netwerk/protocol/http/ClassifierDummyChannelParent.cpp @@ -6,6 +6,7 @@ #include "ClassifierDummyChannelParent.h" #include "mozilla/net/AsyncUrlChannelClassifier.h" +#include "mozilla/ScopeExit.h" #include "mozilla/Unused.h" #include "nsIPrincipal.h" #include "nsNetUtil.h" diff --git a/netwerk/protocol/http/HttpChannelChild.cpp b/netwerk/protocol/http/HttpChannelChild.cpp index 7dcf1c799610a..aa32924b6c98b 100644 --- a/netwerk/protocol/http/HttpChannelChild.cpp +++ b/netwerk/protocol/http/HttpChannelChild.cpp @@ -43,6 +43,7 @@ #include "mozilla/ipc/BackgroundUtils.h" #include "mozilla/net/DNS.h" #include "mozilla/net/SocketProcessBridgeChild.h" +#include "mozilla/ScopeExit.h" #include "mozilla/StaticPrefs_network.h" #include "mozilla/StoragePrincipalHelper.h" #include "SerializedLoadContext.h" diff --git a/netwerk/protocol/http/InterceptedHttpChannel.cpp b/netwerk/protocol/http/InterceptedHttpChannel.cpp index 7fbe72b67565d..b50905d870dab 100644 --- a/netwerk/protocol/http/InterceptedHttpChannel.cpp +++ b/netwerk/protocol/http/InterceptedHttpChannel.cpp @@ -8,6 +8,7 @@ #include "nsContentSecurityManager.h" #include "nsEscape.h" #include "mozilla/SchedulerGroup.h" +#include "mozilla/ScopeExit.h" #include "mozilla/dom/ChannelInfo.h" #include "mozilla/dom/PerformanceStorage.h" #include "nsHttpChannel.h" diff --git a/netwerk/protocol/http/TRRServiceChannel.cpp b/netwerk/protocol/http/TRRServiceChannel.cpp index faa13216a273e..ed5bd72036f29 100644 --- a/netwerk/protocol/http/TRRServiceChannel.cpp +++ b/netwerk/protocol/http/TRRServiceChannel.cpp @@ -9,6 +9,7 @@ #include "HttpLog.h" #include "AltServiceChild.h" +#include "mozilla/ScopeExit.h" #include "mozilla/StaticPrefs_network.h" #include "mozilla/Unused.h" #include "nsDNSPrefetch.h" diff --git a/netwerk/protocol/http/nsHttpTransaction.cpp b/netwerk/protocol/http/nsHttpTransaction.cpp index 513bed6fb3375..fef700de1363e 100644 --- a/netwerk/protocol/http/nsHttpTransaction.cpp +++ b/netwerk/protocol/http/nsHttpTransaction.cpp @@ -16,6 +16,7 @@ #include "TCPFastOpenLayer.h" #include "TunnelUtils.h" #include "base/basictypes.h" +#include "mozilla/ScopeExit.h" #include "mozilla/Tokenizer.h" #include "mozilla/StaticPrefs_network.h" #include "nsCRT.h" diff --git a/netwerk/protocol/websocket/WebSocketChannel.cpp b/netwerk/protocol/websocket/WebSocketChannel.cpp index b591020ddebe3..d8753563639c5 100644 --- a/netwerk/protocol/websocket/WebSocketChannel.cpp +++ b/netwerk/protocol/websocket/WebSocketChannel.cpp @@ -52,6 +52,7 @@ #include "nsProxyRelease.h" #include "nsNetUtil.h" #include "nsINode.h" +#include "mozilla/ScopeExit.h" #include "mozilla/StaticMutex.h" #include "mozilla/Telemetry.h" #include "mozilla/TimeStamp.h" diff --git a/parser/html/nsHtml5StreamParser.cpp b/parser/html/nsHtml5StreamParser.cpp index df0c0b75ee755..7ea5e63b2cbf9 100644 --- a/parser/html/nsHtml5StreamParser.cpp +++ b/parser/html/nsHtml5StreamParser.cpp @@ -9,6 +9,7 @@ #include "mozilla/DebugOnly.h" #include "mozilla/Encoding.h" #include "mozilla/SchedulerGroup.h" +#include "mozilla/ScopeExit.h" #include "nsContentUtils.h" #include "nsHtml5Tokenizer.h" #include "nsIHttpChannel.h" diff --git a/toolkit/components/extensions/webrequest/StreamFilterParent.cpp b/toolkit/components/extensions/webrequest/StreamFilterParent.cpp index e8e305d61a362..a0b061b4de534 100644 --- a/toolkit/components/extensions/webrequest/StreamFilterParent.cpp +++ b/toolkit/components/extensions/webrequest/StreamFilterParent.cpp @@ -6,7 +6,6 @@ #include "StreamFilterParent.h" -#include "mozilla/ScopeExit.h" #include "mozilla/Unused.h" #include "mozilla/dom/ContentParent.h" #include "mozilla/net/ChannelEventQueue.h" diff --git a/toolkit/components/places/FaviconHelpers.cpp b/toolkit/components/places/FaviconHelpers.cpp index 813511045fe82..604070494b15b 100644 --- a/toolkit/components/places/FaviconHelpers.cpp +++ b/toolkit/components/places/FaviconHelpers.cpp @@ -20,6 +20,7 @@ #include "mozilla/dom/PlacesFavicon.h" #include "mozilla/dom/PlacesObservers.h" #include "mozilla/storage.h" +#include "mozilla/ScopeExit.h" #include "mozilla/Telemetry.h" #include "mozilla/StaticPrefs_network.h" #include "nsNetUtil.h" diff --git a/toolkit/components/reputationservice/ApplicationReputation.cpp b/toolkit/components/reputationservice/ApplicationReputation.cpp index 7773bf3c35117..ab2d65862bba4 100644 --- a/toolkit/components/reputationservice/ApplicationReputation.cpp +++ b/toolkit/components/reputationservice/ApplicationReputation.cpp @@ -32,6 +32,7 @@ #include "mozilla/ErrorNames.h" #include "mozilla/LoadContext.h" #include "mozilla/Preferences.h" +#include "mozilla/ScopeExit.h" #include "mozilla/Services.h" #include "mozilla/Telemetry.h" #include "mozilla/TimeStamp.h" diff --git a/toolkit/components/reputationservice/LoginReputation.cpp b/toolkit/components/reputationservice/LoginReputation.cpp index 086dfd175f77b..6e092b795e484 100644 --- a/toolkit/components/reputationservice/LoginReputation.cpp +++ b/toolkit/components/reputationservice/LoginReputation.cpp @@ -10,6 +10,7 @@ #include "mozilla/Logging.h" #include "mozilla/net/UrlClassifierFeatureFactory.h" #include "mozilla/Preferences.h" +#include "mozilla/ScopeExit.h" #include "mozilla/StaticPrefs_browser.h" #include "mozilla/Telemetry.h" #include "mozilla/dom/ContentChild.h" diff --git a/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp b/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp index 7fd85614470bb..88ab08eae0623 100644 --- a/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp +++ b/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp @@ -30,6 +30,7 @@ #include "mozilla/ErrorNames.h" #include "mozilla/Mutex.h" #include "mozilla/Preferences.h" +#include "mozilla/ScopeExit.h" #include "mozilla/TimeStamp.h" #include "mozilla/Telemetry.h" #include "mozilla/Unused.h" diff --git a/toolkit/components/viaduct/Viaduct.cpp b/toolkit/components/viaduct/Viaduct.cpp index ce53a5f3d7c00..8d7f76b0f815b 100644 --- a/toolkit/components/viaduct/Viaduct.cpp +++ b/toolkit/components/viaduct/Viaduct.cpp @@ -5,7 +5,6 @@ #include "mozilla/Viaduct.h" #include "mozilla/ClearOnShutdown.h" -#include "mozilla/ScopeExit.h" #include "mozilla/ViaductRequest.h" namespace mozilla { diff --git a/toolkit/mozapps/extensions/AddonManagerStartup.cpp b/toolkit/mozapps/extensions/AddonManagerStartup.cpp index efe1affba9897..04b83219380ad 100644 --- a/toolkit/mozapps/extensions/AddonManagerStartup.cpp +++ b/toolkit/mozapps/extensions/AddonManagerStartup.cpp @@ -21,7 +21,6 @@ #include "mozilla/LinkedList.h" #include "mozilla/Preferences.h" #include "mozilla/ResultExtensions.h" -#include "mozilla/ScopeExit.h" #include "mozilla/Services.h" #include "mozilla/URLPreloader.h" #include "mozilla/Unused.h" diff --git a/toolkit/xre/UntrustedModulesProcessor.cpp b/toolkit/xre/UntrustedModulesProcessor.cpp index 7c95734847f06..96ce5b4f1d24a 100644 --- a/toolkit/xre/UntrustedModulesProcessor.cpp +++ b/toolkit/xre/UntrustedModulesProcessor.cpp @@ -13,6 +13,7 @@ #include "mozilla/dom/ContentChild.h" #include "mozilla/Likely.h" #include "mozilla/RDDParent.h" +#include "mozilla/ScopeExit.h" #include "mozilla/Services.h" #include "mozilla/Telemetry.h" #include "mozilla/Unused.h" diff --git a/toolkit/xre/nsEmbedFunctions.cpp b/toolkit/xre/nsEmbedFunctions.cpp index b689b1fa2c661..046e9105eba5d 100644 --- a/toolkit/xre/nsEmbedFunctions.cpp +++ b/toolkit/xre/nsEmbedFunctions.cpp @@ -21,6 +21,7 @@ # include # include # include "mozilla/ipc/WindowsMessageLoop.h" +# include "mozilla/ScopeExit.h" # include "mozilla/WinDllServices.h" #endif diff --git a/tools/profiler/core/ProfileBufferEntry.cpp b/tools/profiler/core/ProfileBufferEntry.cpp index b9e6efe62ab6f..d104798e60cd8 100644 --- a/tools/profiler/core/ProfileBufferEntry.cpp +++ b/tools/profiler/core/ProfileBufferEntry.cpp @@ -15,6 +15,7 @@ #include "jsapi.h" #include "jsfriendapi.h" #include "mozilla/Logging.h" +#include "mozilla/ScopeExit.h" #include "mozilla/Sprintf.h" #include "mozilla/StackWalk.h" #include "nsThreadUtils.h" diff --git a/widget/gtk/WindowSurfaceWayland.cpp b/widget/gtk/WindowSurfaceWayland.cpp index 3cd52c6050f0c..af697f4a1ad0d 100644 --- a/widget/gtk/WindowSurfaceWayland.cpp +++ b/widget/gtk/WindowSurfaceWayland.cpp @@ -16,6 +16,7 @@ #include "nsTArray.h" #include "base/message_loop.h" // for MessageLoop #include "base/task.h" // for NewRunnableMethod, etc +#include "mozilla/ScopeExit.h" #include "mozilla/StaticPrefs_widget.h" #include diff --git a/widget/gtk/nsDragService.cpp b/widget/gtk/nsDragService.cpp index 97662ace6631e..2a6101dcc06cc 100644 --- a/widget/gtk/nsDragService.cpp +++ b/widget/gtk/nsDragService.cpp @@ -29,6 +29,7 @@ #include "mozilla/Services.h" #include "mozilla/ClearOnShutdown.h" #include "mozilla/PresShell.h" +#include "mozilla/ScopeExit.h" #include "GRefPtr.h" #include "gfxXlibSurface.h" diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp index f2de260bff0cc..f08d355c58178 100644 --- a/widget/gtk/nsWindow.cpp +++ b/widget/gtk/nsWindow.cpp @@ -13,6 +13,7 @@ #include "mozilla/MouseEvents.h" #include "mozilla/PresShell.h" #include "mozilla/RefPtr.h" +#include "mozilla/ScopeExit.h" #include "mozilla/StaticPrefs_apz.h" #include "mozilla/StaticPrefs_ui.h" #include "mozilla/TextEvents.h" diff --git a/widget/windows/nsPrintDialogUtil.cpp b/widget/windows/nsPrintDialogUtil.cpp index 7c3cba636e657..f624018b48398 100644 --- a/widget/windows/nsPrintDialogUtil.cpp +++ b/widget/windows/nsPrintDialogUtil.cpp @@ -28,6 +28,7 @@ WIN_LIBS= \ #include #include "mozilla/BackgroundHangMonitor.h" +#include "mozilla/ScopeExit.h" #include "nsString.h" #include "nsReadableUtils.h" #include "nsIPrintSettings.h" diff --git a/widget/windows/nsWindow.cpp b/widget/windows/nsWindow.cpp index 0751eca9c0813..8163d1210e158 100644 --- a/widget/windows/nsWindow.cpp +++ b/widget/windows/nsWindow.cpp @@ -65,6 +65,7 @@ #include "mozilla/MathAlgorithms.h" #include "mozilla/MiscEvents.h" #include "mozilla/MouseEvents.h" +#include "mozilla/ScopeExit.h" #include "mozilla/TouchEvents.h" #include "mozilla/TimeStamp.h" diff --git a/xpcom/ds/Tokenizer.cpp b/xpcom/ds/Tokenizer.cpp index ec5fede0fca92..11bdf810339da 100644 --- a/xpcom/ds/Tokenizer.cpp +++ b/xpcom/ds/Tokenizer.cpp @@ -6,7 +6,6 @@ #include "Tokenizer.h" -#include "mozilla/ScopeExit.h" #include "nsUnicharUtils.h" #include diff --git a/xpcom/io/Base64.cpp b/xpcom/io/Base64.cpp index 3807800e81a20..d7a07a1029207 100644 --- a/xpcom/io/Base64.cpp +++ b/xpcom/io/Base64.cpp @@ -7,7 +7,6 @@ #include "Base64.h" #include "mozilla/ArrayUtils.h" -#include "mozilla/ScopeExit.h" #include "mozilla/UniquePtrExtensions.h" #include "nsIInputStream.h" #include "nsString.h" diff --git a/xpcom/tests/gtest/TestAllocReplacement.cpp b/xpcom/tests/gtest/TestAllocReplacement.cpp index 70a27cbc3c7f9..87318d2351228 100644 --- a/xpcom/tests/gtest/TestAllocReplacement.cpp +++ b/xpcom/tests/gtest/TestAllocReplacement.cpp @@ -6,7 +6,6 @@ #include "mozilla/Attributes.h" #include "mozilla/mozalloc.h" -#include "mozilla/ScopeExit.h" #include "nsCOMPtr.h" #include "nsIMemoryReporter.h" #include "nsServiceManagerUtils.h" diff --git a/xpcom/threads/nsThreadPool.cpp b/xpcom/threads/nsThreadPool.cpp index 32789240fdb69..0d7aca27ec1d5 100644 --- a/xpcom/threads/nsThreadPool.cpp +++ b/xpcom/threads/nsThreadPool.cpp @@ -13,6 +13,7 @@ #include "prinrval.h" #include "mozilla/Logging.h" #include "mozilla/SchedulerGroup.h" +#include "mozilla/ScopeExit.h" #include "mozilla/SpinEventLoopUntil.h" #include "nsThreadSyncDispatch.h"