Backed out changeset 5cbae203cad2 (bug 1054149) for bustage ON A CLOSED TREE

This commit is contained in:
Nigel Babu 2014-08-15 12:34:58 +05:30
parent cd7474086f
commit fb155d49e8
5 changed files with 10 additions and 10 deletions

View File

@ -17,8 +17,8 @@ namespace mozilla {
// Thread and type safe wrapper around nsDeque.
template <class T>
class MediaQueueDeallocator : public nsDequeFunctor {
virtual void* operator() (void* aObject) {
delete static_cast<T*>(aObject);
virtual void* operator() (void* anObject) {
delete static_cast<T*>(anObject);
return nullptr;
}
};

View File

@ -25,10 +25,10 @@ PRLogModuleInfo* GetDemuxerLog();
namespace mozilla {
AppleATDecoder::AppleATDecoder(const mp4_demuxer::AudioDecoderConfig& aConfig,
MediaTaskQueue* aAudioTaskQueue,
MediaTaskQueue* anAudioTaskQueue,
MediaDataDecoderCallback* aCallback)
: mConfig(aConfig)
, mTaskQueue(aAudioTaskQueue)
, mTaskQueue(anAudioTaskQueue)
, mCallback(aCallback)
, mConverter(nullptr)
, mStream(nullptr)

View File

@ -18,8 +18,8 @@ public:
MemoryFunctor() : mSize(0) {}
MOZ_DEFINE_MALLOC_SIZE_OF(MallocSizeOf);
virtual void* operator()(void* aObject) {
const AudioData* audioData = static_cast<const AudioData*>(aObject);
virtual void* operator()(void* anObject) {
const AudioData* audioData = static_cast<const AudioData*>(anObject);
mSize += audioData->SizeOfIncludingThis(MallocSizeOf);
return nullptr;
}

View File

@ -65,8 +65,8 @@ private:
};
class ResourceQueueDeallocator : public nsDequeFunctor {
virtual void* operator() (void* aObject) {
delete static_cast<ResourceItem*>(aObject);
virtual void* operator() (void* anObject) {
delete static_cast<ResourceItem*>(anObject);
return nullptr;
}
};

View File

@ -57,8 +57,8 @@ private:
// Thread and type safe wrapper around nsDeque.
class PacketQueueDeallocator : public nsDequeFunctor {
virtual void* operator() (void* aObject) {
delete static_cast<NesteggPacketHolder*>(aObject);
virtual void* operator() (void* anObject) {
delete static_cast<NesteggPacketHolder*>(anObject);
return nullptr;
}
};