Bug 1375776 (part 2) - Combine the two TracingMarkerPayload constructors. r=mstange.

--HG--
extra : rebase_source : 60ce2839cfebffbd2071b5821041fabc34c1ffe2

tools/profiler/core/ProfilerMarkerPayload.cpp

@@ -53,13 +53,6 @@ ProfilerMarkerPayload::StreamCommonProps(const char* aMarkerType,
   }
 }
 
-TracingMarkerPayload::TracingMarkerPayload(const char* aCategory,
-                                           TracingKind aKind)
-  : mCategory(aCategory)
-  , mKind(aKind)
-{
-}
-
 TracingMarkerPayload::TracingMarkerPayload(const char* aCategory,
                                            TracingKind aKind,
                                            UniqueProfilerBacktrace aCause)

tools/profiler/public/ProfilerMarkerPayload.h

@@ -67,9 +67,8 @@ private:
 class TracingMarkerPayload : public ProfilerMarkerPayload
 {
 public:
-  TracingMarkerPayload(const char* aCategory, TracingKind aKind);
   TracingMarkerPayload(const char* aCategory, TracingKind aKind,
-                       UniqueProfilerBacktrace aCause);
+                       UniqueProfilerBacktrace aCause = nullptr);
 
   virtual void StreamPayload(SpliceableJSONWriter& aWriter,
                              const mozilla::TimeStamp& aProcessStartTime,
@@ -141,7 +140,7 @@ class LayerTranslationMarkerPayload : public ProfilerMarkerPayload
 {
 public:
   LayerTranslationMarkerPayload(mozilla::layers::Layer* aLayer,
-                          mozilla::gfx::Point aPoint);
+                                mozilla::gfx::Point aPoint);
 
   virtual void StreamPayload(SpliceableJSONWriter& aWriter,
                              const mozilla::TimeStamp& aProcessStartTime,