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 1240411: P7. Clean up webspeech header declarations. r=rillian

Browse Source 
Remove redundant virtual keyword and add missing override if any.
This commit is contained in:
Jean-Yves Avenard 2016-01-18 14:45:08 +11:00
parent 7adacda53b
commit 6f5c0b249f
13 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/media/webspeech/recognition/SpeechGrammar.h
View File

@ -32,7 +32,7 @@ public:
nsISupports* GetParentObject() const;
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
static already_AddRefed<SpeechGrammar>
Constructor(const GlobalObject& aGlobal, ErrorResult& aRv);

2
dom/media/webspeech/recognition/SpeechGrammarList.h
View File

@ -37,7 +37,7 @@ public:
nsISupports* GetParentObject() const;
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
uint32_t Length() const;

2
dom/media/webspeech/recognition/SpeechRecognition.h
View File

@ -64,7 +64,7 @@ public:
nsISupports* GetParentObject() const;
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
static bool IsAuthorized(JSContext* aCx, JSObject* aGlobal);

2
dom/media/webspeech/recognition/SpeechRecognitionAlternative.h
View File

@ -31,7 +31,7 @@ public:
nsISupports* GetParentObject() const;
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
void GetTranscript(nsString& aRetVal) const;

2
dom/media/webspeech/recognition/SpeechRecognitionResult.h
View File

@ -32,7 +32,7 @@ public:
nsISupports* GetParentObject() const;
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
uint32_t Length() const;

2
dom/media/webspeech/recognition/SpeechRecognitionResultList.h
View File

@ -33,7 +33,7 @@ public:
nsISupports* GetParentObject() const;
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
uint32_t Length() const;

16
dom/media/webspeech/recognition/SpeechStreamListener.h
View File

@ -24,15 +24,15 @@ public:
explicit SpeechStreamListener(SpeechRecognition* aRecognition);
~SpeechStreamListener();
virtual void NotifyQueuedTrackChanges(MediaStreamGraph* aGraph, TrackID aID,
StreamTime aTrackOffset,
uint32_t aTrackEvents,
const MediaSegment& aQueuedMedia,
MediaStream* aInputStream,
TrackID aInputTrackID) override;
void NotifyQueuedTrackChanges(MediaStreamGraph* aGraph, TrackID aID,
StreamTime aTrackOffset,
uint32_t aTrackEvents,
const MediaSegment& aQueuedMedia,
MediaStream* aInputStream,
TrackID aInputTrackID) override;
virtual void NotifyEvent(MediaStreamGraph* aGraph,
MediaStreamListener::MediaStreamGraphEvent event) override;
void NotifyEvent(MediaStreamGraph* aGraph,
MediaStreamListener::MediaStreamGraphEvent event) override;
private:
template<typename SampleFormatType>

2
dom/media/webspeech/synth/SpeechSynthesis.h
View File

@ -39,7 +39,7 @@ public:
nsIDOMWindow* GetParentObject() const;
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
bool Pending() const;

2
dom/media/webspeech/synth/SpeechSynthesisUtterance.h
View File

@ -37,7 +37,7 @@ public:
nsISupports* GetParentObject() const;
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
static
already_AddRefed<SpeechSynthesisUtterance> Constructor(GlobalObject& aGlobal,

2
dom/media/webspeech/synth/SpeechSynthesisVoice.h
View File

@ -34,7 +34,7 @@ public:
nsISupports* GetParentObject() const;
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
void GetVoiceURI(nsString& aRetval) const;

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

@ -50,21 +50,21 @@ public:
virtual ~SpeechSynthesisRequestChild();
protected:
virtual bool RecvOnStart(const nsString& aUri) override;
bool RecvOnStart(const nsString& aUri) override;
virtual bool RecvOnEnd(const bool& aIsError,
const float& aElapsedTime,
const uint32_t& aCharIndex) override;
bool RecvOnEnd(const bool& aIsError,
const float& aElapsedTime,
const uint32_t& aCharIndex) override;
virtual bool RecvOnPause(const float& aElapsedTime, const uint32_t& aCharIndex) override;
bool RecvOnPause(const float& aElapsedTime, const uint32_t& aCharIndex) override;
virtual bool RecvOnResume(const float& aElapsedTime, const uint32_t& aCharIndex) override;
bool RecvOnResume(const float& aElapsedTime, const uint32_t& aCharIndex) override;
virtual bool RecvOnBoundary(const nsString& aName, const float& aElapsedTime,
const uint32_t& aCharIndex) override;
bool RecvOnBoundary(const nsString& aName, const float& aElapsedTime,
const uint32_t& aCharIndex) override;
virtual bool RecvOnMark(const nsString& aName, const float& aElapsedTime,
const uint32_t& aCharIndex) override;
bool RecvOnMark(const nsString& aName, const float& aElapsedTime,
const uint32_t& aCharIndex) override;
RefPtr<SpeechTaskChild> mTask;
};
@ -84,15 +84,15 @@ public:
NS_IMETHOD SendAudioNative(int16_t* aData, uint32_t aDataLen) override;
virtual void Pause() override;
void Pause() override;
virtual void Resume() override;
void Resume() override;
virtual void Cancel() override;
void Cancel() override;
virtual void ForceEnd() override;
void ForceEnd() override;
virtual void SetAudioOutputVolume(float aVolume) override;
void SetAudioOutputVolume(float aVolume) override;
private:
SpeechSynthesisRequestChild* mActor;

