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

Bug 1118613 - Mark virtual overridden functions as MOZ_OVERRIDE in dom/media; r=kinetik

Browse Source
This commit is contained in:
Ehsan Akhgari 2015-01-06 23:52:18 -05:00
parent 8d58942592
commit 8e2b574163
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dom/media/gtest/MockMediaResource.h
View File

@ -38,7 +38,7 @@ public:
return NS_OK;
}
virtual nsresult ReadAt(int64_t aOffset, char* aBuffer, uint32_t aCount,
uint32_t* aBytes);
uint32_t* aBytes) MOZ_OVERRIDE;
virtual nsresult Seek(int32_t aWhence, int64_t aOffset) MOZ_OVERRIDE
{
return NS_OK;
@ -57,7 +57,7 @@ public:
virtual bool IsSuspendedByCache() MOZ_OVERRIDE { return false; }
virtual bool IsSuspended() MOZ_OVERRIDE { return false; }
virtual nsresult ReadFromCache(char* aBuffer, int64_t aOffset,
uint32_t aCount)
uint32_t aCount) MOZ_OVERRIDE
{
return NS_OK;
}

24
dom/media/webrtc/MediaEngineTabVideoSource.h
View File

@ -18,27 +18,27 @@ class MediaEngineTabVideoSource : public MediaEngineVideoSource, nsIDOMEventList
NS_DECL_NSITIMERCALLBACK
MediaEngineTabVideoSource();
virtual void GetName(nsAString_internal&);
virtual void GetUUID(nsAString_internal&);
virtual void GetName(nsAString_internal&) MOZ_OVERRIDE;
virtual void GetUUID(nsAString_internal&) MOZ_OVERRIDE;
virtual nsresult Allocate(const VideoTrackConstraintsN &,
const mozilla::MediaEnginePrefs&);
virtual nsresult Deallocate();
virtual nsresult Start(mozilla::SourceMediaStream*, mozilla::TrackID);
virtual void SetDirectListeners(bool aHasDirectListeners) {};
const mozilla::MediaEnginePrefs&) MOZ_OVERRIDE;
virtual nsresult Deallocate() MOZ_OVERRIDE;
virtual nsresult Start(mozilla::SourceMediaStream*, mozilla::TrackID) MOZ_OVERRIDE;
virtual void SetDirectListeners(bool aHasDirectListeners) MOZ_OVERRIDE {};
virtual void NotifyPull(mozilla::MediaStreamGraph*, mozilla::SourceMediaStream*, mozilla::TrackID, mozilla::StreamTime) MOZ_OVERRIDE;
virtual nsresult Stop(mozilla::SourceMediaStream*, mozilla::TrackID);
virtual nsresult Config(bool, uint32_t, bool, uint32_t, bool, uint32_t, int32_t);
virtual bool IsFake();
virtual const MediaSourceType GetMediaSource() {
virtual nsresult Stop(mozilla::SourceMediaStream*, mozilla::TrackID) MOZ_OVERRIDE;
virtual nsresult Config(bool, uint32_t, bool, uint32_t, bool, uint32_t, int32_t) MOZ_OVERRIDE;
virtual bool IsFake() MOZ_OVERRIDE;
virtual const MediaSourceType GetMediaSource() MOZ_OVERRIDE {
return MediaSourceType::Browser;
}
virtual bool SatisfiesConstraintSets(
const nsTArray<const dom::MediaTrackConstraintSet*>& aConstraintSets)
const nsTArray<const dom::MediaTrackConstraintSet*>& aConstraintSets) MOZ_OVERRIDE
{
return true;
}
virtual nsresult TakePhoto(PhotoCallback* aCallback)
virtual nsresult TakePhoto(PhotoCallback* aCallback) MOZ_OVERRIDE
{
return NS_ERROR_NOT_IMPLEMENTED;
}

6
dom/media/webspeech/synth/ipc/SpeechSynthesisChild.h
View File

@ -82,11 +82,11 @@ public:
NS_IMETHOD SendAudioNative(int16_t* aData, uint32_t aDataLen) MOZ_OVERRIDE;
virtual void Pause();
virtual void Pause() MOZ_OVERRIDE;
virtual void Resume();
virtual void Resume() MOZ_OVERRIDE;
virtual void Cancel();
virtual void Cancel() MOZ_OVERRIDE;
private:
SpeechSynthesisRequestChild* mActor;

2
dom/media/webspeech/synth/nsSpeechTask.cpp
View File

@ -68,7 +68,7 @@ public:
}
}
virtual void NotifyBlockingChanged(MediaStreamGraph* aGraph, Blocking aBlocked)
virtual void NotifyBlockingChanged(MediaStreamGraph* aGraph, Blocking aBlocked) MOZ_OVERRIDE
{
if (aBlocked == MediaStreamListener::UNBLOCKED && !mStarted) {
mStarted = true;