Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 14:22:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1211766 - Remove AbstractMediaDecoder::GetReentrantMonitor(). r=jya.

Browse Source
This commit is contained in:
JW Wang 2015-09-30 07:04:49 +08:00
parent 48d057951d
commit aadc51ecc8
5 changed files with 1 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dom/media/AbstractMediaDecoder.h
View File

@ -48,10 +48,6 @@ enum class MediaDecoderEventVisibility : int8_t {
class AbstractMediaDecoder : public nsIObserver class AbstractMediaDecoder : public nsIObserver
{ {
public: public:
// Returns the monitor for other threads to synchronise access to
// state.
virtual ReentrantMonitor& GetReentrantMonitor() = 0;
// A special version of the above for the ogg decoder that is allowed to be // A special version of the above for the ogg decoder that is allowed to be
// called cross-thread. // called cross-thread.
virtual bool IsOggDecoderShutdown() { return false; } virtual bool IsOggDecoderShutdown() { return false; }

5
dom/media/MediaDecoder.cpp
View File

@ -1269,11 +1269,6 @@ MediaDecoder::SetStateMachine(MediaDecoderStateMachine* aStateMachine)
} }
} }
ReentrantMonitor&
MediaDecoder::GetReentrantMonitor() {
return mReentrantMonitor;
}
ImageContainer* ImageContainer*
MediaDecoder::GetImageContainer() MediaDecoder::GetImageContainer()
{ {

4
dom/media/MediaDecoder.h
View File

@ -524,10 +524,6 @@ public:
MediaDecoderStateMachine* GetStateMachine() const; MediaDecoderStateMachine* GetStateMachine() const;
void SetStateMachine(MediaDecoderStateMachine* aStateMachine); void SetStateMachine(MediaDecoderStateMachine* aStateMachine);
// Returns the monitor for other threads to synchronise access to
// state.
ReentrantMonitor& GetReentrantMonitor() override;
// Constructs the time ranges representing what segments of the media // Constructs the time ranges representing what segments of the media
// are buffered and playable. // are buffered and playable.
virtual media::TimeIntervals GetBuffered(); virtual media::TimeIntervals GetBuffered();

9
dom/media/webaudio/BufferDecoder.cpp
View File

@ -16,8 +16,7 @@ extern PRLogModuleInfo* gMediaDecoderLog;
NS_IMPL_ISUPPORTS0(BufferDecoder) NS_IMPL_ISUPPORTS0(BufferDecoder)
BufferDecoder::BufferDecoder(MediaResource* aResource) BufferDecoder::BufferDecoder(MediaResource* aResource)
: mReentrantMonitor("BufferDecoder") : mResource(aResource)
, mResource(aResource)
{ {
MOZ_ASSERT(NS_IsMainThread()); MOZ_ASSERT(NS_IsMainThread());
MOZ_COUNT_CTOR(BufferDecoder); MOZ_COUNT_CTOR(BufferDecoder);
@ -39,12 +38,6 @@ BufferDecoder::BeginDecoding(TaskQueue* aTaskQueueIdentity)
mTaskQueueIdentity = aTaskQueueIdentity; mTaskQueueIdentity = aTaskQueueIdentity;
} }
ReentrantMonitor&
BufferDecoder::GetReentrantMonitor()
{
return mReentrantMonitor;
}
bool bool
BufferDecoder::OnStateMachineTaskQueue() const BufferDecoder::OnStateMachineTaskQueue() const
{ {

7
dom/media/webaudio/BufferDecoder.h
View File

@ -31,8 +31,6 @@ public:
// This has to be called before decoding begins // This has to be called before decoding begins
void BeginDecoding(TaskQueue* aTaskQueueIdentity); void BeginDecoding(TaskQueue* aTaskQueueIdentity);
virtual ReentrantMonitor& GetReentrantMonitor() final override;
virtual bool OnStateMachineTaskQueue() const final override; virtual bool OnStateMachineTaskQueue() const final override;
virtual bool OnDecodeTaskQueue() const final override; virtual bool OnDecodeTaskQueue() const final override;
@ -67,11 +65,6 @@ public:
private: private:
virtual ~BufferDecoder(); virtual ~BufferDecoder();
// This monitor object is not really used to synchronize access to anything.
// It's just there in order for us to be able to override
// GetReentrantMonitor correctly.
ReentrantMonitor mReentrantMonitor;
nsRefPtr<TaskQueue> mTaskQueueIdentity; nsRefPtr<TaskQueue> mTaskQueueIdentity;
nsRefPtr<MediaResource> mResource; nsRefPtr<MediaResource> mResource;
}; };