Bug 1332577 (part 4) - Inline and remove GeckoProfilerTypes.h. r=mstange.
authorNicholas Nethercote <nnethercote@mozilla.com>
Fri, 20 Jan 2017 10:14:01 +1100
changeset 375513 5601e95a30ff9d8bcbb66bcc6554c2a9fc03fde5
parent 375512 814905af775483901d36ea02eef8c93c9a90688e
child 375514 03d2b4964c1604f1331733f79b78ef532afc452d
push id6996
push userjlorenzo@mozilla.com
push dateMon, 06 Mar 2017 20:48:21 +0000
treeherdermozilla-beta@d89512dab048 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmstange
bugs1332577
milestone53.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1332577 (part 4) - Inline and remove GeckoProfilerTypes.h. r=mstange. It's only included once, so there's no point having a separate file.
tools/profiler/moz.build
tools/profiler/public/GeckoProfiler.h
tools/profiler/public/GeckoProfilerTypes.h
--- a/tools/profiler/moz.build
+++ b/tools/profiler/moz.build
@@ -121,17 +121,16 @@ if CONFIG['MOZ_ENABLE_PROFILER_SPS']:
 IPDL_SOURCES += [
     'gecko/ProfilerTypes.ipdlh',
 ]
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 EXPORTS += [
     'public/GeckoProfiler.h',
-    'public/GeckoProfilerTypes.h',
 ]
 
 if CONFIG['MOZ_TASK_TRACER']:
     EXPORTS += [
         'tasktracer/GeckoTaskTracer.h',
         'tasktracer/GeckoTaskTracerImpl.h',
         'tasktracer/SourceEventTypeMap.h',
         'tasktracer/TracedTaskCommon.h',
--- a/tools/profiler/public/GeckoProfiler.h
+++ b/tools/profiler/public/GeckoProfiler.h
@@ -53,17 +53,16 @@
 #include <stdarg.h>
 
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
 #include "js/TypeDecls.h"
 #include "mozilla/GuardObjects.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/Vector.h"
-#include "GeckoProfilerTypes.h"
 
 namespace mozilla {
 class TimeStamp;
 
 namespace dom {
 class Promise;
 } // namespace dom
 
@@ -75,16 +74,25 @@ enum TracingMetadata {
   TRACING_DEFAULT,
   TRACING_INTERVAL_START,
   TRACING_INTERVAL_END,
   TRACING_EVENT,
   TRACING_EVENT_BACKTRACE,
   TRACING_TIMESTAMP
 };
 
+class ProfilerBacktrace;
+
+struct ProfilerBacktraceDestructor
+{
+  void operator()(ProfilerBacktrace*);
+};
+using UniqueProfilerBacktrace =
+  mozilla::UniquePtr<ProfilerBacktrace, ProfilerBacktraceDestructor>;
+
 #if !defined(MOZ_ENABLE_PROFILER_SPS)
 
 // Insert a RAII in this scope to active a pseudo label. Any samples collected
 // in this scope will contain this annotation. For dynamic strings use
 // PROFILER_LABEL_PRINTF. Arguments must be string literals.
 #define PROFILER_LABEL(name_space, info, category) do {} while (0)
 
 // Similar to PROFILER_LABEL, PROFILER_LABEL_FUNC will push/pop the enclosing
deleted file mode 100644
--- a/tools/profiler/public/GeckoProfilerTypes.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * 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/. */
-// IWYU pragma: private, include "GeckoProfiler.h"
-
-#ifndef PROFILER_TYPES_H
-#define PROFILER_TYPES_H
-
-#include "mozilla/UniquePtr.h"
-
-class ProfilerBacktrace;
-
-struct ProfilerBacktraceDestructor
-{
-  void operator()(ProfilerBacktrace*);
-};
-using UniqueProfilerBacktrace =
-  mozilla::UniquePtr<ProfilerBacktrace, ProfilerBacktraceDestructor>;
-
-#endif // PROFILER_TYPES_H