34
dom/media/webspeech/synth/ipc/SpeechSynthesisParent.h
View File

@ -22,7 +22,7 @@ class SpeechSynthesisParent : public PSpeechSynthesisParent
friend class SpeechSynthesisRequestParent;
public:
virtual void ActorDestroy(ActorDestroyReason aWhy) override;
void ActorDestroy(ActorDestroyReason aWhy) override;
bool RecvReadVoicesAndState(InfallibleTArray<RemoteVoice>* aVoices,
InfallibleTArray<nsString>* aDefaults,
@ -60,19 +60,19 @@ public:
protected:
virtual void ActorDestroy(ActorDestroyReason aWhy) override;
void ActorDestroy(ActorDestroyReason aWhy) override;
virtual bool RecvPause() override;
bool RecvPause() override;
virtual bool RecvResume() override;
bool RecvResume() override;
virtual bool RecvCancel() override;
bool RecvCancel() override;
virtual bool RecvForceEnd() override;
bool RecvForceEnd() override;
virtual bool RecvSetAudioOutputVolume(const float& aVolume) override;
bool RecvSetAudioOutputVolume(const float& aVolume) override;
virtual bool Recv__delete__() override;
bool Recv__delete__() override;
};
class SpeechTaskParent : public nsSpeechTask
@ -82,21 +82,21 @@ public:
SpeechTaskParent(float aVolume, const nsAString& aUtterance)
: nsSpeechTask(aVolume, aUtterance) {}
virtual nsresult DispatchStartImpl(const nsAString& aUri);
nsresult DispatchStartImpl(const nsAString& aUri);
virtual nsresult DispatchEndImpl(float aElapsedTime, uint32_t aCharIndex);
nsresult DispatchEndImpl(float aElapsedTime, uint32_t aCharIndex);
virtual nsresult DispatchPauseImpl(float aElapsedTime, uint32_t aCharIndex);
nsresult DispatchPauseImpl(float aElapsedTime, uint32_t aCharIndex);
virtual nsresult DispatchResumeImpl(float aElapsedTime, uint32_t aCharIndex);
nsresult DispatchResumeImpl(float aElapsedTime, uint32_t aCharIndex);
virtual nsresult DispatchErrorImpl(float aElapsedTime, uint32_t aCharIndex);
nsresult DispatchErrorImpl(float aElapsedTime, uint32_t aCharIndex);
virtual nsresult DispatchBoundaryImpl(const nsAString& aName,
float aElapsedTime, uint32_t aCharIndex);
nsresult DispatchBoundaryImpl(const nsAString& aName,
float aElapsedTime, uint32_t aCharIndex);
virtual nsresult DispatchMarkImpl(const nsAString& aName,
float aElapsedTime, uint32_t aCharIndex);
nsresult DispatchMarkImpl(const nsAString& aName,
float aElapsedTime, uint32_t aCharIndex);
private:
SpeechSynthesisRequestParent* mActor;

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

@ -52,8 +52,8 @@ public:
}
}
virtual void NotifyEvent(MediaStreamGraph* aGraph,
MediaStreamListener::MediaStreamGraphEvent event) override
void NotifyEvent(MediaStreamGraph* aGraph,
MediaStreamListener::MediaStreamGraphEvent event) override
{
switch (event) {
case EVENT_FINISHED:
@ -73,7 +73,7 @@ public:
}
}
virtual void NotifyBlockingChanged(MediaStreamGraph* aGraph, Blocking aBlocked) override
void NotifyBlockingChanged(MediaStreamGraph* aGraph, Blocking aBlocked) override
{
if (aBlocked == MediaStreamListener::UNBLOCKED && !mStarted) {
mStarted = true;