Bug 1691589 - Reduce reliance on GeckoProfiler.h when only labels (and maybe markers) are needed - r=necko-reviewers,geckoview-reviewers,sg,agi,florian

There are no code changes, only #include changes.
It was a fairly mechanical process: Search for all "AUTO_PROFILER_LABEL", and in each file, if only labels are used, convert "GeckoProfiler.h" into "ProfilerLabels.h" (or just add that last one where needed).
In some files, there were also some marker calls but no other profiler-related calls, in these cases "GeckoProfiler.h" was replaced with both "ProfilerLabels.h" and "ProfilerMarkers.h", which still helps in reducing the use of the all-encompassing "GeckoProfiler.h".

Differential Revision: https://phabricator.services.mozilla.com/D104588

accessible/base/NotificationController.cpp

@@ -7,7 +7,6 @@
 
 #include "DocAccessible-inl.h"
 #include "DocAccessibleChild.h"
-#include "GeckoProfiler.h"
 #include "nsEventShell.h"
 #include "TextLeafAccessible.h"
 #include "TextUpdater.h"
@@ -15,6 +14,7 @@
 #include "mozilla/dom/BrowserChild.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/PresShell.h"
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/Telemetry.h"
 
 using namespace mozilla;

dom/base/ChromeUtils.cpp

@@ -42,7 +42,8 @@
 #include "IOActivityMonitor.h"
 #include "nsThreadUtils.h"
 #include "mozJSComponentLoader.h"
