wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1067744 - Make GMPMutex reentrant. r=jesup

Browse Source
This commit is contained in:
Chris Pearce 2014-09-16 20:15:14 +12:00
parent 958564b8ca
commit 4eaaed125c
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
content/media/gmp/GMPPlatform.cpp
View File

@ -257,7 +257,7 @@ GMPThreadImpl::Join()
}
GMPMutexImpl::GMPMutexImpl()
: mMutex("gmp-mutex")
: mMonitor("gmp-mutex")
{
MOZ_COUNT_CTOR(GMPMutexImpl);
}
@ -276,13 +276,13 @@ GMPMutexImpl::Destroy()
void
GMPMutexImpl::Acquire()
{
mMutex.Lock();
mMonitor.Lock();
}
void
GMPMutexImpl::Release()
{
mMutex.Unlock();
mMonitor.Unlock();
}
} // namespace gmp

2
content/media/gmp/GMPPlatform.h
View File

@ -46,7 +46,7 @@ public:
virtual void Destroy() MOZ_OVERRIDE;
private:
Mutex mMutex;
Monitor mMonitor;
};
} // namespace gmp

2
content/media/gmp/gmp-api/gmp-platform.h
View File

@ -53,6 +53,8 @@ public:
virtual void Join() = 0; // Deletes object after join completes.
};
// A re-entrant monitor; can be locked from the same thread multiple times.
// Must be unlocked the same number of times it's locked.
class GMPMutex {
public:
virtual ~GMPMutex() {}