From 1ee82e204d7ee53382be76ef25439c09072f9ad5 Mon Sep 17 00:00:00 2001 From: Andreas Pehrson Date: Mon, 8 Jan 2018 12:44:16 +0100 Subject: [PATCH] Bug 1428390 - Remove virtual keyword for overrides in PCameras impl. r=jib MozReview-Commit-ID: FqhgyTFXH5W --HG-- extra : rebase_source : d2b308bae88cf0ed70efda87ed725c6f96f96e35 --- dom/media/systemservices/CamerasChild.h | 30 ++++++++++----------- dom/media/systemservices/CamerasParent.h | 34 ++++++++++++------------ 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/dom/media/systemservices/CamerasChild.h b/dom/media/systemservices/CamerasChild.h index 0ade72e5df0a..b2029dbd6b9d 100644 --- a/dom/media/systemservices/CamerasChild.h +++ b/dom/media/systemservices/CamerasChild.h @@ -153,27 +153,27 @@ public: // IPC messages recevied, received on the PBackground thread // these are the actual callbacks with data - virtual mozilla::ipc::IPCResult RecvDeliverFrame(const CaptureEngine&, const int&, - mozilla::ipc::Shmem&&, - const VideoFrameProperties & prop) override; - virtual mozilla::ipc::IPCResult RecvFrameSizeChange(const CaptureEngine&, const int&, - const int& w, const int& h) override; + mozilla::ipc::IPCResult RecvDeliverFrame(const CaptureEngine&, const int&, + mozilla::ipc::Shmem&&, + const VideoFrameProperties & prop) override; + mozilla::ipc::IPCResult RecvFrameSizeChange(const CaptureEngine&, const int&, + const int& w, const int& h) override; - virtual mozilla::ipc::IPCResult RecvDeviceChange() override; - virtual int AddDeviceChangeCallback(DeviceChangeCallback* aCallback) override; + mozilla::ipc::IPCResult RecvDeviceChange() override; + int AddDeviceChangeCallback(DeviceChangeCallback* aCallback) override; int SetFakeDeviceChangeEvents(); // these are response messages to our outgoing requests - virtual mozilla::ipc::IPCResult RecvReplyNumberOfCaptureDevices(const int&) override; - virtual mozilla::ipc::IPCResult RecvReplyNumberOfCapabilities(const int&) override; - virtual mozilla::ipc::IPCResult RecvReplyAllocateCaptureDevice(const int&) override; - virtual mozilla::ipc::IPCResult RecvReplyGetCaptureCapability(const VideoCaptureCapability& capability) override; - virtual mozilla::ipc::IPCResult RecvReplyGetCaptureDevice(const nsCString& device_name, + mozilla::ipc::IPCResult RecvReplyNumberOfCaptureDevices(const int&) override; + mozilla::ipc::IPCResult RecvReplyNumberOfCapabilities(const int&) override; + mozilla::ipc::IPCResult RecvReplyAllocateCaptureDevice(const int&) override; + mozilla::ipc::IPCResult RecvReplyGetCaptureCapability(const VideoCaptureCapability& capability) override; + mozilla::ipc::IPCResult RecvReplyGetCaptureDevice(const nsCString& device_name, const nsCString& device_id, const bool& scary) override; - virtual mozilla::ipc::IPCResult RecvReplyFailure(void) override; - virtual mozilla::ipc::IPCResult RecvReplySuccess(void) override; - virtual void ActorDestroy(ActorDestroyReason aWhy) override; + mozilla::ipc::IPCResult RecvReplyFailure(void) override; + mozilla::ipc::IPCResult RecvReplySuccess(void) override; + void ActorDestroy(ActorDestroyReason aWhy) override; // the webrtc.org ViECapture calls are mirrored here, but with access // to a specific PCameras instance to communicate over. These also diff --git a/dom/media/systemservices/CamerasParent.h b/dom/media/systemservices/CamerasParent.h index e0850f272dc7..4d802760f46c 100644 --- a/dom/media/systemservices/CamerasParent.h +++ b/dom/media/systemservices/CamerasParent.h @@ -46,7 +46,7 @@ public: // These callbacks end up running on the VideoCapture thread. // From VideoCaptureCallback - virtual void OnFrame(const webrtc::VideoFrame& videoFrame) override; + void OnFrame(const webrtc::VideoFrame& videoFrame) override; friend CamerasParent; @@ -83,25 +83,25 @@ public: static already_AddRefed Create(); // Messages received form the child. These run on the IPC/PBackground thread. - virtual mozilla::ipc::IPCResult + mozilla::ipc::IPCResult RecvAllocateCaptureDevice(const CaptureEngine& aEngine, const nsCString& aUnique_idUTF8, const ipc::PrincipalInfo& aPrincipalInfo) override; - virtual mozilla::ipc::IPCResult RecvReleaseCaptureDevice(const CaptureEngine&, - const int&) override; - virtual mozilla::ipc::IPCResult RecvNumberOfCaptureDevices(const CaptureEngine&) override; - virtual mozilla::ipc::IPCResult RecvNumberOfCapabilities(const CaptureEngine&, - const nsCString&) override; - virtual mozilla::ipc::IPCResult RecvGetCaptureCapability(const CaptureEngine&, const nsCString&, - const int&) override; - virtual mozilla::ipc::IPCResult RecvGetCaptureDevice(const CaptureEngine&, const int&) override; - virtual mozilla::ipc::IPCResult RecvStartCapture(const CaptureEngine&, const int&, - const VideoCaptureCapability&) override; - virtual mozilla::ipc::IPCResult RecvStopCapture(const CaptureEngine&, const int&) override; - virtual mozilla::ipc::IPCResult RecvReleaseFrame(mozilla::ipc::Shmem&&) override; - virtual mozilla::ipc::IPCResult RecvAllDone() override; - virtual void ActorDestroy(ActorDestroyReason aWhy) override; - virtual mozilla::ipc::IPCResult RecvEnsureInitialized(const CaptureEngine&) override; + mozilla::ipc::IPCResult RecvReleaseCaptureDevice(const CaptureEngine&, + const int&) override; + mozilla::ipc::IPCResult RecvNumberOfCaptureDevices(const CaptureEngine&) override; + mozilla::ipc::IPCResult RecvNumberOfCapabilities(const CaptureEngine&, + const nsCString&) override; + mozilla::ipc::IPCResult RecvGetCaptureCapability(const CaptureEngine&, const nsCString&, + const int&) override; + mozilla::ipc::IPCResult RecvGetCaptureDevice(const CaptureEngine&, const int&) override; + mozilla::ipc::IPCResult RecvStartCapture(const CaptureEngine&, const int&, + const VideoCaptureCapability&) override; + mozilla::ipc::IPCResult RecvStopCapture(const CaptureEngine&, const int&) override; + mozilla::ipc::IPCResult RecvReleaseFrame(mozilla::ipc::Shmem&&) override; + mozilla::ipc::IPCResult RecvAllDone() override; + void ActorDestroy(ActorDestroyReason aWhy) override; + mozilla::ipc::IPCResult RecvEnsureInitialized(const CaptureEngine&) override; nsIEventTarget* GetBackgroundEventTarget() { return mPBackgroundEventTarget; }; bool IsShuttingDown()