-#include "GeckoProfiler.h"
+#include "mozilla/ProfilerLabels.h"
+#include "mozilla/ProfilerMarkers.h"
 #include "nsIException.h"
 
 namespace mozilla::dom {

dom/base/WindowDestroyedEvent.cpp

@@ -6,7 +6,6 @@
 
 #include "WindowDestroyedEvent.h"
 
-#include "GeckoProfiler.h"
 #include "nsJSUtils.h"
 #include "jsapi.h"
 #include "js/Wrapper.h"
@@ -19,6 +18,7 @@
 #include "xpcpublic.h"
 #include "mozilla/BasePrincipal.h"
 #include "mozilla/Components.h"
+#include "mozilla/ProfilerLabels.h"
 
 namespace mozilla {
 

dom/base/nsContentSink.cpp

@@ -49,6 +49,7 @@
 #include "nsGenericHTMLElement.h"
 #include "nsIObserverService.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/dom/HTMLDNSPrefetch.h"
 #include "mozilla/dom/ServiceWorkerDescriptor.h"
 #include "mozilla/dom/ScriptLoader.h"

dom/base/nsDOMWindowUtils.cpp

@@ -105,7 +105,6 @@
 #include "nsIBaseWindow.h"
 #include "nsIDocShellTreeOwner.h"
 #include "nsIInterfaceRequestorUtils.h"
-#include "GeckoProfiler.h"
 #include "mozilla/Preferences.h"
 #include "nsContentPermissionHelper.h"
 #include "nsCSSPseudoElements.h"  // for PseudoStyleType
@@ -121,6 +120,8 @@
 #include "mozilla/gfx/GPUProcessManager.h"
 #include "mozilla/dom/TimeoutManager.h"
 #include "mozilla/PreloadedStyleSheet.h"
+#include "mozilla/ProfilerLabels.h"
+#include "mozilla/ProfilerMarkers.h"
 #include "mozilla/layers/WebRenderBridgeChild.h"
 #include "mozilla/layers/WebRenderLayerManager.h"
 #include "mozilla/DisplayPortUtils.h"

dom/base/nsFrameLoader.cpp

@@ -91,8 +91,8 @@
 #include "mozilla/dom/WindowGlobalParent.h"
 #include "mozilla/dom/XULFrameElement.h"
 #include "mozilla/gfx/CrossProcessPaint.h"
+#include "mozilla/ProfilerLabels.h"
 #include "nsGenericHTMLFrameElement.h"
-#include "GeckoProfiler.h"
 
 #include "jsapi.h"
 #include "mozilla/dom/HTMLIFrameElement.h"

dom/base/nsFrameMessageManager.cpp

@@ -14,7 +14,7 @@
 #include <utility>
 #include "ContentChild.h"
 #include "ErrorList.h"
-#include "GeckoProfiler.h"
+#include "mozilla/ProfilerLabels.h"
 #include "base/process_util.h"
 #include "chrome/common/ipc_channel.h"
 #include "js/CompilationAndEvaluation.h"

dom/base/nsINode.cpp

@@ -47,6 +47,7 @@
 #include "mozilla/dom/SVGUseElement.h"
 #include "mozilla/dom/ScriptSettings.h"
 #include "mozilla/dom/L10nOverlays.h"
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/StaticPrefs_layout.h"
 #include "nsAttrValueOrString.h"
 #include "nsCCUncollectableMarker.h"

dom/base/nsJSEnvironment.cpp

@@ -78,10 +78,11 @@
 #include "mozilla/ContentEvents.h"
 #include "mozilla/CycleCollectedJSContext.h"
 #include "nsCycleCollectionNoteRootCallback.h"
-#include "GeckoProfiler.h"
 #include "mozilla/IdleTaskRunner.h"
 #include "nsViewManager.h"
 #include "mozilla/EventStateManager.h"
+#include "mozilla/ProfilerLabels.h"
+#include "mozilla/ProfilerMarkers.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;

dom/base/nsJSUtils.cpp

@@ -14,7 +14,6 @@
 #include "nsJSUtils.h"
 
 #include <utility>
-#include "GeckoProfiler.h"
 #include "MainThreadUtils.h"
 #include "js/ComparisonOperators.h"
 #include "js/CompilationAndEvaluation.h"
@@ -32,6 +31,7 @@
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/ScriptSettings.h"
 #include "mozilla/fallible.h"
+#include "mozilla/ProfilerLabels.h"
 #include "nsContentUtils.h"
 #include "nsDebug.h"
 #include "nsGlobalWindowInner.h"

dom/base/nsObjectLoadingContent.cpp

@@ -65,7 +65,6 @@
 
 #include "nsObjectLoadingContent.h"
 #include "mozAutoDocUpdate.h"
-#include "GeckoProfiler.h"
 #include "nsWrapperCacheInlines.h"
 #include "nsDOMJSUtils.h"
 #include "js/Object.h"  // JS::GetClass
@@ -95,6 +94,7 @@
 #include "mozilla/net/UrlClassifierFeatureFactory.h"
 #include "mozilla/LoadInfo.h"
 #include "mozilla/PresShell.h"
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/StaticPrefs_browser.h"
 #include "mozilla/StaticPrefs_security.h"
 #include "nsChannelClassifier.h"

dom/canvas/WebGLContextDraw.cpp

@@ -5,10 +5,10 @@
 
 #include "WebGLContext.h"
 
-#include "GeckoProfiler.h"
 #include "MozFramebuffer.h"
 #include "GLContext.h"
 #include "mozilla/CheckedInt.h"
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/UniquePtrExtensions.h"
 #include "nsPrintfCString.h"
 #include "WebGLBuffer.h"

dom/events/EventDispatcher.cpp

@@ -23,7 +23,6 @@
 #include "CompositionEvent.h"
 #include "DeviceMotionEvent.h"
 #include "DragEvent.h"
-#include "GeckoProfiler.h"
 #include "KeyboardEvent.h"
 #include "Layers.h"
 #include "mozilla/BasePrincipal.h"
@@ -59,6 +58,8 @@
 #include "mozilla/ipc/MessageChannel.h"
 #include "mozilla/MiscEvents.h"
 #include "mozilla/MouseEvents.h"
+#include "mozilla/ProfilerLabels.h"
+#include "mozilla/ProfilerMarkers.h"
 #include "mozilla/Telemetry.h"
 #include "mozilla/TextEvents.h"
 #include "mozilla/TouchEvents.h"

dom/events/EventStateManager.cpp

@@ -115,7 +115,7 @@
 
 #include "mozilla/Preferences.h"
 #include "mozilla/LookAndFeel.h"
-#include "GeckoProfiler.h"
+#include "mozilla/ProfilerLabels.h"
 #include "Units.h"
 
 #ifdef XP_MACOSX

dom/html/HTMLCanvasElement.cpp

@@ -34,6 +34,7 @@
 #include "mozilla/layers/WebRenderUserData.h"
 #include "mozilla/MouseEvents.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/Telemetry.h"
 #include "mozilla/webgpu/CanvasContext.h"
 #include "nsAttrValueInlines.h"

dom/html/PluginDocument.cpp

@@ -15,8 +15,8 @@
 #include "nsContentPolicyUtils.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/PresShell.h"
+#include "mozilla/ProfilerLabels.h"
 #include "nsObjectLoadingContent.h"
-#include "GeckoProfiler.h"
 
 namespace mozilla::dom {
 

dom/html/nsGenericHTMLFrameElement.cpp

@@ -13,9 +13,9 @@
 #include "mozilla/dom/WindowProxyHolder.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/PresShell.h"
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/ErrorResult.h"
-#include "GeckoProfiler.h"
 #include "nsAttrValueInlines.h"
 #include "nsContentUtils.h"
 #include "nsIDocShell.h"

dom/indexedDB/ActorsChild.cpp

@@ -9,7 +9,6 @@
 #include <type_traits>
 
 #include "BackgroundChildImpl.h"
-#include "GeckoProfiler.h"
 #include "IDBDatabase.h"
 #include "IDBEvents.h"
 #include "IDBFactory.h"
@@ -41,6 +40,7 @@
 #include "mozilla/dom/WorkerRunnable.h"
 #include "mozilla/Encoding.h"
 #include "mozilla/ipc/BackgroundUtils.h"
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/TaskQueue.h"
 #include "nsCOMPtr.h"
 #include "nsContentUtils.h"

dom/indexedDB/ActorsParent.cpp

@@ -27,7 +27,6 @@
 #include "FileInfoT.h"
 #include "FileManager.h"
 #include "FileManagerBase.h"
-#include "GeckoProfiler.h"
 #include "IDBCursorType.h"
 #include "IDBObjectStore.h"
 #include "IDBTransaction.h"
@@ -76,6 +75,7 @@
 #include "mozilla/Mutex.h"
 #include "mozilla/NotNull.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/RefCountType.h"
 #include "mozilla/RefCounted.h"
 #include "mozilla/RemoteLazyInputStreamParent.h"

dom/indexedDB/ActorsParentCommon.cpp

@@ -20,7 +20,6 @@
 #include <algorithm>
 #include <numeric>
 #include <type_traits>
-#include "GeckoProfiler.h"
 #include "MainThreadUtils.h"
 #include "SafeRefPtr.h"
 #include "js/RootingAPI.h"
@@ -33,6 +32,7 @@
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/JSObjectHolder.h"
 #include "mozilla/NullPrincipal.h"
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/ResultExtensions.h"
 #include "mozilla/StaticPtr.h"

dom/indexedDB/DBSchema.cpp

@@ -12,10 +12,10 @@
 
 // global includes
 #include "ErrorList.h"
-#include "GeckoProfiler.h"
 #include "js/StructuredClone.h"
 #include "mozIStorageConnection.h"
 #include "mozilla/dom/quota/QuotaCommon.h"
+#include "mozilla/ProfilerLabels.h"
 #include "nsDebug.h"
 #include "nsError.h"
 #include "nsLiteralString.h"

dom/indexedDB/SchemaUpgrades.cpp

@@ -22,7 +22,6 @@
 #include <type_traits>
 #include <utility>
 #include "ErrorList.h"
-#include "GeckoProfiler.h"
 #include "MainThreadUtils.h"
 #include "SafeRefPtr.h"
 #include "js/RootingAPI.h"
@@ -52,6 +51,7 @@
 #include "mozilla/fallible.h"
 #include "mozilla/ipc/BackgroundParent.h"
 #include "mozilla/mozalloc.h"
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/storage/Variant.h"
 #include "nsCOMPtr.h"
 #include "nsDebug.h"

dom/ipc/BrowserChild.cpp

@@ -21,7 +21,6 @@
 #include "DocumentInlines.h"
 #include "EventStateManager.h"
 #include "FrameLayerBuilder.h"
-#include "GeckoProfiler.h"
 #include "Layers.h"
 #include "MMPrinter.h"
 #include "PermissionMessageUtils.h"
@@ -43,6 +42,7 @@
 #include "mozilla/Preferences.h"
 #include "mozilla/PresShell.h"
 #include "mozilla/ProcessHangMonitor.h"
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/ResultExtensions.h"
 #include "mozilla/ScopeExit.h"
 #include "mozilla/Services.h"

dom/ipc/BrowserParent.cpp

@@ -125,7 +125,7 @@
 #include "IHistory.h"
 #include "mozilla/dom/WindowGlobalParent.h"
 #include "mozilla/dom/CanonicalBrowsingContext.h"
-#include "GeckoProfiler.h"
+#include "mozilla/ProfilerLabels.h"
 #include "MMPrinter.h"
 #include "SessionStoreFunctions.h"
 #include "mozilla/dom/CrashReport.h"

dom/ipc/ContentParent.cpp

@@ -22,7 +22,6 @@
 #ifdef ACCESSIBILITY
 #  include "mozilla/a11y/PDocAccessible.h"
 #endif
-#include "GeckoProfiler.h"
 #include "GMPServiceParent.h"
 #include "HandlerServiceParent.h"
 #include "IHistory.h"
@@ -67,6 +66,8 @@
 #include "mozilla/PresShell.h"
 #include "mozilla/ProcessHangMonitor.h"
 #include "mozilla/ProcessHangMonitorIPC.h"
+#include "mozilla/ProfilerLabels.h"
+#include "mozilla/ProfilerMarkers.h"
 #include "mozilla/ScopeExit.h"
 #include "mozilla/ScriptPreloader.h"
 #include "mozilla/Services.h"

dom/media/MediaDecoderStateMachine.cpp

@@ -15,6 +15,7 @@
 #include "mozilla/Logging.h"
 #include "mozilla/MathAlgorithms.h"
 #include "mozilla/NotNull.h"
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/SharedThreadPool.h"
 #include "mozilla/Sprintf.h"
 #include "mozilla/StaticPrefs_media.h"
@@ -27,7 +28,6 @@
 #include "AudioSegment.h"
 #include "DOMMediaStream.h"
 #include "ImageContainer.h"
-#include "GeckoProfiler.h"
 #include "MediaDecoder.h"
 #include "MediaDecoderStateMachine.h"
 #include "MediaShutdownManager.h"

dom/media/MediaFormatReader.cpp

@@ -12,7 +12,6 @@
 
 #include "AllocationPolicy.h"
 #include "DecoderBenchmark.h"
-#include "GeckoProfiler.h"
 #include "MediaData.h"
 #include "MediaDataDecoderProxy.h"
 #include "MediaInfo.h"
@@ -24,6 +23,8 @@
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/NotNull.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/ProfilerLabels.h"
+#include "mozilla/ProfilerMarkers.h"
 #include "mozilla/SharedThreadPool.h"
 #include "mozilla/StaticPrefs_media.h"
 #include "mozilla/TaskQueue.h"

dom/media/MediaRecorder.cpp

@@ -9,7 +9,6 @@
 #include "AudioNodeEngine.h"
 #include "AudioNodeTrack.h"
 #include "DOMMediaStream.h"
-#include "GeckoProfiler.h"
 #include "MediaDecoder.h"
 #include "MediaEncoder.h"
 #include "MediaTrackGraphImpl.h"

dom/media/encoder/MediaEncoder.cpp

@@ -9,7 +9,6 @@
 #include "AudioNodeEngine.h"
 #include "AudioNodeTrack.h"
 #include "DriftCompensation.h"
-#include "GeckoProfiler.h"
 #include "MediaDecoder.h"
 #include "MediaTrackGraphImpl.h"
 #include "MediaTrackListener.h"
@@ -22,6 +21,7 @@
 #include "mozilla/gfx/Point.h"  // IntSize
 #include "mozilla/Logging.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/StaticPrefs_media.h"
 #include "mozilla/StaticPtr.h"
 #include "mozilla/TaskQueue.h"

dom/media/encoder/OpusTrackEncoder.cpp

@@ -4,8 +4,8 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include "OpusTrackEncoder.h"
 #include "nsString.h"
-#include "GeckoProfiler.h"
 #include "mozilla/CheckedInt.h"
+#include "mozilla/ProfilerLabels.h"
 #include "VideoUtils.h"
 
 #include <opus/opus.h>

dom/media/encoder/TrackEncoder.cpp

@@ -7,11 +7,11 @@
 
 #include "AudioChannelFormat.h"
 #include "DriftCompensation.h"
-#include "GeckoProfiler.h"
 #include "MediaTrackGraph.h"
 #include "MediaTrackListener.h"
 #include "mozilla/AbstractThread.h"
 #include "mozilla/Logging.h"
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/RollingMean.h"
 #include "VideoUtils.h"
 #include "mozilla/Telemetry.h"

dom/media/encoder/VP8TrackEncoder.cpp

@@ -6,7 +6,6 @@
 #include "VP8TrackEncoder.h"
 
 #include "DriftCompensation.h"
-#include "GeckoProfiler.h"
 #include "ImageToI420.h"
 #include "mozilla/gfx/2D.h"
 #include "prsystem.h"
@@ -18,6 +17,7 @@
 #include "mozilla/media/MediaUtils.h"
 #include "mozilla/dom/ImageUtils.h"
 #include "mozilla/dom/ImageBitmapBinding.h"
+#include "mozilla/ProfilerLabels.h"
 
 namespace mozilla {
 

dom/media/mediasink/VideoSink.cpp

@@ -12,11 +12,11 @@
 
 #include "VideoSink.h"
 
-#include "GeckoProfiler.h"
 #include "MediaQueue.h"
 #include "VideoUtils.h"
 
 #include "mozilla/IntegerPrintfMacros.h"
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/ProfilerMarkerTypes.h"
 #include "mozilla/StaticPrefs_browser.h"
 #include "mozilla/StaticPrefs_media.h"

dom/media/ogg/OggWriter.cpp

@@ -4,7 +4,7 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include "OggWriter.h"
 #include "prtime.h"
-#include "GeckoProfiler.h"
+#include "mozilla/ProfilerLabels.h"
 
 #define LOG(args, ...)
 

dom/media/webm/WebMWriter.cpp

@@ -5,7 +5,7 @@
 
 #include "WebMWriter.h"
 #include "EbmlComposer.h"
-#include "GeckoProfiler.h"
+#include "mozilla/ProfilerLabels.h"
 #include "OpusTrackEncoder.h"
 
 namespace mozilla {

dom/media/webspeech/synth/windows/SapiService.cpp

@@ -7,7 +7,6 @@
 #include "nsISupports.h"
 #include "SapiService.h"
 #include "nsServiceManagerUtils.h"
-#include "GeckoProfiler.h"
 #include "nsEscape.h"
 #include "nsXULAppAPI.h"
 
@@ -15,6 +14,7 @@
 #include "mozilla/dom/nsSynthVoiceRegistry.h"
 #include "mozilla/dom/nsSpeechTask.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/StaticPrefs_media.h"
 
 namespace mozilla {

dom/plugins/base/nsJSNPRuntime.cpp

@@ -8,7 +8,6 @@
 
 #include "jsfriendapi.h"
 
-#include "GeckoProfiler.h"
 #include "mozilla/UniquePtr.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsJSNPRuntime.h"
@@ -31,6 +30,7 @@
 #include "js/TracingAPI.h"
 #include "js/Wrapper.h"
 #include "mozilla/HashFunctions.h"
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/dom/ScriptSettings.h"
 

dom/plugins/base/nsNPAPIPlugin.cpp

@@ -24,6 +24,7 @@
 #include "nsThreadUtils.h"
 #include "mozilla/CycleCollectedJSContext.h"  // for nsAutoMicroTask
 #include "mozilla/Preferences.h"
+#include "mozilla/ProfilerLabels.h"
 #include "nsPluginInstanceOwner.h"
 
 #include "nsPluginsDir.h"

dom/plugins/base/nsNPAPIPluginInstance.cpp

@@ -35,7 +35,7 @@
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/HTMLObjectElementBinding.h"
 #include "AudioChannelService.h"
-#include "GeckoProfiler.h"
+#include "mozilla/ProfilerLabels.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;

dom/plugins/base/nsNPAPIPluginStreamListener.cpp

@@ -13,6 +13,7 @@
 #include "nsNPAPIPlugin.h"
 #include "nsPluginLogging.h"
 #include "nsPluginStreamListenerPeer.h"
+#include "mozilla/ProfilerLabels.h"
 
 #include <stdint.h>
 #include <algorithm>

dom/plugins/base/nsPluginHost.cpp

@@ -13,7 +13,6 @@
 #include <cstdlib>
 #include <new>
 #include <utility>
-#include "GeckoProfiler.h"
 #include "ReferrerInfo.h"
 #include "js/RootingAPI.h"
 #include "mozilla/ArrayIterator.h"
@@ -25,6 +24,7 @@
 #include "mozilla/NotNull.h"
 #include "mozilla/PluginLibrary.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/Services.h"
 #include "mozilla/SpinEventLoopUntil.h"
 #include "mozilla/StaticPtr.h"

dom/plugins/base/nsPluginInstanceOwner.cpp

@@ -45,6 +45,7 @@ using mozilla::DefaultXDisplay;
 #include "mozilla/MouseEvents.h"
 #include "mozilla/NullPrincipal.h"
 #include "mozilla/PresShell.h"
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/TextEvents.h"
 #include "mozilla/dom/DocumentInlines.h"
 #include "mozilla/dom/DragEvent.h"

dom/plugins/base/nsPluginStreamListenerPeer.cpp

@@ -23,10 +23,10 @@
 #include "nsContentUtils.h"
 #include "nsNetUtil.h"
 #include "nsPluginNativeWindow.h"
-#include "GeckoProfiler.h"
 #include "nsPluginInstanceOwner.h"
 #include "nsDataHashtable.h"
 #include "mozilla/NullPrincipal.h"
+#include "mozilla/ProfilerLabels.h"
 
 // nsPluginStreamListenerPeer
 

dom/plugins/ipc/PluginModuleParent.cpp

@@ -27,6 +27,7 @@
 #include "mozilla/plugins/PStreamNotifyParent.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/ProcessHangMonitor.h"
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/Services.h"
 #include "mozilla/Telemetry.h"
 #include "mozilla/Unused.h"
@@ -42,7 +43,6 @@
 #include "prclist.h"
 #include "PluginQuirks.h"
 #include "gfxPlatform.h"
-#include "GeckoProfiler.h"
 #include "nsPluginTags.h"
 #include "nsUnicharUtils.h"
 #include "mozilla/layers/TextureClientRecycleAllocator.h"

dom/prototype/PrototypeDocumentContentSink.cpp

@@ -48,8 +48,8 @@
 #include "mozilla/dom/ScriptLoader.h"
 #include "mozilla/LoadInfo.h"
 #include "mozilla/PresShell.h"
+#include "mozilla/ProfilerLabels.h"
 
-#include "GeckoProfiler.h"
 #include "nsXULPrototypeCache.h"
 #include "nsXULElement.h"
 #include "mozilla/CycleCollectedJSContext.h"

dom/quota/ActorsParent.cpp

@@ -29,7 +29,6 @@
 #include <utility>
 #include "DirectoryLockImpl.h"
 #include "ErrorList.h"
-#include "GeckoProfiler.h"
 #include "MainThreadUtils.h"
 #include "mozIStorageAsyncConnection.h"
 #include "mozIStorageConnection.h"
@@ -53,6 +52,7 @@
 #include "mozilla/NotNull.h"
 #include "mozilla/OriginAttributes.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/Result.h"
 #include "mozilla/ResultExtensions.h"

dom/quota/CachingDatabaseConnection.cpp

@@ -6,7 +6,7 @@
 
 #include "mozilla/dom/quota/CachingDatabaseConnection.h"
 
-#include "GeckoProfiler.h"
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/ipc/BackgroundParent.h"
 
 namespace mozilla::dom::quota {

dom/workers/WorkerPrivate.cpp

@@ -15,11 +15,11 @@
 #include "js/LocaleSensitive.h"
 #include "js/MemoryMetrics.h"
 #include "js/SourceText.h"
-#include "GeckoProfiler.h"
 #include "MessageEventRunnable.h"
 #include "mozilla/BasePrincipal.h"
 #include "mozilla/CycleCollectedJSContext.h"
 #include "mozilla/HoldDropJSObjects.h"
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/Result.h"
 #include "mozilla/ScopeExit.h"
 #include "mozilla/StaticPrefs_browser.h"

gfx/gl/GLContext.h

@@ -45,7 +45,7 @@
 #include "mozilla/WeakPtr.h"
 
 #ifdef MOZ_WIDGET_ANDROID
-#  include "GeckoProfiler.h"
+#  include "mozilla/ProfilerLabels.h"
 #endif
 
 namespace mozilla {

gfx/gl/GLContextProviderCGL.mm

@@ -16,7 +16,7 @@
 #include "mozilla/StaticPrefs_layout.h"
 #include "prenv.h"
 #include "prlink.h"
-#include "GeckoProfiler.h"
+#include "mozilla/ProfilerLabels.h"
 #include "MozFramebuffer.h"
 #include "mozilla/layers/CompositorOptions.h"
 #include "mozilla/widget/CompositorWidget.h"

gfx/gl/GLContextProviderEAGL.mm

@@ -10,9 +10,9 @@
 #include "gfxFailure.h"
 #include "prenv.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/layers/CompositorOptions.h"
 #include "mozilla/widget/CompositorWidget.h"
-#include "GeckoProfiler.h"
 
 #import <UIKit/UIKit.h>
 

gfx/gl/GLLibraryEGL.h

@@ -20,6 +20,10 @@
 #include <memory>
 #include <unordered_map>
 
+#ifdef MOZ_WIDGET_ANDROID
+#  include "mozilla/ProfilerLabels.h"
+#endif
+
 #if defined(MOZ_X11)
 #  define EGL_DEFAULT_DISPLAY ((EGLNativeDisplayType)mozilla::DefaultXDisplay())
 #else

gfx/layers/D3D9SurfaceImage.cpp

@@ -11,6 +11,7 @@
 #include "mozilla/layers/CompositableForwarder.h"
 #include "mozilla/layers/ImageBridgeChild.h"
 #include "mozilla/gfx/Types.h"
+#include "mozilla/ProfilerLabels.h"
 
 namespace mozilla {
 namespace layers {

gfx/layers/ImageContainer.cpp

@@ -8,7 +8,6 @@
 
 #include <string.h>  // for memcpy, memset
 
-#include "GeckoProfiler.h"
 #include "GLImages.h"    // for SurfaceTextureImage
 #include "YCbCrUtils.h"  // for YCbCr conversions
 #include "gfx2DGlue.h"
@@ -16,6 +15,7 @@
 #include "gfxUtils.h"     // for gfxUtils
 #include "libyuv.h"
 #include "mozilla/CheckedInt.h"
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/RefPtr.h"  // for already_AddRefed
 #include "mozilla/StaticPrefs_layers.h"
 #include "mozilla/gfx/2D.h"

gfx/layers/PaintThread.cpp

@@ -10,12 +10,12 @@
 
 #include "base/task.h"
 #include "gfxPlatform.h"
-#include "GeckoProfiler.h"
 #include "mozilla/layers/CompositorBridgeChild.h"
 #include "mozilla/layers/ShadowLayers.h"
 #include "mozilla/layers/SyncObject.h"
 #include "mozilla/gfx/2D.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/StaticPrefs_layers.h"
 #include "mozilla/SharedThreadPool.h"
 #include "mozilla/SyncRunnable.h"

gfx/layers/RotatedBuffer.cpp

@@ -13,13 +13,13 @@
 
 #include "BasicImplData.h"    // for BasicImplData
 #include "BasicLayersImpl.h"  // for ToData
-#include "GeckoProfiler.h"    // for AUTO_PROFILER_LABEL
 #include "Layers.h"           // for PaintedLayer, Layer, etc
 #include "PaintThread.h"
 #include "gfx2DGlue.h"
 #include "gfxPlatform.h"         // for gfxPlatform
 #include "gfxUtils.h"            // for gfxUtils
 #include "mozilla/ArrayUtils.h"  // for ArrayLength
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/StaticPrefs_layers.h"
 #include "mozilla/gfx/BasePoint.h"  // for BasePoint
 #include "mozilla/gfx/BaseRect.h"   // for BaseRect

gfx/layers/SurfacePoolCA.mm

@@ -11,10 +11,11 @@
 #include <unordered_set>
 #include <utility>
 
+#include "mozilla/ProfilerLabels.h"
+#include "mozilla/ProfilerMarkers.h"
 #include "mozilla/StaticMutex.h"
 #include "mozilla/StaticPrefs_gfx.h"
 
-#include "GeckoProfiler.h"
 #include "GLContextCGL.h"
 #include "MozFramebuffer.h"
 

gfx/layers/basic/BasicLayerManager.cpp

@@ -10,7 +10,6 @@
 #include <stack>                  // for stack
 #include "BasicContainerLayer.h"  // for BasicContainerLayer
 #include "BasicLayersImpl.h"      // for ToData, BasicReadbackLayer, etc
-#include "GeckoProfiler.h"        // for AUTO_PROFILER_LABEL
 #include "ImageContainer.h"       // for ImageFactory
 #include "Layers.h"               // for Layer, ContainerLayer, etc
 #include "ReadbackLayer.h"        // for ReadbackLayer
@@ -29,6 +28,7 @@
 #include "gfxUtils.h"            // for gfxUtils
 #include "gfx2DGlue.h"           // for thebes --> moz2d transition
 #include "mozilla/Assertions.h"  // for MOZ_ASSERT, etc
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/StaticPrefs_nglayout.h"
 #include "mozilla/WidgetUtils.h"    // for ScreenRotation
 #include "mozilla/gfx/2D.h"         // for DrawTarget

gfx/layers/basic/BasicPaintedLayer.cpp

@@ -6,7 +6,6 @@
 
 #include "BasicPaintedLayer.h"
 #include <stdint.h>                // for uint32_t
-#include "GeckoProfiler.h"         // for AUTO_PROFILER_LABEL
 #include "ReadbackLayer.h"         // for ReadbackLayer, ReadbackSink
 #include "ReadbackProcessor.h"     // for ReadbackProcessor::Update, etc
 #include "RenderTrace.h"           // for RenderTraceInvalidateEnd, etc
@@ -20,6 +19,7 @@
 #include "mozilla/gfx/Rect.h"      // for Rect, IntRect
 #include "mozilla/gfx/Types.h"     // for Float, etc
 #include "mozilla/layers/LayersTypes.h"
+#include "mozilla/ProfilerLabels.h"
 #include "nsCOMPtr.h"         // for already_AddRefed
 #include "nsISupportsImpl.h"  // for gfxContext::Release, etc
 #include "nsPoint.h"          // for nsIntPoint

gfx/layers/client/ClientCanvasLayer.cpp

@@ -5,9 +5,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "ClientCanvasLayer.h"
-#include "GeckoProfiler.h"       // for AUTO_PROFILER_LABEL
 #include "ClientLayerManager.h"  // for ClientLayerManager, etc
 #include "nsCOMPtr.h"            // for already_AddRefed
+#include "mozilla/ProfilerLabels.h"
 
 namespace mozilla {
 namespace layers {

gfx/layers/client/ClientLayerManager.cpp

@@ -5,10 +5,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "ClientLayerManager.h"
-#include "GeckoProfiler.h"       // for AUTO_PROFILER_LABEL
 #include "gfxEnv.h"              // for gfxEnv
 #include "mozilla/Assertions.h"  // for MOZ_ASSERT, etc
 #include "mozilla/Hal.h"
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/StaticPrefs_apz.h"
 #include "mozilla/StaticPrefs_gfx.h"
 #include "mozilla/StaticPrefs_layers.h"

gfx/layers/client/ClientPaintedLayer.cpp

@@ -7,7 +7,6 @@
 #include "ClientPaintedLayer.h"
 #include "ClientTiledPaintedLayer.h"    // for ClientTiledPaintedLayer
 #include <stdint.h>                     // for uint32_t
-#include "GeckoProfiler.h"              // for AUTO_PROFILER_LABEL
 #include "client/ClientLayerManager.h"  // for ClientLayerManager, etc
 #include "gfxContext.h"                 // for gfxContext
 #include "gfx2DGlue.h"
@@ -22,6 +21,7 @@
 #include "mozilla/gfx/Types.h"   // for Float, etc
 #include "mozilla/layers/LayersTypes.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/ProfilerLabels.h"
 #include "nsCOMPtr.h"         // for already_AddRefed
 #include "nsISupportsImpl.h"  // for Layer::AddRef, etc
 #include "nsRect.h"           // for mozilla::gfx::IntRect

gfx/layers/client/MultiTiledContentClient.cpp

@@ -7,6 +7,7 @@
 #include "mozilla/layers/MultiTiledContentClient.h"
 
 #include "ClientTiledPaintedLayer.h"
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/StaticPrefs_layers.h"
 #include "mozilla/layers/APZUtils.h"
 #include "mozilla/layers/LayerMetricsWrapper.h"

gfx/layers/client/TextureClient.cpp

@@ -9,7 +9,6 @@
 #include <stdint.h>  // for uint8_t, uint32_t, etc
 
 #include "BufferTexture.h"
-#include "GeckoProfiler.h"
 #include "IPDLActor.h"
 #include "ImageContainer.h"  // for PlanarYCbCrData, etc
 #include "Layers.h"          // for Layer, etc
@@ -19,6 +18,7 @@
 #include "gfxUtils.h"     // for gfxUtils::GetAsLZ4Base64Str
 #include "mozilla/Atomics.h"
 #include "mozilla/Mutex.h"
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/SchedulerGroup.h"
 #include "mozilla/StaticPrefs_gfx.h"
 #include "mozilla/StaticPrefs_layers.h"

gfx/layers/client/TiledContentClient.cpp

@@ -8,12 +8,12 @@
 #include <math.h>  // for ceil, ceilf, floor
 #include <algorithm>
 #include "ClientTiledPaintedLayer.h"  // for ClientTiledPaintedLayer
-#include "GeckoProfiler.h"            // for AUTO_PROFILER_LABEL
 #include "ClientLayerManager.h"       // for ClientLayerManager
 #include "gfxContext.h"               // for gfxContext, etc
 #include "gfxPlatform.h"              // for gfxPlatform
 #include "gfxRect.h"                  // for gfxRect
 #include "mozilla/MathAlgorithms.h"   // for Abs
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/gfx/Point.h"        // for IntSize
 #include "mozilla/gfx/Rect.h"         // for Rect
 #include "mozilla/gfx/Tools.h"        // for BytesPerPixel

gfx/layers/composite/AsyncCompositionManager.cpp

@@ -9,6 +9,7 @@
 #include "LayerManagerComposite.h"  // for LayerManagerComposite, etc
 #include "Layers.h"                 // for Layer, ContainerLayer, etc
 #include "gfxPoint.h"               // for gfxPoint, gfxSize
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/ServoBindings.h"  // for Servo_AnimationValue_GetOpacity, etc
 #include "mozilla/ScopeExit.h"      // for MakeScopeExit
 #include "mozilla/StaticPrefs_apz.h"
@@ -44,7 +45,6 @@
 #  include "mozilla/layers/UiCompositorControllerParent.h"
 #  include "mozilla/widget/AndroidCompositorWidget.h"
 #endif
-#include "GeckoProfiler.h"
 #include "FrameUniformityData.h"
 #include "TreeTraversal.h"  // for ForEachNode, BreadthFirstSearch
 #include "VsyncSource.h"

gfx/layers/composite/LayerManagerComposite.cpp

@@ -14,7 +14,6 @@
 #include "Diagnostics.h"
 #include "FPSCounter.h"           // for FPSState, FPSCounter
 #include "FrameMetrics.h"         // for FrameMetrics
-#include "GeckoProfiler.h"        // for profiler_*
 #include "ImageLayerComposite.h"  // for ImageLayerComposite
 #include "Layers.h"               // for Layer, ContainerLayer, etc
 #include "LayerScope.h"           // for LayerScope Tool
@@ -33,7 +32,8 @@
 #include "gfxRect.h"             // for gfxRect
 #include "gfxUtils.h"            // for frame color util
 #include "mozilla/Assertions.h"  // for MOZ_ASSERT, etc
-#include "mozilla/RefPtr.h"      // for RefPtr, already_AddRefed
+#include "mozilla/ProfilerLabels.h"
+#include "mozilla/RefPtr.h"  // for RefPtr, already_AddRefed
 #include "mozilla/StaticPrefs_gfx.h"
 #include "mozilla/StaticPrefs_layers.h"
 #include "mozilla/gfx/2D.h"             // for DrawTarget
@@ -72,7 +72,6 @@
 #  include "mozilla/Unused.h"
 #  include "ScopedGLHelpers.h"
 #endif
-#include "GeckoProfiler.h"
 #include "TextRenderer.h"  // for TextRenderer
 #include "mozilla/layers/CompositorBridgeParent.h"
 #include "TreeTraversal.h"  // for ForEachNode

gfx/layers/composite/PaintedLayerComposite.cpp

@@ -20,13 +20,13 @@
 #include "mozilla/layers/Effects.h"      // for EffectChain
 #include "mozilla/layers/LayerManagerCompositeUtils.h"
 #include "mozilla/mozalloc.h"  // for operator delete
+#include "mozilla/ProfilerLabels.h"
 #include "nsAString.h"
 #include "mozilla/RefPtr.h"   // for nsRefPtr
 #include "nsISupportsImpl.h"  // for MOZ_COUNT_CTOR, etc
 #include "nsMathUtils.h"      // for NS_lround
 #include "nsString.h"         // for nsAutoCString
 #include "TextRenderer.h"
-#include "GeckoProfiler.h"
 
 namespace mozilla {
 namespace layers {

gfx/layers/ipc/CompositorBridgeParent.cpp

@@ -69,6 +69,8 @@
 #include "mozilla/mozalloc.h"                          // for operator new, etc
 #include "mozilla/PerfStats.h"
 #include "mozilla/PodOperations.h"
+#include "mozilla/ProfilerLabels.h"
+#include "mozilla/ProfilerMarkers.h"
 #include "mozilla/Telemetry.h"
 #ifdef MOZ_WIDGET_GTK
 #  include "basic/X11BasicCompositor.h"  // for X11BasicCompositor
@@ -84,7 +86,6 @@
 #  include "mozilla/widget/WinCompositorWidget.h"
 #  include "mozilla/WindowsVersion.h"
 #endif
-#include "GeckoProfiler.h"
 #include "mozilla/ipc/ProtocolTypes.h"
 #include "mozilla/Unused.h"
 #include "mozilla/Hal.h"

gfx/layers/ipc/ImageBridgeParent.cpp

@@ -7,9 +7,8 @@
 #include "ImageBridgeParent.h"
 #include <stdint.h>            // for uint64_t, uint32_t
 #include "CompositableHost.h"  // for CompositableParent, Create
-#include "GeckoProfiler.h"
-#include "base/process.h"  // for ProcessId
-#include "base/task.h"     // for CancelableTask, DeleteTask, etc
+#include "base/process.h"      // for ProcessId
+#include "base/task.h"         // for CancelableTask, DeleteTask, etc
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/gfx/Point.h"  // for IntSize
 #include "mozilla/Hal.h"        // for hal::SetCurrentThreadPriority()
@@ -27,6 +26,8 @@
 #include "mozilla/layers/Compositor.h"
 #include "mozilla/Monitor.h"
 #include "mozilla/mozalloc.h"  // for operator new, etc
+#include "mozilla/ProfilerLabels.h"
+#include "mozilla/ProfilerMarkers.h"
 #include "mozilla/Unused.h"
 #include "nsDebug.h"                 // for NS_ASSERTION, etc
 #include "nsISupportsImpl.h"         // for ImageBridgeParent::Release, etc

gfx/layers/ipc/LayerTransactionParent.cpp

@@ -38,7 +38,8 @@
 #include "nsPoint.h"          // for nsPoint
 #include "nsTArray.h"         // for nsTArray, nsTArray_Impl, etc
 #include "TreeTraversal.h"    // for ForEachNode
-#include "GeckoProfiler.h"
+#include "mozilla/ProfilerLabels.h"
+#include "mozilla/ProfilerMarkers.h"
 #include "mozilla/layers/TextureHost.h"
 #include "mozilla/layers/AsyncCompositionManager.h"
 

gfx/layers/ipc/ShadowLayers.cpp

@@ -10,7 +10,6 @@
 #include <vector>  // for vector
 
 #include "ClientLayerManager.h"  // for ClientLayerManager
-#include "GeckoProfiler.h"       // for AUTO_PROFILER_LABEL
 #include "IPDLActor.h"
 #include "ISurfaceAllocator.h"    // for IsSurfaceDescriptorValid
 #include "Layers.h"               // for Layer
@@ -35,6 +34,7 @@
 #  include "mozilla/layers/TextureSync.h"
 #endif
 #include "ShadowLayerUtils.h"
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/ReentrantMonitor.h"
 #include "mozilla/StaticPrefs_layers.h"
 #include "mozilla/layers/TextureClient.h"  // for TextureClient

gfx/layers/opengl/CompositorOGL.cpp

@@ -20,6 +20,7 @@
 #include "gfxUtils.h"               // for gfxUtils, etc
 #include "mozilla/ArrayUtils.h"     // for ArrayLength
 #include "mozilla/Preferences.h"    // for Preferences
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/StaticPrefs_gfx.h"
 #include "mozilla/StaticPrefs_layers.h"
 #include "mozilla/StaticPrefs_nglayout.h"
@@ -66,8 +67,6 @@
 #  include "mozilla/layers/AndroidHardwareBuffer.h"
 #endif
 
-#include "GeckoProfiler.h"
-
 namespace mozilla {
 
 using namespace gfx;

gfx/layers/wr/WebRenderCommandBuilder.cpp

@@ -11,6 +11,7 @@
 #include "mozilla/AutoRestore.h"
 #include "mozilla/DebugOnly.h"
 #include "mozilla/EffectCompositor.h"
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/StaticPrefs_gfx.h"
 #include "mozilla/SVGGeometryFrame.h"
 #include "mozilla/UniquePtr.h"

gfx/thebes/gfxContext.cpp

@@ -18,10 +18,10 @@
 #include "gfxPattern.h"
 #include "gfxPlatform.h"
 
-#include "GeckoProfiler.h"
 #include "gfx2DGlue.h"
 #include "mozilla/gfx/PathHelpers.h"
 #include "mozilla/gfx/DrawTargetTiled.h"
+#include "mozilla/ProfilerLabels.h"
 #include <algorithm>
 #include "TextDrawTarget.h"
 

gfx/thebes/gfxDWriteFontList.cpp

@@ -14,6 +14,7 @@
 #include "nsServiceManagerUtils.h"
 #include "nsCharSeparatedTokenizer.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/Sprintf.h"
 #include "mozilla/StaticPrefs_gfx.h"
 #include "mozilla/Telemetry.h"

gfx/thebes/gfxFontEntry.cpp

@@ -5,7 +5,6 @@
 
 #include "gfxFontEntry.h"
 
-#include "GeckoProfiler.h"
 #include "mozilla/DebugOnly.h"
 #include "mozilla/FontPropertyTypes.h"
 #include "mozilla/MathAlgorithms.h"
@@ -35,6 +34,7 @@
 #include "mozilla/Likely.h"
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/ScopeExit.h"
 #include "mozilla/Services.h"
 #include "mozilla/StaticPrefs_layout.h"

gfx/thebes/gfxGDIFontList.cpp

@@ -24,9 +24,9 @@
 #include "nsDirectoryServiceDefs.h"
 #include "nsAppDirectoryServiceDefs.h"
 #include "gfxFontConstants.h"
-#include "GeckoProfiler.h"
 
 #include "mozilla/MemoryReporting.h"
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/StaticPrefs_gfx.h"
 #include "mozilla/Telemetry.h"
 

gfx/thebes/gfxMacPlatformFontList.mm

@@ -70,6 +70,7 @@
 #include "mozilla/FontPropertyTypes.h"
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/Sprintf.h"
 #include "mozilla/StaticPrefs_gfx.h"
 #include "mozilla/Telemetry.h"

gfx/thebes/gfxUserFontSet.cpp

@@ -5,12 +5,12 @@
 
 #include "mozilla/Logging.h"
 
-#include "GeckoProfiler.h"
 #include "gfxUserFontSet.h"
 #include "gfxPlatform.h"
 #include "gfxFontConstants.h"
 #include "mozilla/FontPropertyTypes.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/Services.h"
 #include "mozilla/StaticPrefs_gfx.h"
 #include "mozilla/Telemetry.h"

gfx/thebes/gfxUtils.cpp

@@ -31,6 +31,7 @@
 #include "mozilla/layers/SynchronousTask.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/ServoStyleConsts.h"
 #include "mozilla/StaticPrefs_gfx.h"
@@ -48,7 +49,6 @@
 #include "nsPresContext.h"
 #include "nsRegion.h"
 #include "nsServiceManagerUtils.h"
-#include "GeckoProfiler.h"
 #include "ImageContainer.h"
 #include "ImageRegion.h"
 #include "gfx2DGlue.h"

gfx/thebes/gfxWindowsPlatform.cpp

@@ -20,6 +20,7 @@
 #include "nsUnicodeProperties.h"
 
 #include "mozilla/Preferences.h"
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/Services.h"
 #include "mozilla/Sprintf.h"
 #include "mozilla/WindowsVersion.h"
@@ -28,7 +29,6 @@
 #include "nsTArray.h"
 #include "nsThreadUtils.h"
 #include "mozilla/Telemetry.h"
-#include "GeckoProfiler.h"
 
 #include "plbase64.h"
 #include "nsIXULRuntime.h"

gfx/webrender_bindings/RenderCompositorNative.cpp

@@ -8,6 +8,8 @@
 
 #include "GLContext.h"
 #include "GLContextProvider.h"
+#include "mozilla/ProfilerLabels.h"
+#include "mozilla/ProfilerMarkers.h"
 #include "mozilla/gfx/gfxVars.h"
 #include "mozilla/gfx/Logging.h"
 #include "mozilla/layers/CompositionRecorder.h"

image/DecodePool.cpp

@@ -10,6 +10,7 @@
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/DebugOnly.h"
 #include "mozilla/Monitor.h"
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/SchedulerGroup.h"
 #include "mozilla/Services.h"
 #include "mozilla/StaticPrefs_image.h"
@@ -23,7 +24,6 @@
 #include "prsystem.h"
 
 #include "Decoder.h"
-#include "GeckoProfiler.h"
 #include "IDecodingTask.h"
 #include "RasterImage.h"
 

image/Decoder.cpp

@@ -6,12 +6,12 @@
 #include "Decoder.h"
 
 #include "DecodePool.h"
-#include "GeckoProfiler.h"
 #include "IDecodingTask.h"
 #include "ISurfaceProvider.h"
 #include "gfxPlatform.h"
 #include "mozilla/gfx/2D.h"
 #include "mozilla/gfx/Point.h"
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/Telemetry.h"
 #include "nsComponentManagerUtils.h"
 #include "nsProxyRelease.h"

image/FrameAnimator.cpp

@@ -4,7 +4,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "FrameAnimator.h"
-#include "GeckoProfiler.h"
 
 #include <utility>
 
@@ -12,6 +11,7 @@
 #include "RasterImage.h"
 #include "imgIContainer.h"
 #include "mozilla/CheckedInt.h"
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/StaticPrefs_image.h"
 
 namespace mozilla {

image/VectorImage.cpp

@@ -5,7 +5,6 @@
 
 #include "VectorImage.h"
 
-#include "GeckoProfiler.h"
 #include "gfx2DGlue.h"
 #include "gfxContext.h"
 #include "gfxDrawable.h"
@@ -23,6 +22,7 @@
 #include "mozilla/layers/LayerManager.h"
 #include "mozilla/PendingAnimationTracker.h"
 #include "mozilla/PresShell.h"
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/SVGObserverUtils.h"  // for SVGRenderingObserver
 #include "mozilla/Tuple.h"

image/imgFrame.cpp

@@ -17,7 +17,6 @@
 
 #include "gfxUtils.h"
 
-#include "GeckoProfiler.h"
 #include "MainThreadUtils.h"
 #include "mozilla/CheckedInt.h"
 #include "mozilla/gfx/gfxVars.h"
@@ -27,6 +26,7 @@
 #include "mozilla/layers/SourceSurfaceVolatileData.h"
 #include "mozilla/Likely.h"
 #include "mozilla/MemoryReporting.h"
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/StaticPrefs_browser.h"
 #include "mozilla/StaticPrefs_image.h"
 #include "nsMargin.h"

image/imgLoader.cpp

@@ -25,6 +25,7 @@
 #include "mozilla/LoadInfo.h"
 #include "mozilla/NullPrincipal.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/StaticPrefs_image.h"
 #include "mozilla/StaticPrefs_network.h"
 #include "mozilla/dom/ContentParent.h"
@@ -2161,10 +2162,8 @@ nsresult imgLoader::LoadImage(
   auto makeStaticIfNeeded = mozilla::MakeScopeExit(
       [&] { MakeRequestStaticIfNeeded(aLoadingDocument, _retval); });
 
-#ifdef MOZ_GECKO_PROFILER
   AUTO_PROFILER_LABEL_DYNAMIC_NSCSTRING("imgLoader::LoadImage", NETWORK,
                                         aURI->GetSpecOrDefault());
-#endif
 
   LOG_SCOPE_WITH_PARAM(gImgLog, "imgLoader::LoadImage", "aURI", aURI);
 

ipc/chromium/src/base/message_pump_libevent.cc

@@ -18,8 +18,8 @@
 #include "base/time.h"
 #include "nsDependentSubstring.h"
 #include "event.h"
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/UniquePtr.h"
-#include "GeckoProfiler.h"
 
 // This macro checks that the _EVENT_SIZEOF_* constants defined in
 // ipc/chromiume/src/third_party/<platform>/event2/event-config.h are correct.

ipc/chromium/src/base/message_pump_win.cc

@@ -11,8 +11,8 @@
 #include "base/message_loop.h"
 #include "base/histogram.h"
 #include "base/win_util.h"
+#include "mozilla/ProfilerLabels.h"
 #include "WinUtils.h"
-#include "GeckoProfiler.h"
 
 using base::Time;
 

js/xpconnect/loader/mozJSComponentLoader.cpp

@@ -47,7 +47,6 @@
 #include "nsContentUtils.h"
 #include "nsReadableUtils.h"
 #include "nsXULAppAPI.h"
-#include "GeckoProfiler.h"
 #include "WrapperFactory.h"
 
 #include "AutoMemMap.h"
@@ -58,6 +57,8 @@
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/MacroForEach.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/ProfilerLabels.h"
+#include "mozilla/ProfilerMarkers.h"
 #include "mozilla/ResultExtensions.h"
 #include "mozilla/ScriptPreloader.h"
 #include "mozilla/ScopeExit.h"

js/xpconnect/loader/mozJSSubScriptLoader.cpp

@@ -26,6 +26,8 @@
 
 #include "mozilla/ContentPrincipal.h"
 #include "mozilla/dom/ScriptLoader.h"
+#include "mozilla/ProfilerLabels.h"
+#include "mozilla/ProfilerMarkers.h"
 #include "mozilla/ScriptPreloader.h"
 #include "mozilla/SystemPrincipal.h"
 #include "mozilla/scache/StartupCache.h"
@@ -34,7 +36,6 @@
 #include "mozilla/Utf8.h"  // mozilla::Utf8Unit
 #include "nsContentUtils.h"
 #include "nsString.h"
-#include "GeckoProfiler.h"
 
 using namespace mozilla::scache;
 using namespace JS;

js/xpconnect/src/JSServices.cpp

@@ -5,9 +5,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "xpcprivate.h"
-#include "GeckoProfiler.h"
 #include "StaticComponents.h"
 #include "mozilla/ErrorResult.h"
+#include "mozilla/ProfilerLabels.h"
 #include "js/String.h"  // JS::LinearStringHasLatin1Chars
 #include "nsJSUtils.h"
 

js/xpconnect/src/XPCJSRuntime.cpp

@@ -67,6 +67,7 @@
 #include "mozilla/Atomics.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/ProcessHangMonitor.h"
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/Sprintf.h"
 #include "mozilla/UniquePtrExtensions.h"
 #include "mozilla/Unused.h"
@@ -74,7 +75,6 @@
 #include "nsGlobalWindow.h"
 #include "nsAboutProtocolUtils.h"
 
-#include "GeckoProfiler.h"
 #include "NodeUbiReporting.h"
 #include "nsIInputStream.h"
 #include "nsJSPrincipals.h"

layout/base/PresShell.cpp

@@ -164,7 +164,6 @@
 
 #include "mozilla/layers/CompositorBridgeChild.h"
 #include "ClientLayerManager.h"
-#include "GeckoProfiler.h"
 #include "gfxPlatform.h"
 #include "Layers.h"
 #include "LayerTreeInvalidation.h"
@@ -195,6 +194,8 @@
 #include "mozilla/layers/WebRenderLayerManager.h"
 #include "mozilla/layers/WebRenderUserData.h"
 #include "mozilla/layout/ScrollAnchorContainer.h"
+#include "mozilla/ProfilerLabels.h"
+#include "mozilla/ProfilerMarkers.h"
 #include "mozilla/ScrollTypes.h"
 #include "mozilla/ServoBindings.h"
 #include "mozilla/ServoStyleSet.h"
@@ -6232,9 +6233,7 @@ void PresShell::Paint(nsView* aViewToPaint, const nsRegion& aDirtyRegion,
     uri = contentRoot->GetDocumentURI();
   }
   url = uri ? uri->GetSpecOrDefault() : "N/A"_ns;
-#ifdef MOZ_GECKO_PROFILER
   AUTO_PROFILER_LABEL_DYNAMIC_NSCSTRING("PresShell::Paint", GRAPHICS, url);
-#endif
 
   Maybe<js::AutoAssertNoContentJS> nojs;
 

layout/base/RestyleManager.cpp

@@ -18,6 +18,7 @@
 #include "mozilla/layout/ScrollAnchorContainer.h"
 #include "mozilla/PresShell.h"
 #include "mozilla/PresShellInlines.h"
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/ServoBindings.h"
 #include "mozilla/ServoStyleSetInlines.h"
 #include "mozilla/StaticPrefs_layout.h"

layout/base/nsCSSFrameConstructor.cpp

@@ -30,6 +30,8 @@
 #include "mozilla/PresShell.h"
 #include "mozilla/PresShellInlines.h"
 #include "mozilla/PrintedSheetFrame.h"
+#include "mozilla/ProfilerLabels.h"
+#include "mozilla/ProfilerMarkers.h"
 #include "mozilla/ScopeExit.h"
 #include "mozilla/ServoBindings.h"
 #include "mozilla/ServoStyleSetInlines.h"
@@ -130,10 +132,6 @@
 #include "nsTextNode.h"
 #include "ActiveLayerTracker.h"
 
-#ifdef MOZ_GECKO_PROFILER
-#  include "mozilla/ProfilerMarkerTypes.h"
-#endif
-
 using namespace mozilla;
 using namespace mozilla::dom;
 

layout/base/nsLayoutUtils.cpp

@@ -13,7 +13,6 @@
 #include "ClientLayerManager.h"
 #include "DisplayItemClip.h"
 #include "FrameLayerBuilder.h"
-#include "GeckoProfiler.h"
 #include "gfx2DGlue.h"
 #include "gfxContext.h"
 #include "gfxDrawable.h"
@@ -73,6 +72,8 @@
 #include "mozilla/PerfStats.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/PresShell.h"
+#include "mozilla/ProfilerLabels.h"
+#include "mozilla/ProfilerMarkers.h"
 #include "mozilla/RestyleManager.h"
 #include "mozilla/ScrollOrigin.h"
 #include "mozilla/ServoStyleSet.h"

layout/generic/ScrollAnchorContainer.cpp

@@ -6,9 +6,9 @@
 
 #include "ScrollAnchorContainer.h"
 
-#include "GeckoProfiler.h"
 #include "mozilla/dom/Text.h"
 #include "mozilla/PresShell.h"
+#include "mozilla/ProfilerLabels.h"
 #include "mozilla/StaticPrefs_layout.h"
 #include "mozilla/ToString.h"
 #include "nsBlockFrame.h"