Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 13:25:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 848954 - Part 29 - Make sure to clear the right boolean flag when dispatching a stable state event. r=padenot

Browse Source
This commit is contained in:
Randell Jesup 2014-08-25 14:13:14 +02:00
parent 2d2000e11a
commit fadcfae452
3 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
content/media/AudioStream.cpp
View File

@ -686,7 +686,7 @@ AudioStream::SetVolume(double aVolume)
{
NS_ABORT_IF_FALSE(aVolume >= 0.0 && aVolume <= 1.0, "Invalid volume");
if (cubeb_stream_set_volume(mCubebStream, aVolume * CubebUtils::GetVolumeScale()) != CUBEB_OK) {
if (cubeb_stream_set_volume(mCubebStream.get(), aVolume * CubebUtils::GetVolumeScale()) != CUBEB_OK) {
NS_WARNING("Could not change volume on cubeb stream.");
}
}

23
content/media/MediaStreamGraph.cpp
View File

@ -1487,19 +1487,22 @@ private:
class MediaStreamGraphStableStateRunnable : public nsRunnable {
public:
explicit MediaStreamGraphStableStateRunnable(MediaStreamGraphImpl* aGraph)
explicit MediaStreamGraphStableStateRunnable(MediaStreamGraphImpl* aGraph,
bool aSourceIsMSG)
: mGraph(aGraph)
, mSourceIsMSG(aSourceIsMSG)
{
}
NS_IMETHOD Run()
{
if (mGraph) {
mGraph->RunInStableState();
mGraph->RunInStableState(mSourceIsMSG);
}
return NS_OK;
}
private:
MediaStreamGraphImpl* mGraph;
bool mSourceIsMSG;
};
/*
@ -1533,7 +1536,7 @@ public:
}
void
MediaStreamGraphImpl::RunInStableState()
MediaStreamGraphImpl::RunInStableState(bool aSourceIsMSG)
{
NS_ASSERTION(NS_IsMainThread(), "Must be called on main thread");
@ -1545,7 +1548,10 @@ MediaStreamGraphImpl::RunInStableState()
{
MonitorAutoLock lock(mMonitor);
mPostedRunInStableStateEvent = false;
if (aSourceIsMSG) {
MOZ_ASSERT(mPostedRunInStableStateEvent);
mPostedRunInStableStateEvent = false;
}
runnables.SwapElements(mUpdateRunnables);
for (uint32_t i = 0; i < mStreamUpdates.Length(); ++i) {
@ -1635,7 +1641,10 @@ MediaStreamGraphImpl::RunInStableState()
}
// Make sure we get a new current time in the next event loop task
mPostedRunInStableState = false;
if (!aSourceIsMSG) {
MOZ_ASSERT(mPostedRunInStableState);
mPostedRunInStableState = false;
}
for (uint32_t i = 0; i < runnables.Length(); ++i) {
runnables[i]->Run();
@ -1660,7 +1669,7 @@ MediaStreamGraphImpl::EnsureRunInStableState()
if (mPostedRunInStableState)
return;
mPostedRunInStableState = true;
nsCOMPtr<nsIRunnable> event = new MediaStreamGraphStableStateRunnable(this);
nsCOMPtr<nsIRunnable> event = new MediaStreamGraphStableStateRunnable(this, false);
nsCOMPtr<nsIAppShell> appShell = do_GetService(kAppShellCID);
if (appShell) {
appShell->RunInStableState(event);
@ -1677,7 +1686,7 @@ MediaStreamGraphImpl::EnsureStableStateEventPosted()
if (mPostedRunInStableStateEvent)
return;
mPostedRunInStableStateEvent = true;
nsCOMPtr<nsIRunnable> event = new MediaStreamGraphStableStateRunnable(this);
nsCOMPtr<nsIRunnable> event = new MediaStreamGraphStableStateRunnable(this, true);
NS_DispatchToMainThread(event);
}

3
content/media/MediaStreamGraphImpl.h
View File

@ -112,8 +112,9 @@ public:
* to the main thread while the main thread is not in the middle
* of a script. It runs during a "stable state" (per HTML5) or during
* an event posted to the main thread.
* The boolean affects which boolean controlling runnable dispatch is cleared
*/
void RunInStableState();
void RunInStableState(bool aSourceIsMSG);
/**
* Ensure a runnable to run RunInStableState is posted to the appshell to
* run at the next stable state (per HTML5).