Backed out changeset db713228c8e3 (bug 1425150) for wpt failures on core/platform.cpp r=abackout on a CLOSED TREE

This commit is contained in:
Narcis Beleuzu 2017-12-14 23:23:20 +02:00
Родитель cb3d418959
Коммит a8f33facb2
2 изменённых файлов: 0 добавлений и 17 удалений

Просмотреть файл

@ -539,7 +539,6 @@ AudioCallbackDriver::AudioCallbackDriver(MediaStreamGraphImpl* aGraphImpl)
, mMicrophoneActive(false)
, mShouldFallbackIfError(false)
, mFromFallback(false)
, mProfilerRegistered(false)
{
LOG(LogLevel::Debug, ("AudioCallbackDriver ctor for graph %p", aGraphImpl));
#if defined(XP_WIN)
@ -898,11 +897,6 @@ AudioCallbackDriver::DataCallback(const AudioDataValue* aInputBuffer,
AutoInCallback aic(this);
#endif
if (!mProfilerRegistered) {
mProfilerRegistered = true;
PROFILER_REGISTER_THREAD("AudioCallback");
}
GraphTime stateComputedTime = StateComputedTime();
if (stateComputedTime == 0) {
MonitorAutoLock mon(mGraphImpl->GetMonitor());
@ -1008,8 +1002,6 @@ AudioCallbackDriver::DataCallback(const AudioDataValue* aInputBuffer,
// Enter shutdown mode. The stable-state handler will detect this
// and complete shutdown if the graph does not get restarted.
mGraphImpl->SignalMainThreadCleanup();
PROFILER_UNREGISTER_THREAD();
return aFrames - 1;
}
@ -1032,7 +1024,6 @@ AudioCallbackDriver::DataCallback(const AudioDataValue* aInputBuffer,
NextDriver()->SetGraphTime(this, mIterationStart, mIterationEnd);
mGraphImpl->SetCurrentDriver(NextDriver());
NextDriver()->Start();
PROFILER_UNREGISTER_THREAD();
// Returning less than aFrames starts the draining and eventually stops the
// audio thread. This function will never get called again.
return aFrames - 1;
@ -1124,8 +1115,6 @@ AudioCallbackDriver::DeviceChangedCallback() {
#ifdef XP_MACOSX
PanOutputIfNeeded(mMicrophoneActive);
#endif
mProfilerRegistered = false;
}
void

Просмотреть файл

@ -566,12 +566,6 @@ private:
/* True if this driver was created from a driver created because of a previous
* AudioCallbackDriver failure. */
bool mFromFallback;
/* Whether or not the Gecko profiler has been registered for this thread.
* We reset this on device change, because the underlying thread is going to
* change.
* We de-register on the last iteration, and re-register on the first
* iteration of a new driver. */
Atomic<bool> mProfilerRegistered;
};
class AsyncCubebTask : public Runnable