Merge mozilla-central to mozilla-inbound

2015-06-03 13:54:38 +02:00
parent 9c05ceec3d 4e3b5cd82a
commit c8acebdbeb
74 changed files with 1258 additions and 744 deletions
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -2998,6 +2998,7 @@ nsDocShell::PopProfileTimelineMarkers(
      marker->mName = NS_ConvertUTF8toUTF16(startPayload->GetName());
      marker->mStart = startPayload->GetTime();
      marker->mEnd = startPayload->GetTime();
+      marker->mStack = startPayload->GetStack();
      startPayload->AddDetails(aCx, *marker);
      continue;
    }