Commit 7dbe315e authored by Gerald Squelart's avatar Gerald Squelart
Browse files

Bug 1398999 - nsDequeFunctor::operator() doesn't need to return anything - r=froydnj 

Its return value is never used, and most implementations return nullptr anyway.

MozReview-Commit-ID: 8rxC053mmE8

--HG--
extra : rebase_source : 61a0b8b1373396182efd27d3c01b96e5e5541364
parent 2952493f

dom/media/MediaDecoderStateMachine.cpp

+2 −4
Original line number Diff line number Diff line
@@ -3787,11 +3787,10 @@ public: 


  MOZ_DEFINE_MALLOC_SIZE_OF(MallocSizeOf);



  virtual void* operator()(void* aObject)

  virtual void operator()(void* aObject)

  {

    const VideoData* v = static_cast<const VideoData*>(aObject);

    mSize += v->SizeOfIncludingThis(MallocSizeOf);

    return nullptr;

  }



  size_t mSize;
@@ -3807,11 +3806,10 @@ public: 


  MOZ_DEFINE_MALLOC_SIZE_OF(MallocSizeOf);



  virtual void* operator()(void* aObject)

  virtual void operator()(void* aObject)

  {

    const AudioData* audioData = static_cast<const AudioData*>(aObject);

    mSize += audioData->SizeOfIncludingThis(MallocSizeOf);

    return nullptr;

  }



  size_t mSize;

dom/media/MediaQueue.h

+2 −2
Original line number Diff line number Diff line
@@ -18,9 +18,9 @@ namespace mozilla { 
// Thread and type safe wrapper around nsDeque.

template <class T>

class MediaQueueDeallocator : public nsDequeFunctor {

  virtual void* operator() (void* aObject) {

  virtual void operator()(void* aObject)

  {

    RefPtr<T> releaseMe = dont_AddRef(static_cast<T*>(aObject));

    return nullptr;

  }

};

dom/media/gtest/TestAudioCompactor.cpp

+2 −2
Original line number Diff line number Diff line
@@ -17,10 +17,10 @@ public: 
  MemoryFunctor() : mSize(0) {}

  MOZ_DEFINE_MALLOC_SIZE_OF(MallocSizeOf);



  void* operator()(void* aObject) override {

  void operator()(void* aObject) override

  {

    const AudioData* audioData = static_cast<const AudioData*>(aObject);

    mSize += audioData->SizeOfIncludingThis(MallocSizeOf);

    return nullptr;

  }



  size_t mSize;

dom/media/mediasource/ResourceQueue.cpp

+2 −2
Original line number Diff line number Diff line
@@ -37,9 +37,9 @@ ResourceItem::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const 
}



class ResourceQueueDeallocator : public nsDequeFunctor {

  void* operator() (void* aObject) override {

  void operator()(void* aObject) override

  {

    delete static_cast<ResourceItem*>(aObject);

    return nullptr;

  }

};

dom/media/ogg/OggCodecState.h

+1 −2
Original line number Diff line number Diff line
@@ -48,10 +48,9 @@ using OggPacketPtr = UniquePtr<ogg_packet, OggPacketDeletePolicy>; 
// Deallocates a packet, used in OggPacketQueue below.

class OggPacketDeallocator : public nsDequeFunctor

{

  virtual void* operator()(void* aPacket)

  virtual void operator()(void* aPacket)

  {

    OggPacketDeletePolicy()(static_cast<ogg_packet*>(aPacket));

    return nullptr;

  }

};