author | Nick Fitzgerald <fitzgen@gmail.com> |
Mon, 14 Mar 2016 11:44:00 +0100 | |
changeset 288957 | ffdeaea4ceae |
parent 288956 | 3a99126a3b55 |
child 288958 | e109baaf9e01 |
push id | 30093 |
push user | kwierso@gmail.com |
push date | Wed, 16 Mar 2016 23:33:15 +0000 |
treeherder | mozilla-central@20218dd51efa [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | vporof |
bugs | 1253516 |
milestone | 48.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
|
--- a/docshell/base/timeline/TimelineConsumers.cpp +++ b/docshell/base/timeline/TimelineConsumers.cpp @@ -295,17 +295,16 @@ TimelineConsumers::AddMarkerForAllObserv } void TimelineConsumers::PopMarkers(nsDocShell* aDocShell, JSContext* aCx, nsTArray<dom::ProfileTimelineMarker>& aStore) { MOZ_ASSERT(NS_IsMainThread()); - StaticMutexAutoLock lock(sMutex); // for `mMarkersStores`. if (!aDocShell || !aDocShell->mObserved) { return; } aDocShell->mObserved->PopMarkers(aCx, aStore); }