Merge inbound to m-c. a=merge

2017-01-07 11:22:47 -05:00
parent de991c80ec 41c96bd920
commit 127c9e5534
258 changed files with 4983 additions and 2151 deletions
--- a/xpcom/build/MainThreadIOLogger.cpp
+++ b/xpcom/build/MainThreadIOLogger.cpp
@@ -173,12 +173,8 @@ MainThreadIOLoggerImpl::IOThreadFunc()
                       (i->mObservation.Start() - mLogStartTime).ToMilliseconds(),
                       i->mObservation.ObservedOperationString(), durationMs,
                       i->mObservation.Reference(), nativeFilename.get()) > 0) {
-          ProfilerBacktrace* stack = i->mStack;
-          if (stack) {
-            // TODO: Write out the callstack
-            //       (This will be added in a later bug)
-            profiler_free_backtrace(stack);
-          }
+          // TODO: Write out the callstack
+          i->mStack = nullptr;
        }
      }
    }