From 0f01791ffc33ad126af85ad10c66c9f62048308b Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Wed, 6 Feb 2019 15:58:43 +0000 Subject: [PATCH] Bug 1512990 - Part 4 - remove declarations of Recv/Answer methods from IPDL protocol base class; r=froydnj For cases where the class has direct calls (that is, we cast `this` to the subclass before making the call) no longer declare Recv/Answer methods on the base class at all. This should ensure that slots for them are not generated in vtables, and also allow the derived class to choose the method signature (e.g. whether it wants to take something by reference or by value). Differential Revision: https://phabricator.services.mozilla.com/D18132 --HG-- extra : moz-landing-system : lando --- .../HeapSnapshotTempFileHelperParent.h | 2 +- dom/base/nsContentPermissionHelper.h | 7 +- dom/cache/CacheParent.h | 2 +- dom/cache/CacheStorageParent.h | 2 +- dom/cache/CacheStreamControlChild.h | 4 +- dom/cache/CacheStreamControlParent.h | 6 +- dom/file/ipc/IPCBlobInputStreamChild.h | 5 +- dom/file/ipc/IPCBlobInputStreamParent.h | 6 +- dom/file/ipc/TemporaryIPCBlobChild.h | 2 +- dom/file/ipc/TemporaryIPCBlobParent.h | 4 +- dom/filehandle/ActorsParent.h | 4 +- dom/gamepad/ipc/GamepadEventChannelChild.h | 8 +- dom/gamepad/ipc/GamepadEventChannelParent.h | 16 +- dom/gamepad/ipc/GamepadTestChannelChild.h | 4 +- dom/gamepad/ipc/GamepadTestChannelParent.h | 6 +- dom/indexedDB/ActorsParent.cpp | 2 +- dom/ipc/ContentBridgeChild.h | 4 +- dom/ipc/ContentChild.h | 311 +++++++------- dom/ipc/ContentParent.h | 402 ++++++++---------- dom/ipc/FilePickerParent.h | 19 +- dom/ipc/TabParent.h | 271 ++++++------ dom/ipc/WindowGlobalParent.h | 6 +- dom/media/gmp/ChromiumCDMParent.h | 47 +- dom/media/gmp/GMPChild.h | 13 +- dom/media/gmp/GMPParent.h | 4 +- dom/media/gmp/GMPStorageChild.h | 12 +- dom/media/gmp/GMPTimerChild.h | 2 +- dom/media/gmp/GMPTimerParent.h | 2 +- dom/media/gmp/GMPVideoDecoderChild.h | 13 +- dom/media/gmp/GMPVideoEncoderChild.h | 18 +- dom/media/ipc/RDDChild.h | 10 +- dom/media/ipc/RDDParent.h | 8 +- dom/media/ipc/VideoDecoderManagerParent.h | 4 +- .../MediaSystemResourceManagerChild.h | 2 +- .../MediaSystemResourceManagerParent.h | 6 +- .../synth/ipc/SpeechSynthesisChild.h | 13 +- dom/messagechannel/MessagePortChild.h | 10 +- dom/messagechannel/MessagePortParent.h | 12 +- dom/midi/MIDIManagerParent.h | 2 +- dom/midi/MIDIPortChild.h | 7 +- dom/midi/MIDIPortParent.h | 10 +- dom/network/TCPServerSocketChild.h | 3 +- dom/network/TCPServerSocketParent.h | 4 +- dom/network/TCPSocketChild.h | 12 +- dom/network/TCPSocketParent.h | 24 +- dom/network/UDPSocketChild.h | 21 +- dom/network/UDPSocketParent.h | 28 +- dom/payments/ipc/PaymentRequestChild.h | 17 +- dom/payments/ipc/PaymentRequestParent.h | 2 +- dom/plugins/ipc/BrowserStreamChild.h | 9 +- dom/plugins/ipc/PluginInstanceChild.h | 92 ++-- dom/plugins/ipc/PluginInstanceParent.h | 153 ++++--- dom/plugins/ipc/PluginModuleChild.h | 69 ++- dom/plugins/ipc/PluginModuleParent.h | 48 +-- dom/plugins/ipc/PluginScriptableObjectChild.h | 52 +-- .../ipc/PluginScriptableObjectParent.h | 52 ++- dom/plugins/ipc/StreamNotifyChild.h | 2 +- dom/plugins/ipc/StreamNotifyParent.h | 3 +- .../ipc/PresentationBuilderChild.h | 7 +- .../ipc/PresentationBuilderParent.h | 14 +- dom/presentation/ipc/PresentationChild.h | 25 +- dom/presentation/ipc/PresentationParent.h | 36 +- .../ServiceWorkerManagerChild.h | 18 +- .../ServiceWorkerManagerParent.h | 24 +- dom/webauthn/WebAuthnTransactionChild.h | 6 +- dom/webauthn/WebAuthnTransactionParent.h | 13 +- .../WebBrowserPersistDocumentChild.h | 3 +- .../WebBrowserPersistDocumentParent.h | 7 +- dom/workers/remoteworkers/RemoteWorkerChild.h | 2 +- .../remoteworkers/RemoteWorkerParent.h | 6 +- dom/workers/sharedworkers/SharedWorkerChild.h | 4 +- .../sharedworkers/SharedWorkerParent.h | 10 +- .../glue/RemoteSpellCheckEngineParent.h | 13 +- gfx/ipc/GPUChild.h | 47 +- gfx/ipc/GPUParent.h | 52 ++- gfx/ipc/VsyncBridgeParent.h | 2 +- gfx/layers/ipc/APZCTreeManagerChild.h | 7 +- gfx/layers/ipc/APZCTreeManagerParent.h | 29 +- gfx/layers/ipc/APZChild.h | 22 +- gfx/layers/ipc/APZInputBridgeParent.h | 20 +- gfx/layers/ipc/CompositorBridgeChild.h | 45 +- gfx/layers/ipc/CompositorBridgeParent.h | 35 +- gfx/layers/ipc/CompositorManagerParent.h | 12 +- gfx/layers/ipc/ImageBridgeChild.h | 12 +- gfx/layers/ipc/ImageBridgeParent.h | 16 +- gfx/layers/ipc/LayerTransactionParent.h | 53 ++- gfx/layers/ipc/UiCompositorControllerChild.h | 8 +- gfx/layers/ipc/UiCompositorControllerParent.h | 23 +- gfx/layers/wr/WebRenderBridgeChild.h | 4 +- gfx/vr/ipc/VRChild.h | 12 +- gfx/vr/ipc/VRGPUParent.h | 4 +- gfx/vr/ipc/VRManagerChild.h | 25 +- gfx/vr/ipc/VRManagerParent.h | 72 ++-- gfx/vr/ipc/VRParent.h | 27 +- ipc/glue/FileDescriptorSetChild.h | 4 +- ipc/glue/FileDescriptorSetParent.h | 4 +- ipc/ipdl/ipdl/lower.py | 4 +- ipc/testshell/TestShellChild.h | 2 +- layout/ipc/VsyncChild.h | 5 +- layout/ipc/VsyncParent.h | 6 +- layout/printing/ipc/RemotePrintJobChild.h | 6 +- layout/printing/ipc/RemotePrintJobParent.h | 19 +- netwerk/cookie/CookieServiceChild.h | 23 +- netwerk/cookie/CookieServiceParent.h | 8 +- netwerk/dns/DNSRequestChild.h | 3 +- netwerk/dns/DNSRequestParent.h | 2 +- netwerk/ipc/NeckoChild.h | 19 +- netwerk/ipc/NeckoParent.h | 59 ++- netwerk/ipc/SocketProcessBridgeChild.h | 2 +- netwerk/ipc/SocketProcessBridgeParent.h | 4 +- netwerk/ipc/SocketProcessChild.h | 12 +- netwerk/ipc/SocketProcessParent.h | 20 +- .../protocol/http/AltDataOutputStreamChild.h | 4 +- .../protocol/http/AltDataOutputStreamParent.h | 6 +- .../http/HttpBackgroundChannelChild.h | 32 +- .../websocket/WebSocketChannelChild.h | 14 +- .../websocket/WebSocketChannelParent.h | 14 +- .../websocket/WebSocketEventListenerChild.h | 16 +- .../websocket/WebSocketEventListenerParent.h | 2 +- .../protocol/wyciwyg/WyciwygChannelParent.h | 30 +- security/manager/ssl/PSMContentListener.h | 16 +- .../extensions/webrequest/StreamFilterChild.h | 16 +- .../webrequest/StreamFilterParent.h | 14 +- .../printingui/ipc/PrintingParent.h | 13 +- uriloader/exthandler/ExternalHelperAppChild.h | 2 +- uriloader/prefetch/OfflineCacheUpdateChild.h | 12 +- 126 files changed, 1432 insertions(+), 1555 deletions(-) diff --git a/devtools/shared/heapsnapshot/HeapSnapshotTempFileHelperParent.h b/devtools/shared/heapsnapshot/HeapSnapshotTempFileHelperParent.h index 234ef614f643..058f0c6eeaa4 100644 --- a/devtools/shared/heapsnapshot/HeapSnapshotTempFileHelperParent.h +++ b/devtools/shared/heapsnapshot/HeapSnapshotTempFileHelperParent.h @@ -19,7 +19,7 @@ class HeapSnapshotTempFileHelperParent explicit HeapSnapshotTempFileHelperParent() {} void ActorDestroy(ActorDestroyReason why) override {} mozilla::ipc::IPCResult RecvOpenHeapSnapshotTempFile( - OpenHeapSnapshotTempFileResponse* outResponse) override; + OpenHeapSnapshotTempFileResponse* outResponse); public: static inline PHeapSnapshotTempFileHelperParent* Create(); diff --git a/dom/base/nsContentPermissionHelper.h b/dom/base/nsContentPermissionHelper.h index bb5d44439fd5..011bfe508a66 100644 --- a/dom/base/nsContentPermissionHelper.h +++ b/dom/base/nsContentPermissionHelper.h @@ -221,11 +221,10 @@ class RemotePermissionRequest final nsPIDOMWindowInner* aWindow); // It will be called when prompt dismissed. - virtual mozilla::ipc::IPCResult RecvNotifyResult( - const bool& aAllow, - InfallibleTArray&& aChoices) override; + mozilla::ipc::IPCResult RecvNotifyResult( + const bool& aAllow, InfallibleTArray&& aChoices); - virtual mozilla::ipc::IPCResult RecvGetVisibility() override; + mozilla::ipc::IPCResult RecvGetVisibility(); void IPDLAddRef() { mIPCOpen = true; diff --git a/dom/cache/CacheParent.h b/dom/cache/CacheParent.h index b375c946d8f4..e7acee5450f8 100644 --- a/dom/cache/CacheParent.h +++ b/dom/cache/CacheParent.h @@ -34,7 +34,7 @@ class CacheParent final : public PCacheParent { virtual mozilla::ipc::IPCResult RecvPCacheOpConstructor( PCacheOpParent* actor, const CacheOpArgs& aOpArgs) override; - virtual mozilla::ipc::IPCResult RecvTeardown() override; + mozilla::ipc::IPCResult RecvTeardown(); RefPtr mManager; const CacheId mCacheId; diff --git a/dom/cache/CacheStorageParent.h b/dom/cache/CacheStorageParent.h index 9e3b50b5a1f2..388032dbcb5c 100644 --- a/dom/cache/CacheStorageParent.h +++ b/dom/cache/CacheStorageParent.h @@ -37,7 +37,7 @@ class CacheStorageParent final : public PCacheStorageParent, virtual mozilla::ipc::IPCResult RecvPCacheOpConstructor( PCacheOpParent* actor, const CacheOpArgs& aOpArgs) override; - virtual mozilla::ipc::IPCResult RecvTeardown() override; + mozilla::ipc::IPCResult RecvTeardown(); // PrincipalVerifier::Listener methods virtual void OnPrincipalVerified(nsresult aRv, diff --git a/dom/cache/CacheStreamControlChild.h b/dom/cache/CacheStreamControlChild.h index 585c3612bc52..c3ad7c715df0 100644 --- a/dom/cache/CacheStreamControlChild.h +++ b/dom/cache/CacheStreamControlChild.h @@ -53,8 +53,8 @@ class CacheStreamControlChild final : public PCacheStreamControlChild, // PCacheStreamControlChild methods virtual void ActorDestroy(ActorDestroyReason aReason) override; - virtual mozilla::ipc::IPCResult RecvClose(const nsID& aId) override; - virtual mozilla::ipc::IPCResult RecvCloseAll() override; + mozilla::ipc::IPCResult RecvClose(const nsID& aId); + mozilla::ipc::IPCResult RecvCloseAll(); bool mDestroyStarted; bool mDestroyDelayed; diff --git a/dom/cache/CacheStreamControlParent.h b/dom/cache/CacheStreamControlParent.h index 8b16ee867c13..3912ab3cacce 100644 --- a/dom/cache/CacheStreamControlParent.h +++ b/dom/cache/CacheStreamControlParent.h @@ -57,10 +57,10 @@ class CacheStreamControlParent final : public PCacheStreamControlParent, // PCacheStreamControlParent methods virtual void ActorDestroy(ActorDestroyReason aReason) override; - virtual mozilla::ipc::IPCResult RecvOpenStream( - const nsID& aStreamId, OpenStreamResolver&& aResolve) override; + mozilla::ipc::IPCResult RecvOpenStream(const nsID& aStreamId, + OpenStreamResolver&& aResolve); - virtual mozilla::ipc::IPCResult RecvNoteClosed(const nsID& aId) override; + mozilla::ipc::IPCResult RecvNoteClosed(const nsID& aId); void NotifyClose(const nsID& aId); void NotifyCloseAll(); diff --git a/dom/file/ipc/IPCBlobInputStreamChild.h b/dom/file/ipc/IPCBlobInputStreamChild.h index 4576cf4638c5..8eb16b3d572c 100644 --- a/dom/file/ipc/IPCBlobInputStreamChild.h +++ b/dom/file/ipc/IPCBlobInputStreamChild.h @@ -56,12 +56,11 @@ class IPCBlobInputStreamChild final void StreamNeeded(IPCBlobInputStream* aStream, nsIEventTarget* aEventTarget); - mozilla::ipc::IPCResult RecvStreamReady( - const OptionalIPCStream& aStream) override; + mozilla::ipc::IPCResult RecvStreamReady(const OptionalIPCStream& aStream); void LengthNeeded(IPCBlobInputStream* aStream, nsIEventTarget* aEventTarget); - mozilla::ipc::IPCResult RecvLengthReady(const int64_t& aLength) override; + mozilla::ipc::IPCResult RecvLengthReady(const int64_t& aLength); void Shutdown(); diff --git a/dom/file/ipc/IPCBlobInputStreamParent.h b/dom/file/ipc/IPCBlobInputStreamParent.h index 3fe9a94f2c5c..263c59331393 100644 --- a/dom/file/ipc/IPCBlobInputStreamParent.h +++ b/dom/file/ipc/IPCBlobInputStreamParent.h @@ -49,11 +49,11 @@ class IPCBlobInputStreamParent final void SetCallback(IPCBlobInputStreamParentCallback* aCallback); - mozilla::ipc::IPCResult RecvStreamNeeded() override; + mozilla::ipc::IPCResult RecvStreamNeeded(); - mozilla::ipc::IPCResult RecvLengthNeeded() override; + mozilla::ipc::IPCResult RecvLengthNeeded(); - mozilla::ipc::IPCResult RecvClose() override; + mozilla::ipc::IPCResult RecvClose(); mozilla::ipc::IPCResult Recv__delete__() override; diff --git a/dom/file/ipc/TemporaryIPCBlobChild.h b/dom/file/ipc/TemporaryIPCBlobChild.h index fda267d2fcf7..078d20d545e2 100644 --- a/dom/file/ipc/TemporaryIPCBlobChild.h +++ b/dom/file/ipc/TemporaryIPCBlobChild.h @@ -38,7 +38,7 @@ class TemporaryIPCBlobChild final private: ~TemporaryIPCBlobChild(); - mozilla::ipc::IPCResult RecvFileDesc(const FileDescriptor& aFD) override; + mozilla::ipc::IPCResult RecvFileDesc(const FileDescriptor& aFD); mozilla::ipc::IPCResult Recv__delete__( const IPCBlobOrError& aBlobOrError) override; diff --git a/dom/file/ipc/TemporaryIPCBlobParent.h b/dom/file/ipc/TemporaryIPCBlobParent.h index e9a1366514ff..2a66804ebb07 100644 --- a/dom/file/ipc/TemporaryIPCBlobParent.h +++ b/dom/file/ipc/TemporaryIPCBlobParent.h @@ -27,10 +27,10 @@ class TemporaryIPCBlobParent final private: ~TemporaryIPCBlobParent(); - mozilla::ipc::IPCResult RecvOperationFailed() override; + mozilla::ipc::IPCResult RecvOperationFailed(); mozilla::ipc::IPCResult RecvOperationDone(const nsCString& aContentType, - const FileDescriptor& aFD) override; + const FileDescriptor& aFD); void ActorDestroy(ActorDestroyReason aWhy) override; diff --git a/dom/filehandle/ActorsParent.h b/dom/filehandle/ActorsParent.h index f5600a079806..04ce2ca85707 100644 --- a/dom/filehandle/ActorsParent.h +++ b/dom/filehandle/ActorsParent.h @@ -163,9 +163,9 @@ class BackgroundMutableFileParentBase : public PBackgroundMutableFileParent { virtual bool DeallocPBackgroundFileHandleParent( PBackgroundFileHandleParent* aActor); - mozilla::ipc::IPCResult RecvDeleteMe() final; + mozilla::ipc::IPCResult RecvDeleteMe(); - mozilla::ipc::IPCResult RecvGetFileId(int64_t* aFileId) override; + virtual mozilla::ipc::IPCResult RecvGetFileId(int64_t* aFileId); }; } // namespace dom diff --git a/dom/gamepad/ipc/GamepadEventChannelChild.h b/dom/gamepad/ipc/GamepadEventChannelChild.h index 047f7e7b2073..d87de8ef8427 100644 --- a/dom/gamepad/ipc/GamepadEventChannelChild.h +++ b/dom/gamepad/ipc/GamepadEventChannelChild.h @@ -15,10 +15,10 @@ class GamepadEventChannelChild final : public PGamepadEventChannelChild { public: GamepadEventChannelChild() {} ~GamepadEventChannelChild() {} - virtual mozilla::ipc::IPCResult RecvGamepadUpdate( - const GamepadChangeEvent& aGamepadEvent) override; - virtual mozilla::ipc::IPCResult RecvReplyGamepadVibrateHaptic( - const uint32_t& aPromiseID) override; + mozilla::ipc::IPCResult RecvGamepadUpdate( + const GamepadChangeEvent& aGamepadEvent); + mozilla::ipc::IPCResult RecvReplyGamepadVibrateHaptic( + const uint32_t& aPromiseID); void AddPromise(const uint32_t& aID, dom::Promise* aPromise); private: diff --git a/dom/gamepad/ipc/GamepadEventChannelParent.h b/dom/gamepad/ipc/GamepadEventChannelParent.h index 14f59973531a..03d05a95c0c8 100644 --- a/dom/gamepad/ipc/GamepadEventChannelParent.h +++ b/dom/gamepad/ipc/GamepadEventChannelParent.h @@ -16,14 +16,14 @@ class GamepadEventChannelParent final : public PGamepadEventChannelParent { NS_INLINE_DECL_THREADSAFE_REFCOUNTING(GamepadEventChannelParent) GamepadEventChannelParent(); virtual void ActorDestroy(ActorDestroyReason aWhy) override; - virtual mozilla::ipc::IPCResult RecvGamepadListenerAdded() override; - virtual mozilla::ipc::IPCResult RecvGamepadListenerRemoved() override; - virtual mozilla::ipc::IPCResult RecvVibrateHaptic( - const uint32_t& aControllerIdx, const uint32_t& aHapticIndex, - const double& aIntensity, const double& aDuration, - const uint32_t& aPromiseID) override; - virtual mozilla::ipc::IPCResult RecvStopVibrateHaptic( - const uint32_t& aGamepadIndex) override; + mozilla::ipc::IPCResult RecvGamepadListenerAdded(); + mozilla::ipc::IPCResult RecvGamepadListenerRemoved(); + mozilla::ipc::IPCResult RecvVibrateHaptic(const uint32_t& aControllerIdx, + const uint32_t& aHapticIndex, + const double& aIntensity, + const double& aDuration, + const uint32_t& aPromiseID); + mozilla::ipc::IPCResult RecvStopVibrateHaptic(const uint32_t& aGamepadIndex); void DispatchUpdateEvent(const GamepadChangeEvent& aEvent); bool HasGamepadListener() const { return mHasGamepadListener; } diff --git a/dom/gamepad/ipc/GamepadTestChannelChild.h b/dom/gamepad/ipc/GamepadTestChannelChild.h index db5c21e83454..724a2e2dfbff 100644 --- a/dom/gamepad/ipc/GamepadTestChannelChild.h +++ b/dom/gamepad/ipc/GamepadTestChannelChild.h @@ -22,8 +22,8 @@ class GamepadTestChannelChild final : public PGamepadTestChannelChild { void AddPromise(const uint32_t& aID, Promise* aPromise); private: - virtual mozilla::ipc::IPCResult RecvReplyGamepadIndex( - const uint32_t& aID, const uint32_t& aIndex) override; + mozilla::ipc::IPCResult RecvReplyGamepadIndex(const uint32_t& aID, + const uint32_t& aIndex); nsRefPtrHashtable mPromiseList; }; diff --git a/dom/gamepad/ipc/GamepadTestChannelParent.h b/dom/gamepad/ipc/GamepadTestChannelParent.h index 4d29a668ec38..3b5ca38a543a 100644 --- a/dom/gamepad/ipc/GamepadTestChannelParent.h +++ b/dom/gamepad/ipc/GamepadTestChannelParent.h @@ -17,9 +17,9 @@ class GamepadTestChannelParent final : public PGamepadTestChannelParent { NS_INLINE_DECL_THREADSAFE_REFCOUNTING(GamepadTestChannelParent) GamepadTestChannelParent() : mShuttingdown(false) {} virtual void ActorDestroy(ActorDestroyReason aWhy) override {} - virtual mozilla::ipc::IPCResult RecvGamepadTestEvent( - const uint32_t& aID, const GamepadChangeEvent& aGamepadEvent) override; - virtual mozilla::ipc::IPCResult RecvShutdownChannel() override; + mozilla::ipc::IPCResult RecvGamepadTestEvent( + const uint32_t& aID, const GamepadChangeEvent& aGamepadEvent); + mozilla::ipc::IPCResult RecvShutdownChannel(); private: ~GamepadTestChannelParent() {} diff --git a/dom/indexedDB/ActorsParent.cpp b/dom/indexedDB/ActorsParent.cpp index 52431719410f..5dce731f7b15 100644 --- a/dom/indexedDB/ActorsParent.cpp +++ b/dom/indexedDB/ActorsParent.cpp @@ -6439,7 +6439,7 @@ class MutableFile : public BackgroundMutableFileParentBase { mozilla::ipc::IPCResult RecvPBackgroundFileHandleConstructor( PBackgroundFileHandleParent* aActor, const FileMode& aMode) final; - mozilla::ipc::IPCResult RecvGetFileId(int64_t* aFileId) final; + mozilla::ipc::IPCResult RecvGetFileId(int64_t* aFileId) override; }; class FactoryOp : public DatabaseOperationBase, diff --git a/dom/ipc/ContentBridgeChild.h b/dom/ipc/ContentBridgeChild.h index b7446c742ff4..3e93c6d5b3e6 100644 --- a/dom/ipc/ContentBridgeChild.h +++ b/dom/ipc/ContentBridgeChild.h @@ -47,9 +47,9 @@ class ContentBridgeChild final : public PContentBridgeChild, SendPChildToParentStreamConstructor( mozilla::ipc::PChildToParentStreamChild*) override; - virtual mozilla::ipc::IPCResult RecvActivate(PBrowserChild* aTab) override; + mozilla::ipc::IPCResult RecvActivate(PBrowserChild* aTab); - virtual mozilla::ipc::IPCResult RecvDeactivate(PBrowserChild* aTab) override; + mozilla::ipc::IPCResult RecvDeactivate(PBrowserChild* aTab); virtual already_AddRefed GetEventTargetFor( TabChild* aTabChild) override; diff --git a/dom/ipc/ContentChild.h b/dom/ipc/ContentChild.h index c76a9c1238b3..fef7ed2a2349 100644 --- a/dom/ipc/ContentChild.h +++ b/dom/ipc/ContentChild.h @@ -157,43 +157,42 @@ class ContentChild final : public PContentChild, static void UpdateCookieStatus(nsIChannel* aChannel); mozilla::ipc::IPCResult RecvInitContentBridgeChild( - Endpoint&& aEndpoint) override; + Endpoint&& aEndpoint); mozilla::ipc::IPCResult RecvInitGMPService( - Endpoint&& aGMPService) override; + Endpoint&& aGMPService); mozilla::ipc::IPCResult RecvInitProfiler( - Endpoint&& aEndpoint) override; + Endpoint&& aEndpoint); mozilla::ipc::IPCResult RecvGMPsChanged( - nsTArray&& capabilities) override; + nsTArray&& capabilities); mozilla::ipc::IPCResult RecvInitProcessHangMonitor( - Endpoint&& aHangMonitor) override; + Endpoint&& aHangMonitor); mozilla::ipc::IPCResult RecvInitRendering( Endpoint&& aCompositor, Endpoint&& aImageBridge, Endpoint&& aVRBridge, Endpoint&& aVideoManager, - nsTArray&& namespaces) override; + nsTArray&& namespaces); - mozilla::ipc::IPCResult RecvRequestPerformanceMetrics( - const nsID& aID) override; + mozilla::ipc::IPCResult RecvRequestPerformanceMetrics(const nsID& aID); mozilla::ipc::IPCResult RecvReinitRendering( Endpoint&& aCompositor, Endpoint&& aImageBridge, Endpoint&& aVRBridge, Endpoint&& aVideoManager, - nsTArray&& namespaces) override; + nsTArray&& namespaces); - virtual mozilla::ipc::IPCResult RecvAudioDefaultDeviceChange() override; + virtual mozilla::ipc::IPCResult RecvAudioDefaultDeviceChange(); - mozilla::ipc::IPCResult RecvReinitRenderingForDeviceReset() override; + mozilla::ipc::IPCResult RecvReinitRenderingForDeviceReset(); virtual mozilla::ipc::IPCResult RecvSetProcessSandbox( - const MaybeFileDesc& aBroker) override; + const MaybeFileDesc& aBroker); virtual PBrowserChild* AllocPBrowserChild(const TabId& aTabId, const TabId& aSameTabGroupAs, @@ -303,28 +302,28 @@ class ContentChild final : public PContentChild, bool DeallocPPresentationChild(PPresentationChild* aActor); - virtual mozilla::ipc::IPCResult RecvNotifyPresentationReceiverLaunched( - PBrowserChild* aIframe, const nsString& aSessionId) override; + mozilla::ipc::IPCResult RecvNotifyPresentationReceiverLaunched( + PBrowserChild* aIframe, const nsString& aSessionId); - virtual mozilla::ipc::IPCResult RecvNotifyPresentationReceiverCleanUp( - const nsString& aSessionId) override; + mozilla::ipc::IPCResult RecvNotifyPresentationReceiverCleanUp( + const nsString& aSessionId); - virtual mozilla::ipc::IPCResult RecvNotifyEmptyHTTPCache() override; + mozilla::ipc::IPCResult RecvNotifyEmptyHTTPCache(); PSpeechSynthesisChild* AllocPSpeechSynthesisChild(); bool DeallocPSpeechSynthesisChild(PSpeechSynthesisChild* aActor); - virtual mozilla::ipc::IPCResult RecvRegisterChrome( + mozilla::ipc::IPCResult RecvRegisterChrome( InfallibleTArray&& packages, InfallibleTArray&& resources, InfallibleTArray&& overrides, const nsCString& locale, - const bool& reset) override; - virtual mozilla::ipc::IPCResult RecvRegisterChromeItem( - const ChromeRegistryItem& item) override; + const bool& reset); + mozilla::ipc::IPCResult RecvRegisterChromeItem( + const ChromeRegistryItem& item); - virtual mozilla::ipc::IPCResult RecvClearImageCache( - const bool& privateLoader, const bool& chrome) override; + mozilla::ipc::IPCResult RecvClearImageCache(const bool& privateLoader, + const bool& chrome); virtual mozilla::jsipc::PJavaScriptChild* AllocPJavaScriptChild() override; @@ -335,43 +334,36 @@ class ContentChild final : public PContentChild, bool DeallocPRemoteSpellcheckEngineChild(PRemoteSpellcheckEngineChild*); - virtual mozilla::ipc::IPCResult RecvSetOffline(const bool& offline) override; + mozilla::ipc::IPCResult RecvSetOffline(const bool& offline); - virtual mozilla::ipc::IPCResult RecvSetConnectivity( - const bool& connectivity) override; - virtual mozilla::ipc::IPCResult RecvSetCaptivePortalState( - const int32_t& state) override; + mozilla::ipc::IPCResult RecvSetConnectivity(const bool& connectivity); + mozilla::ipc::IPCResult RecvSetCaptivePortalState(const int32_t& state); - virtual mozilla::ipc::IPCResult RecvBidiKeyboardNotify( - const bool& isLangRTL, const bool& haveBidiKeyboards) override; + mozilla::ipc::IPCResult RecvBidiKeyboardNotify(const bool& isLangRTL, + const bool& haveBidiKeyboards); - virtual mozilla::ipc::IPCResult RecvNotifyVisited( - nsTArray&& aURIs) override; + mozilla::ipc::IPCResult RecvNotifyVisited(nsTArray&& aURIs); // auto remove when alertfinished is received. nsresult AddRemoteAlertObserver(const nsString& aData, nsIObserver* aObserver); - virtual mozilla::ipc::IPCResult RecvPreferenceUpdate( - const Pref& aPref) override; - virtual mozilla::ipc::IPCResult RecvVarUpdate( - const GfxVarUpdate& pref) override; + mozilla::ipc::IPCResult RecvPreferenceUpdate(const Pref& aPref); + mozilla::ipc::IPCResult RecvVarUpdate(const GfxVarUpdate& pref); - virtual mozilla::ipc::IPCResult RecvDataStoragePut( - const nsString& aFilename, const DataStorageItem& aItem) override; + mozilla::ipc::IPCResult RecvDataStoragePut(const nsString& aFilename, + const DataStorageItem& aItem); - virtual mozilla::ipc::IPCResult RecvDataStorageRemove( - const nsString& aFilename, const nsCString& aKey, - const DataStorageType& aType) override; + mozilla::ipc::IPCResult RecvDataStorageRemove(const nsString& aFilename, + const nsCString& aKey, + const DataStorageType& aType); - virtual mozilla::ipc::IPCResult RecvDataStorageClear( - const nsString& aFilename) override; + mozilla::ipc::IPCResult RecvDataStorageClear(const nsString& aFilename); - virtual mozilla::ipc::IPCResult RecvNotifyAlertsObserver( - const nsCString& aType, const nsString& aData) override; + mozilla::ipc::IPCResult RecvNotifyAlertsObserver(const nsCString& aType, + const nsString& aData); - virtual mozilla::ipc::IPCResult RecvLoadProcessScript( - const nsString& aURL) override; + virtual mozilla::ipc::IPCResult RecvLoadProcessScript(const nsString& aURL); virtual mozilla::ipc::IPCResult RecvAsyncMessage( const nsString& aMsg, InfallibleTArray&& aCpows, @@ -379,129 +371,125 @@ class ContentChild final : public PContentChild, const ClonedMessageData& aData) override; mozilla::ipc::IPCResult RecvRegisterStringBundles( - nsTArray&& stringBundles) override; + nsTArray&& stringBundles); mozilla::ipc::IPCResult RecvUpdateSharedData( const FileDescriptor& aMapFile, const uint32_t& aMapSize, - nsTArray&& aBlobs, nsTArray&& aChangedKeys) override; + nsTArray&& aBlobs, nsTArray&& aChangedKeys); - virtual mozilla::ipc::IPCResult RecvGeolocationUpdate( - nsIDOMGeoPosition* aPosition) override; + mozilla::ipc::IPCResult RecvGeolocationUpdate(nsIDOMGeoPosition* aPosition); - virtual mozilla::ipc::IPCResult RecvGeolocationError( - const uint16_t& errorCode) override; + mozilla::ipc::IPCResult RecvGeolocationError(const uint16_t& errorCode); - virtual mozilla::ipc::IPCResult RecvUpdateDictionaryList( - InfallibleTArray&& aDictionaries) override; + mozilla::ipc::IPCResult RecvUpdateDictionaryList( + InfallibleTArray&& aDictionaries); - virtual mozilla::ipc::IPCResult RecvUpdateFontList( - InfallibleTArray&& aFontList) override; + mozilla::ipc::IPCResult RecvUpdateFontList( + InfallibleTArray&& aFontList); - virtual mozilla::ipc::IPCResult RecvUpdateAppLocales( - nsTArray&& aAppLocales) override; - virtual mozilla::ipc::IPCResult RecvUpdateRequestedLocales( - nsTArray&& aRequestedLocales) override; + mozilla::ipc::IPCResult RecvUpdateAppLocales( + nsTArray&& aAppLocales); + mozilla::ipc::IPCResult RecvUpdateRequestedLocales( + nsTArray&& aRequestedLocales); - virtual mozilla::ipc::IPCResult RecvClearSiteDataReloadNeeded( - const nsString& aOrigin) override; + mozilla::ipc::IPCResult RecvClearSiteDataReloadNeeded( + const nsString& aOrigin); - virtual mozilla::ipc::IPCResult RecvAddPermission( - const IPC::Permission& permission) override; + mozilla::ipc::IPCResult RecvAddPermission(const IPC::Permission& permission); - virtual mozilla::ipc::IPCResult RecvRemoveAllPermissions() override; + mozilla::ipc::IPCResult RecvRemoveAllPermissions(); - virtual mozilla::ipc::IPCResult RecvFlushMemory( - const nsString& reason) override; + mozilla::ipc::IPCResult RecvFlushMemory(const nsString& reason); - virtual mozilla::ipc::IPCResult RecvActivateA11y( - const uint32_t& aMainChromeTid, const uint32_t& aMsaaID) override; - virtual mozilla::ipc::IPCResult RecvShutdownA11y() override; + mozilla::ipc::IPCResult RecvActivateA11y(const uint32_t& aMainChromeTid, + const uint32_t& aMsaaID); + mozilla::ipc::IPCResult RecvShutdownA11y(); - virtual mozilla::ipc::IPCResult RecvGarbageCollect() override; - virtual mozilla::ipc::IPCResult RecvCycleCollect() override; - virtual mozilla::ipc::IPCResult RecvUnlinkGhosts() override; + mozilla::ipc::IPCResult RecvGarbageCollect(); + mozilla::ipc::IPCResult RecvCycleCollect(); + mozilla::ipc::IPCResult RecvUnlinkGhosts(); - virtual mozilla::ipc::IPCResult RecvAppInfo( + mozilla::ipc::IPCResult RecvAppInfo( const nsCString& version, const nsCString& buildID, const nsCString& name, const nsCString& UAName, const nsCString& ID, const nsCString& vendor, - const nsCString& sourceURL) override; + const nsCString& sourceURL); - virtual mozilla::ipc::IPCResult RecvRemoteType( - const nsString& aRemoteType) override; + mozilla::ipc::IPCResult RecvRemoteType(const nsString& aRemoteType); const nsAString& GetRemoteType() const; - virtual mozilla::ipc::IPCResult RecvInitServiceWorkers( - const ServiceWorkerConfiguration& aConfig) override; + mozilla::ipc::IPCResult RecvInitServiceWorkers( + const ServiceWorkerConfiguration& aConfig); - virtual mozilla::ipc::IPCResult RecvInitBlobURLs( - nsTArray&& aRegistations) override; + mozilla::ipc::IPCResult RecvInitBlobURLs( + nsTArray&& aRegistations); - virtual mozilla::ipc::IPCResult RecvInitJSWindowActorInfos( - nsTArray&& aInfos) override; + mozilla::ipc::IPCResult RecvInitJSWindowActorInfos( + nsTArray&& aInfos); - virtual mozilla::ipc::IPCResult RecvLastPrivateDocShellDestroyed() override; + mozilla::ipc::IPCResult RecvLastPrivateDocShellDestroyed(); - virtual mozilla::ipc::IPCResult RecvNotifyProcessPriorityChanged( - const hal::ProcessPriority& aPriority) override; + mozilla::ipc::IPCResult RecvNotifyProcessPriorityChanged( + const hal::ProcessPriority& aPriority); - virtual mozilla::ipc::IPCResult RecvMinimizeMemoryUsage() override; + mozilla::ipc::IPCResult RecvMinimizeMemoryUsage(); - virtual mozilla::ipc::IPCResult RecvLoadAndRegisterSheet( - const URIParams& aURI, const uint32_t& aType) override; + mozilla::ipc::IPCResult RecvLoadAndRegisterSheet(const URIParams& aURI, + const uint32_t& aType); - virtual mozilla::ipc::IPCResult RecvUnregisterSheet( - const URIParams& aURI, const uint32_t& aType) override; + mozilla::ipc::IPCResult RecvUnregisterSheet(const URIParams& aURI, + const uint32_t& aType); void AddIdleObserver(nsIObserver* aObserver, uint32_t aIdleTimeInS); void RemoveIdleObserver(nsIObserver* aObserver, uint32_t aIdleTimeInS); - virtual mozilla::ipc::IPCResult RecvNotifyIdleObserver( - const uint64_t& aObserver, const nsCString& aTopic, - const nsString& aData) override; + mozilla::ipc::IPCResult RecvNotifyIdleObserver(const uint64_t& aObserver, + const nsCString& aTopic, + const nsString& aData); - virtual mozilla::ipc::IPCResult RecvUpdateWindow( - const uintptr_t& aChildId) override; + mozilla::ipc::IPCResult RecvUpdateWindow(const uintptr_t& aChildId); - virtual mozilla::ipc::IPCResult RecvDomainSetChanged( + mozilla::ipc::IPCResult RecvDomainSetChanged( const uint32_t& aSetType, const uint32_t& aChangeType, - const OptionalURIParams& aDomain) override; + const OptionalURIParams& aDomain); - virtual mozilla::ipc::IPCResult RecvShutdown() override; + mozilla::ipc::IPCResult RecvShutdown(); - virtual mozilla::ipc::IPCResult RecvInvokeDragSession( - nsTArray&& aTransfers, const uint32_t& aAction) override; + mozilla::ipc::IPCResult RecvInvokeDragSession( + nsTArray&& aTransfers, const uint32_t& aAction); - virtual mozilla::ipc::IPCResult RecvEndDragSession( + mozilla::ipc::IPCResult RecvEndDragSession( const bool& aDoneDrag, const bool& aUserCancelled, const mozilla::LayoutDeviceIntPoint& aEndDragPoint, - const uint32_t& aKeyModifiers) override; + const uint32_t& aKeyModifiers); - virtual mozilla::ipc::IPCResult RecvPush(const nsCString& aScope, + mozilla::ipc::IPCResult RecvPush(const nsCString& aScope, + const IPC::Principal& aPrincipal, + const nsString& aMessageId); + + mozilla::ipc::IPCResult RecvPushWithData(const nsCString& aScope, const IPC::Principal& aPrincipal, - const nsString& aMessageId) override; + const nsString& aMessageId, + InfallibleTArray&& aData); - virtual mozilla::ipc::IPCResult RecvPushWithData( - const nsCString& aScope, const IPC::Principal& aPrincipal, - const nsString& aMessageId, InfallibleTArray&& aData) override; + mozilla::ipc::IPCResult RecvPushSubscriptionChange( + const nsCString& aScope, const IPC::Principal& aPrincipal); - virtual mozilla::ipc::IPCResult RecvPushSubscriptionChange( - const nsCString& aScope, const IPC::Principal& aPrincipal) override; + mozilla::ipc::IPCResult RecvPushError(const nsCString& aScope, + const IPC::Principal& aPrincipal, + const nsString& aMessage, + const uint32_t& aFlags); - virtual mozilla::ipc::IPCResult RecvPushError( - const nsCString& aScope, const IPC::Principal& aPrincipal, - const nsString& aMessage, const uint32_t& aFlags) override; + mozilla::ipc::IPCResult RecvNotifyPushSubscriptionModifiedObservers( + const nsCString& aScope, const IPC::Principal& aPrincipal); - virtual mozilla::ipc::IPCResult RecvNotifyPushSubscriptionModifiedObservers( - const nsCString& aScope, const IPC::Principal& aPrincipal) override; + mozilla::ipc::IPCResult RecvActivate(PBrowserChild* aTab); - virtual mozilla::ipc::IPCResult RecvActivate(PBrowserChild* aTab) override; - - virtual mozilla::ipc::IPCResult RecvDeactivate(PBrowserChild* aTab) override; + mozilla::ipc::IPCResult RecvDeactivate(PBrowserChild* aTab); mozilla::ipc::IPCResult RecvRefreshScreens( - nsTArray&& aScreens) override; + nsTArray&& aScreens); // Get the directory for IndexedDB files. We query the parent for this and // cache the value @@ -562,9 +550,9 @@ class ContentChild final : public PContentChild, PContentPermissionRequestChild* actor); // Windows specific - set up audio session - virtual mozilla::ipc::IPCResult RecvSetAudioSessionData( - const nsID& aId, const nsString& aDisplayName, - const nsString& aIconPath) override; + mozilla::ipc::IPCResult RecvSetAudioSessionData(const nsID& aId, + const nsString& aDisplayName, + const nsString& aIconPath); // GetFiles for WebKit/Blink FileSystem API and Directory API must run on the // parent process. @@ -574,54 +562,52 @@ class ContentChild final : public PContentChild, void DeleteGetFilesRequest(nsID& aUUID, GetFilesHelperChild* aChild); - virtual mozilla::ipc::IPCResult RecvGetFilesResponse( - const nsID& aUUID, const GetFilesResponseResult& aResult) override; + mozilla::ipc::IPCResult RecvGetFilesResponse( + const nsID& aUUID, const GetFilesResponseResult& aResult); - virtual mozilla::ipc::IPCResult RecvBlobURLRegistration( + mozilla::ipc::IPCResult RecvBlobURLRegistration( const nsCString& aURI, const IPCBlob& aBlob, - const IPC::Principal& aPrincipal) override; + const IPC::Principal& aPrincipal); - virtual mozilla::ipc::IPCResult RecvBlobURLUnregistration( - const nsCString& aURI) override; + mozilla::ipc::IPCResult RecvBlobURLUnregistration(const nsCString& aURI); - virtual mozilla::ipc::IPCResult RecvFileCreationResponse( - const nsID& aUUID, const FileCreationResult& aResult) override; + mozilla::ipc::IPCResult RecvFileCreationResponse( + const nsID& aUUID, const FileCreationResult& aResult); mozilla::ipc::IPCResult RecvRequestMemoryReport( const uint32_t& generation, const bool& anonymize, - const bool& minimizeMemoryUsage, const MaybeFileDesc& DMDFile) override; + const bool& minimizeMemoryUsage, const MaybeFileDesc& DMDFile); - virtual mozilla::ipc::IPCResult RecvSetXPCOMProcessAttributes( + mozilla::ipc::IPCResult RecvSetXPCOMProcessAttributes( const XPCOMInitData& aXPCOMInit, const StructuredCloneData& aInitialData, nsTArray&& aLookAndFeelIntCache, - nsTArray&& aFontList) override; + nsTArray&& aFontList); - virtual mozilla::ipc::IPCResult RecvProvideAnonymousTemporaryFile( - const uint64_t& aID, const FileDescOrError& aFD) override; + mozilla::ipc::IPCResult RecvProvideAnonymousTemporaryFile( + const uint64_t& aID, const FileDescOrError& aFD); mozilla::ipc::IPCResult RecvSetPermissionsWithKey( - const nsCString& aPermissionKey, - nsTArray&& aPerms) override; + const nsCString& aPermissionKey, nsTArray&& aPerms); - virtual mozilla::ipc::IPCResult RecvShareCodeCoverageMutex( - const CrossProcessMutexHandle& aHandle) override; + mozilla::ipc::IPCResult RecvShareCodeCoverageMutex( + const CrossProcessMutexHandle& aHandle); - virtual mozilla::ipc::IPCResult RecvFlushCodeCoverageCounters( - FlushCodeCoverageCountersResolver&& aResolver) override; + mozilla::ipc::IPCResult RecvFlushCodeCoverageCounters( + FlushCodeCoverageCountersResolver&& aResolver); - virtual mozilla::ipc::IPCResult RecvGetMemoryUniqueSetSize( - GetMemoryUniqueSetSizeResolver&& aResolver) override; + mozilla::ipc::IPCResult RecvGetMemoryUniqueSetSize( + GetMemoryUniqueSetSizeResolver&& aResolver); - virtual mozilla::ipc::IPCResult RecvSetInputEventQueueEnabled() override; + mozilla::ipc::IPCResult RecvSetInputEventQueueEnabled(); - virtual mozilla::ipc::IPCResult RecvFlushInputEventQueue() override; + mozilla::ipc::IPCResult RecvFlushInputEventQueue(); - virtual mozilla::ipc::IPCResult RecvSuspendInputEventQueue() override; + mozilla::ipc::IPCResult RecvSuspendInputEventQueue(); - virtual mozilla::ipc::IPCResult RecvResumeInputEventQueue() override; + mozilla::ipc::IPCResult RecvResumeInputEventQueue(); - virtual mozilla::ipc::IPCResult RecvAddDynamicScalars( - nsTArray&& aDefs) override; + mozilla::ipc::IPCResult RecvAddDynamicScalars( + nsTArray&& aDefs); #if defined(XP_WIN) && defined(ACCESSIBILITY) bool SendGetA11yContentId(); @@ -675,25 +661,24 @@ class ContentChild final : public PContentChild, mozilla::ipc::IPCResult RecvSetPluginList( const uint32_t& aPluginEpoch, nsTArray&& aPluginTags, - nsTArray&& aFakePluginTags) override; + nsTArray&& aFakePluginTags); PClientOpenWindowOpChild* AllocPClientOpenWindowOpChild( const ClientOpenWindowArgs& aArgs); - virtual mozilla::ipc::IPCResult RecvPClientOpenWindowOpConstructor( + mozilla::ipc::IPCResult RecvPClientOpenWindowOpConstructor( PClientOpenWindowOpChild* aActor, const ClientOpenWindowArgs& aArgs) override; bool DeallocPClientOpenWindowOpChild(PClientOpenWindowOpChild* aActor); - mozilla::ipc::IPCResult RecvSaveRecording( - const FileDescriptor& aFile) override; + mozilla::ipc::IPCResult RecvSaveRecording(const FileDescriptor& aFile); - virtual mozilla::ipc::IPCResult RecvCrossProcessRedirect( + mozilla::ipc::IPCResult RecvCrossProcessRedirect( const uint32_t& aRegistrarId, nsIURI* aURI, const uint32_t& aNewLoadFlags, const OptionalLoadInfoArgs& aLoadInfoForwarder, const uint64_t& aChannelId, nsIURI* aOriginalURI, - const uint64_t& aIdentifier) override; + const uint64_t& aIdentifier); #ifdef NIGHTLY_BUILD // Fetch the current number of pending input events. @@ -724,15 +709,13 @@ class ContentChild final : public PContentChild, virtual void OnChannelReceivedMessage(const Message& aMsg) override; - virtual mozilla::ipc::IPCResult RecvWindowClose( - const BrowsingContextId& aContextId, const bool& aTrustedCaller) override; - virtual mozilla::ipc::IPCResult RecvWindowFocus( - const BrowsingContextId& aContextId) override; - virtual mozilla::ipc::IPCResult RecvWindowBlur( - const BrowsingContextId& aContextId) override; - virtual mozilla::ipc::IPCResult RecvWindowPostMessage( + mozilla::ipc::IPCResult RecvWindowClose(const BrowsingContextId& aContextId, + const bool& aTrustedCaller); + mozilla::ipc::IPCResult RecvWindowFocus(const BrowsingContextId& aContextId); + mozilla::ipc::IPCResult RecvWindowBlur(const BrowsingContextId& aContextId); + mozilla::ipc::IPCResult RecvWindowPostMessage( const BrowsingContextId& aContextId, const ClonedMessageData& aMessage, - const PostMessageData& aData) override; + const PostMessageData& aData); #ifdef NIGHTLY_BUILD virtual PContentChild::Result OnMessageReceived(const Message& aMsg) override; diff --git a/dom/ipc/ContentParent.h b/dom/ipc/ContentParent.h index c1284965592d..fb98894f4cb3 100644 --- a/dom/ipc/ContentParent.h +++ b/dom/ipc/ContentParent.h @@ -277,41 +277,39 @@ class ContentParent final : public PContentParent, // Let managees query if it is safe to send messages. bool IsDestroyed() const { return !mIPCOpen; } - virtual mozilla::ipc::IPCResult RecvCreateChildProcess( + mozilla::ipc::IPCResult RecvCreateChildProcess( const IPCTabContext& aContext, const hal::ProcessPriority& aPriority, const TabId& aOpenerTabId, const TabId& aTabId, ContentParentId* aCpId, - bool* aIsForBrowser) override; + bool* aIsForBrowser); - virtual mozilla::ipc::IPCResult RecvBridgeToChildProcess( - const ContentParentId& aCpId, - Endpoint* aEndpoint) override; + mozilla::ipc::IPCResult RecvBridgeToChildProcess( + const ContentParentId& aCpId, Endpoint* aEndpoint); - virtual mozilla::ipc::IPCResult RecvOpenRecordReplayChannel( - const uint32_t& channelId, FileDescriptor* connection) override; - virtual mozilla::ipc::IPCResult RecvCreateReplayingProcess( - const uint32_t& aChannelId) override; + mozilla::ipc::IPCResult RecvOpenRecordReplayChannel( + const uint32_t& channelId, FileDescriptor* connection); + mozilla::ipc::IPCResult RecvCreateReplayingProcess( + const uint32_t& aChannelId); - virtual mozilla::ipc::IPCResult RecvCreateGMPService() override; + mozilla::ipc::IPCResult RecvCreateGMPService(); - virtual mozilla::ipc::IPCResult RecvLoadPlugin( + mozilla::ipc::IPCResult RecvLoadPlugin( const uint32_t& aPluginId, nsresult* aRv, uint32_t* aRunID, - Endpoint* aEndpoint) override; + Endpoint* aEndpoint); - virtual mozilla::ipc::IPCResult RecvMaybeReloadPlugins() override; + mozilla::ipc::IPCResult RecvMaybeReloadPlugins(); - virtual mozilla::ipc::IPCResult RecvConnectPluginBridge( + mozilla::ipc::IPCResult RecvConnectPluginBridge( const uint32_t& aPluginId, nsresult* aRv, - Endpoint* aEndpoint) override; + Endpoint* aEndpoint); - virtual mozilla::ipc::IPCResult RecvLaunchRDDProcess( - nsresult* aRv, Endpoint* aEndpoint) override; + mozilla::ipc::IPCResult RecvLaunchRDDProcess( + nsresult* aRv, Endpoint* aEndpoint); - virtual mozilla::ipc::IPCResult RecvUngrabPointer( - const uint32_t& aTime) override; + mozilla::ipc::IPCResult RecvUngrabPointer(const uint32_t& aTime); - virtual mozilla::ipc::IPCResult RecvRemovePermission( - const IPC::Principal& aPrincipal, const nsCString& aPermissionType, - nsresult* aRv) override; + mozilla::ipc::IPCResult RecvRemovePermission(const IPC::Principal& aPrincipal, + const nsCString& aPermissionType, + nsresult* aRv); NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(ContentParent, nsIObserver) @@ -404,8 +402,8 @@ class ContentParent final : public PContentParent, virtual void OnChannelError() override; - virtual mozilla::ipc::IPCResult RecvInitCrashReporter( - Shmem&& aShmem, const NativeThreadId& aThreadId) override; + mozilla::ipc::IPCResult RecvInitCrashReporter( + Shmem&& aShmem, const NativeThreadId& aThreadId); PNeckoParent* AllocPNeckoParent(); @@ -425,9 +423,9 @@ class ContentParent final : public PContentParent, already_AddRefed GetPrintingParent(); #endif - virtual mozilla::ipc::IPCResult RecvInitStreamFilter( + mozilla::ipc::IPCResult RecvInitStreamFilter( const uint64_t& aChannelId, const nsString& aAddonId, - InitStreamFilterResolver&& aResolver) override; + InitStreamFilterResolver&& aResolver); virtual PChildToParentStreamParent* AllocPChildToParentStreamParent() override; @@ -463,20 +461,20 @@ class ContentParent final : public PContentParent, PRemoteSpellcheckEngineParent* AllocPRemoteSpellcheckEngineParent(); - virtual mozilla::ipc::IPCResult RecvRecordingDeviceEvents( + mozilla::ipc::IPCResult RecvRecordingDeviceEvents( const nsString& aRecordingStatus, const nsString& aPageURL, - const bool& aIsAudio, const bool& aIsVideo) override; + const bool& aIsAudio, const bool& aIsVideo); bool CycleCollectWithLogs(bool aDumpAllTraces, nsICycleCollectorLogSink* aSink, nsIDumpGCAndCCLogsCallback* aCallback); - virtual mozilla::ipc::IPCResult RecvUnregisterRemoteFrame( + mozilla::ipc::IPCResult RecvUnregisterRemoteFrame( const TabId& aTabId, const ContentParentId& aCpId, - const bool& aMarkedDestroying) override; + const bool& aMarkedDestroying); - virtual mozilla::ipc::IPCResult RecvNotifyTabDestroying( - const TabId& aTabId, const ContentParentId& aCpId) override; + mozilla::ipc::IPCResult RecvNotifyTabDestroying(const TabId& aTabId, + const ContentParentId& aCpId); nsTArray GetManagedTabContext(); @@ -492,9 +490,9 @@ class ContentParent final : public PContentParent, bool DeallocPOfflineCacheUpdateParent(POfflineCacheUpdateParent* aActor); mozilla::ipc::IPCResult RecvSetOfflinePermission( - const IPC::Principal& principal) override; + const IPC::Principal& principal); - virtual mozilla::ipc::IPCResult RecvFinishShutdown() override; + mozilla::ipc::IPCResult RecvFinishShutdown(); void MaybeInvokeDragSession(TabParent* aParent); @@ -511,24 +509,23 @@ class ContentParent final : public PContentParent, void ForkNewProcess(bool aBlocking); - virtual mozilla::ipc::IPCResult RecvCreateWindow( + mozilla::ipc::IPCResult RecvCreateWindow( PBrowserParent* aThisTabParent, PBrowserParent* aNewTab, const uint32_t& aChromeFlags, const bool& aCalledFromJS, const bool& aPositionSpecified, const bool& aSizeSpecified, const OptionalURIParams& aURIToLoad, const nsCString& aFeatures, const nsCString& aBaseURI, const float& aFullZoom, const IPC::Principal& aTriggeringPrincipal, - const uint32_t& aReferrerPolicy, - CreateWindowResolver&& aResolve) override; + const uint32_t& aReferrerPolicy, CreateWindowResolver&& aResolve); - virtual mozilla::ipc::IPCResult RecvCreateWindowInDifferentProcess( + mozilla::ipc::IPCResult RecvCreateWindowInDifferentProcess( PBrowserParent* aThisTab, const uint32_t& aChromeFlags, const bool& aCalledFromJS, const bool& aPositionSpecified, const bool& aSizeSpecified, const OptionalURIParams& aURIToLoad, const nsCString& aFeatures, const nsCString& aBaseURI, const float& aFullZoom, const nsString& aName, const IPC::Principal& aTriggeringPrincipal, - const uint32_t& aReferrerPolicy) override; + const uint32_t& aReferrerPolicy); static void BroadcastBlobURLRegistration( const nsACString& aURI, BlobImpl* aBlobImpl, nsIPrincipal* aPrincipal, @@ -537,19 +534,16 @@ class ContentParent final : public PContentParent, static void BroadcastBlobURLUnregistration( const nsACString& aURI, ContentParent* aIgnoreThisCP = nullptr); - virtual mozilla::ipc::IPCResult RecvStoreAndBroadcastBlobURLRegistration( - const nsCString& aURI, const IPCBlob& aBlob, - const Principal& aPrincipal) override; + mozilla::ipc::IPCResult RecvStoreAndBroadcastBlobURLRegistration( + const nsCString& aURI, const IPCBlob& aBlob, const Principal& aPrincipal); - virtual mozilla::ipc::IPCResult RecvUnstoreAndBroadcastBlobURLUnregistration( - const nsCString& aURI) override; + mozilla::ipc::IPCResult RecvUnstoreAndBroadcastBlobURLUnregistration( + const nsCString& aURI); - virtual mozilla::ipc::IPCResult RecvGetA11yContentId( - uint32_t* aContentId) override; + mozilla::ipc::IPCResult RecvGetA11yContentId(uint32_t* aContentId); - virtual mozilla::ipc::IPCResult RecvA11yHandlerControl( - const uint32_t& aPid, - const IHandlerControlHolder& aHandlerControl) override; + mozilla::ipc::IPCResult RecvA11yHandlerControl( + const uint32_t& aPid, const IHandlerControlHolder& aHandlerControl); virtual int32_t Pid() const override; @@ -615,30 +609,28 @@ class ContentParent final : public PContentParent, static bool IsInputEventQueueSupported(); - virtual mozilla::ipc::IPCResult RecvAttachBrowsingContext( + mozilla::ipc::IPCResult RecvAttachBrowsingContext( const BrowsingContextId& aParentContextId, const BrowsingContextId& aOpenerId, const BrowsingContextId& aContextId, - const nsString& aName) override; + const nsString& aName); - virtual mozilla::ipc::IPCResult RecvDetachBrowsingContext( - const BrowsingContextId& aContextId, const bool& aMoveToBFCache) override; + mozilla::ipc::IPCResult RecvDetachBrowsingContext( + const BrowsingContextId& aContextId, const bool& aMoveToBFCache); - virtual mozilla::ipc::IPCResult RecvSetOpenerBrowsingContext( + mozilla::ipc::IPCResult RecvSetOpenerBrowsingContext( const BrowsingContextId& aContextId, - const BrowsingContextId& aOpenerContextId) override; + const BrowsingContextId& aOpenerContextId); - virtual mozilla::ipc::IPCResult RecvWindowClose( - const BrowsingContextId& aContextId, const bool& aTrustedCaller) override; - virtual mozilla::ipc::IPCResult RecvWindowFocus( - const BrowsingContextId& aContextId) override; - virtual mozilla::ipc::IPCResult RecvWindowBlur( - const BrowsingContextId& aContextId) override; - virtual mozilla::ipc::IPCResult RecvWindowPostMessage( + mozilla::ipc::IPCResult RecvWindowClose(const BrowsingContextId& aContextId, + const bool& aTrustedCaller); + mozilla::ipc::IPCResult RecvWindowFocus(const BrowsingContextId& aContextId); + mozilla::ipc::IPCResult RecvWindowBlur(const BrowsingContextId& aContextId); + mozilla::ipc::IPCResult RecvWindowPostMessage( const BrowsingContextId& aContextId, const ClonedMessageData& aMessage, - const PostMessageData& aData) override; + const PostMessageData& aData); - virtual mozilla::ipc::IPCResult RecvSetUserGestureActivation( - const BrowsingContextId& aContextId, const bool& aNewValue) override; + mozilla::ipc::IPCResult RecvSetUserGestureActivation( + const BrowsingContextId& aContextId, const bool& aNewValue); protected: void OnChannelConnected(int32_t pid) override; @@ -825,15 +817,13 @@ class ContentParent final : public PContentParent, static nsTArray& GetOrCreatePool( const nsAString& aContentProcessType); - virtual mozilla::ipc::IPCResult RecvInitBackground( - Endpoint&& aEndpoint) override; + mozilla::ipc::IPCResult RecvInitBackground( + Endpoint&& aEndpoint); - mozilla::ipc::IPCResult RecvAddMemoryReport( - const MemoryReport& aReport) override; - mozilla::ipc::IPCResult RecvFinishMemoryReport( - const uint32_t& aGeneration) override; + mozilla::ipc::IPCResult RecvAddMemoryReport(const MemoryReport& aReport); + mozilla::ipc::IPCResult RecvFinishMemoryReport(const uint32_t& aGeneration); mozilla::ipc::IPCResult RecvAddPerformanceMetrics( - const nsID& aID, nsTArray&& aMetrics) override; + const nsID& aID, nsTArray&& aMetrics); virtual bool DeallocPJavaScriptParent( mozilla::jsipc::PJavaScriptParent*) override; @@ -862,13 +852,13 @@ class ContentParent final : public PContentParent, virtual bool DeallocPIPCBlobInputStreamParent( PIPCBlobInputStreamParent* aActor) override; - virtual mozilla::ipc::IPCResult RecvIsSecureURI( + mozilla::ipc::IPCResult RecvIsSecureURI( const uint32_t& aType, const URIParams& aURI, const uint32_t& aFlags, - const OriginAttributes& aOriginAttributes, bool* aIsSecureURI) override; + const OriginAttributes& aOriginAttributes, bool* aIsSecureURI); - virtual mozilla::ipc::IPCResult RecvAccumulateMixedContentHSTS( + mozilla::ipc::IPCResult RecvAccumulateMixedContentHSTS( const URIParams& aURI, const bool& aActive, - const OriginAttributes& aOriginAttributes) override; + const OriginAttributes& aOriginAttributes); bool DeallocPHalParent(PHalParent*); @@ -936,110 +926,101 @@ class ContentParent final : public PContentParent, bool DeallocPWebBrowserPersistDocumentParent( PWebBrowserPersistDocumentParent* aActor); - virtual mozilla::ipc::IPCResult RecvGetGfxVars( - InfallibleTArray* aVars) override; + mozilla::ipc::IPCResult RecvGetGfxVars(InfallibleTArray* aVars); - virtual mozilla::ipc::IPCResult RecvReadFontList( - InfallibleTArray* retValue) override; + mozilla::ipc::IPCResult RecvReadFontList( + InfallibleTArray* retValue); - virtual mozilla::ipc::IPCResult RecvSetClipboard( + mozilla::ipc::IPCResult RecvSetClipboard( const IPCDataTransfer& aDataTransfer, const bool& aIsPrivateData, const IPC::Principal& aRequestingPrincipal, - const uint32_t& aContentPolicyType, - const int32_t& aWhichClipboard) override; + const uint32_t& aContentPolicyType, const int32_t& aWhichClipboard); - virtual mozilla::ipc::IPCResult RecvGetClipboard( - nsTArray&& aTypes, const int32_t& aWhichClipboard, - IPCDataTransfer* aDataTransfer) override; + mozilla::ipc::IPCResult RecvGetClipboard(nsTArray&& aTypes, + const int32_t& aWhichClipboard, + IPCDataTransfer* aDataTransfer); - virtual mozilla::ipc::IPCResult RecvEmptyClipboard( - const int32_t& aWhichClipboard) override; + mozilla::ipc::IPCResult RecvEmptyClipboard(const int32_t& aWhichClipboard); - virtual mozilla::ipc::IPCResult RecvClipboardHasType( - nsTArray&& aTypes, const int32_t& aWhichClipboard, - bool* aHasType) override; + mozilla::ipc::IPCResult RecvClipboardHasType(nsTArray&& aTypes, + const int32_t& aWhichClipboard, + bool* aHasType); - virtual mozilla::ipc::IPCResult RecvGetExternalClipboardFormats( + mozilla::ipc::IPCResult RecvGetExternalClipboardFormats( const int32_t& aWhichClipboard, const bool& aPlainTextOnly, - nsTArray* aTypes) override; + nsTArray* aTypes); - virtual mozilla::ipc::IPCResult RecvPlaySound(const URIParams& aURI) override; - virtual mozilla::ipc::IPCResult RecvBeep() override; - virtual mozilla::ipc::IPCResult RecvPlayEventSound( - const uint32_t& aEventId) override; + mozilla::ipc::IPCResult RecvPlaySound(const URIParams& aURI); + mozilla::ipc::IPCResult RecvBeep(); + mozilla::ipc::IPCResult RecvPlayEventSound(const uint32_t& aEventId); - virtual mozilla::ipc::IPCResult RecvGetIconForExtension( + mozilla::ipc::IPCResult RecvGetIconForExtension( const nsCString& aFileExt, const uint32_t& aIconSize, - InfallibleTArray* bits) override; + InfallibleTArray* bits); - virtual mozilla::ipc::IPCResult RecvGetShowPasswordSetting( - bool* showPassword) override; + mozilla::ipc::IPCResult RecvGetShowPasswordSetting(bool* showPassword); - virtual mozilla::ipc::IPCResult RecvStartVisitedQuery( - const URIParams& uri) override; + mozilla::ipc::IPCResult RecvStartVisitedQuery(const URIParams& uri); - virtual mozilla::ipc::IPCResult RecvSetURITitle( - const URIParams& uri, const nsString& title) override; + mozilla::ipc::IPCResult RecvSetURITitle(const URIParams& uri, + const nsString& title); bool HasNotificationPermission(const IPC::Principal& aPrincipal); - virtual mozilla::ipc::IPCResult RecvShowAlert( - nsIAlertNotification* aAlert) override; + mozilla::ipc::IPCResult RecvShowAlert(nsIAlertNotification* aAlert); - virtual mozilla::ipc::IPCResult RecvCloseAlert( - const nsString& aName, const IPC::Principal& aPrincipal) override; + mozilla::ipc::IPCResult RecvCloseAlert(const nsString& aName, + const IPC::Principal& aPrincipal); - virtual mozilla::ipc::IPCResult RecvDisableNotifications( - const IPC::Principal& aPrincipal) override; + mozilla::ipc::IPCResult RecvDisableNotifications( + const IPC::Principal& aPrincipal); - virtual mozilla::ipc::IPCResult RecvOpenNotificationSettings( - const IPC::Principal& aPrincipal) override; + mozilla::ipc::IPCResult RecvOpenNotificationSettings( + const IPC::Principal& aPrincipal); - virtual mozilla::ipc::IPCResult RecvNotificationEvent( - const nsString& aType, const NotificationEventData& aData) override; + mozilla::ipc::IPCResult RecvNotificationEvent( + const nsString& aType, const NotificationEventData& aData); - virtual mozilla::ipc::IPCResult RecvLoadURIExternal( - const URIParams& uri, PBrowserParent* windowContext) override; - virtual mozilla::ipc::IPCResult RecvExtProtocolChannelConnectParent( - const uint32_t& registrarId) override; + mozilla::ipc::IPCResult RecvLoadURIExternal(const URIParams& uri, + PBrowserParent* windowContext); + mozilla::ipc::IPCResult RecvExtProtocolChannelConnectParent( + const uint32_t& registrarId); - virtual mozilla::ipc::IPCResult RecvSyncMessage( + mozilla::ipc::IPCResult RecvSyncMessage( const nsString& aMsg, const ClonedMessageData& aData, InfallibleTArray&& aCpows, const IPC::Principal& aPrincipal, nsTArray* aRetvals) override; - virtual mozilla::ipc::IPCResult RecvRpcMessage( + mozilla::ipc::IPCResult RecvRpcMessage( const nsString& aMsg, const ClonedMessageData& aData, InfallibleTArray&& aCpows, const IPC::Principal& aPrincipal, nsTArray* aRetvals) override; - virtual mozilla::ipc::IPCResult RecvAsyncMessage( + mozilla::ipc::IPCResult RecvAsyncMessage( const nsString& aMsg, InfallibleTArray&& aCpows, const IPC::Principal& aPrincipal, const ClonedMessageData& aData) override; - virtual mozilla::ipc::IPCResult RecvAddGeolocationListener( - const IPC::Principal& aPrincipal, const bool& aHighAccuracy) override; - virtual mozilla::ipc::IPCResult RecvRemoveGeolocationListener() override; + mozilla::ipc::IPCResult RecvAddGeolocationListener( + const IPC::Principal& aPrincipal, const bool& aHighAccuracy); + mozilla::ipc::IPCResult RecvRemoveGeolocationListener(); - virtual mozilla::ipc::IPCResult RecvSetGeolocationHigherAccuracy( - const bool& aEnable) override; + mozilla::ipc::IPCResult RecvSetGeolocationHigherAccuracy(const bool& aEnable); - virtual mozilla::ipc::IPCResult RecvConsoleMessage( - const nsString& aMessage) override; + mozilla::ipc::IPCResult RecvConsoleMessage(const nsString& aMessage); - virtual mozilla::ipc::IPCResult RecvScriptError( + mozilla::ipc::IPCResult RecvScriptError( const nsString& aMessage, const nsString& aSourceName, const nsString& aSourceLine, const uint32_t& aLineNumber, const uint32_t& aColNumber, const uint32_t& aFlags, - const nsCString& aCategory, const bool& aIsFromPrivateWindow) override; + const nsCString& aCategory, const bool& aIsFromPrivateWindow); - virtual mozilla::ipc::IPCResult RecvScriptErrorWithStack( + mozilla::ipc::IPCResult RecvScriptErrorWithStack( const nsString& aMessage, const nsString& aSourceName, const nsString& aSourceLine, const uint32_t& aLineNumber, const uint32_t& aColNumber, const uint32_t& aFlags, const nsCString& aCategory, const bool& aIsFromPrivateWindow, - const ClonedMessageData& aStack) override; + const ClonedMessageData& aStack); private: mozilla::ipc::IPCResult RecvScriptErrorInternal( @@ -1050,58 +1031,56 @@ class ContentParent final : public PContentParent, const ClonedMessageData* aStack = nullptr); public: - virtual mozilla::ipc::IPCResult RecvPrivateDocShellsExist( - const bool& aExist) override; + mozilla::ipc::IPCResult RecvPrivateDocShellsExist(const bool& aExist); - virtual mozilla::ipc::IPCResult RecvFirstIdle() override; + mozilla::ipc::IPCResult RecvFirstIdle(); - virtual mozilla::ipc::IPCResult RecvDeviceReset() override; + mozilla::ipc::IPCResult RecvDeviceReset(); - virtual mozilla::ipc::IPCResult RecvKeywordToURI( - const nsCString& aKeyword, nsString* aProviderName, - RefPtr* aPostData, OptionalURIParams* aURI) override; + mozilla::ipc::IPCResult RecvKeywordToURI(const nsCString& aKeyword, + nsString* aProviderName, + RefPtr* aPostData, + OptionalURIParams* aURI); - virtual mozilla::ipc::IPCResult RecvNotifyKeywordSearchLoading( - const nsString& aProvider, const nsString& aKeyword) override; + mozilla::ipc::IPCResult RecvNotifyKeywordSearchLoading( + const nsString& aProvider, const nsString& aKeyword); - virtual mozilla::ipc::IPCResult RecvCopyFavicon( + mozilla::ipc::IPCResult RecvCopyFavicon( const URIParams& aOldURI, const URIParams& aNewURI, - const IPC::Principal& aLoadingPrincipal, - const bool& aInPrivateBrowsing) override; + const IPC::Principal& aLoadingPrincipal, const bool& aInPrivateBrowsing); virtual void ProcessingError(Result aCode, const char* aMsgName) override; - virtual mozilla::ipc::IPCResult RecvGraphicsError( - const nsCString& aError) override; + mozilla::ipc::IPCResult RecvGraphicsError(const nsCString& aError); - virtual mozilla::ipc::IPCResult RecvBeginDriverCrashGuard( - const uint32_t& aGuardType, bool* aOutCrashed) override; + mozilla::ipc::IPCResult RecvBeginDriverCrashGuard(const uint32_t& aGuardType, + bool* aOutCrashed); - virtual mozilla::ipc::IPCResult RecvEndDriverCrashGuard( - const uint32_t& aGuardType) override; + mozilla::ipc::IPCResult RecvEndDriverCrashGuard(const uint32_t& aGuardType); - virtual mozilla::ipc::IPCResult RecvAddIdleObserver( - const uint64_t& observerId, const uint32_t& aIdleTimeInS) override; + mozilla::ipc::IPCResult RecvAddIdleObserver(const uint64_t& observerId, + const uint32_t& aIdleTimeInS); - virtual mozilla::ipc::IPCResult RecvRemoveIdleObserver( - const uint64_t& observerId, const uint32_t& aIdleTimeInS) override; + mozilla::ipc::IPCResult RecvRemoveIdleObserver(const uint64_t& observerId, + const uint32_t& aIdleTimeInS); - virtual mozilla::ipc::IPCResult RecvBackUpXResources( - const FileDescriptor& aXSocketFd) override; + mozilla::ipc::IPCResult RecvBackUpXResources( + const FileDescriptor& aXSocketFd); - virtual mozilla::ipc::IPCResult RecvRequestAnonymousTemporaryFile( - const uint64_t& aID) override; + mozilla::ipc::IPCResult RecvRequestAnonymousTemporaryFile( + const uint64_t& aID); - virtual mozilla::ipc::IPCResult RecvCreateAudioIPCConnection( - CreateAudioIPCConnectionResolver&& aResolver) override; + mozilla::ipc::IPCResult RecvCreateAudioIPCConnection( + CreateAudioIPCConnectionResolver&& aResolver); - virtual mozilla::ipc::IPCResult RecvKeygenProcessValue( - const nsString& oldValue, const nsString& challenge, - const nsString& keytype, const nsString& keyparams, - nsString* newValue) override; + mozilla::ipc::IPCResult RecvKeygenProcessValue(const nsString& oldValue, + const nsString& challenge, + const nsString& keytype, + const nsString& keyparams, + nsString* newValue); - virtual mozilla::ipc::IPCResult RecvKeygenProvideContent( - nsString* aAttribute, nsTArray* aContent) override; + mozilla::ipc::IPCResult RecvKeygenProvideContent( + nsString* aAttribute, nsTArray* aContent); virtual PFileDescriptorSetParent* AllocPFileDescriptorSetParent( const mozilla::ipc::FileDescriptor&) override; @@ -1112,76 +1091,73 @@ class ContentParent final : public PContentParent, PWebrtcGlobalParent* AllocPWebrtcGlobalParent(); bool DeallocPWebrtcGlobalParent(PWebrtcGlobalParent* aActor); - virtual mozilla::ipc::IPCResult RecvUpdateDropEffect( - const uint32_t& aDragAction, const uint32_t& aDropEffect) override; + mozilla::ipc::IPCResult RecvUpdateDropEffect(const uint32_t& aDragAction, + const uint32_t& aDropEffect); - virtual mozilla::ipc::IPCResult RecvShutdownProfile( - const nsCString& aProfile) override; + mozilla::ipc::IPCResult RecvShutdownProfile(const nsCString& aProfile); - virtual mozilla::ipc::IPCResult RecvGetGraphicsDeviceInitData( - ContentDeviceData* aOut) override; + mozilla::ipc::IPCResult RecvGetGraphicsDeviceInitData( + ContentDeviceData* aOut); - virtual mozilla::ipc::IPCResult RecvGetAndroidSystemInfo( - AndroidSystemInfo* aInfo) override; + mozilla::ipc::IPCResult RecvGetAndroidSystemInfo(AndroidSystemInfo* aInfo); - virtual mozilla::ipc::IPCResult RecvNotifyBenchmarkResult( - const nsString& aCodecName, const uint32_t& aDecodeFPS) override; + mozilla::ipc::IPCResult RecvNotifyBenchmarkResult(const nsString& aCodecName, + const uint32_t& aDecodeFPS); - virtual mozilla::ipc::IPCResult RecvNotifyPushObservers( + mozilla::ipc::IPCResult RecvNotifyPushObservers( const nsCString& aScope, const IPC::Principal& aPrincipal, - const nsString& aMessageId) override; + const nsString& aMessageId); - virtual mozilla::ipc::IPCResult RecvNotifyPushObserversWithData( + mozilla::ipc::IPCResult RecvNotifyPushObserversWithData( const nsCString& aScope, const IPC::Principal& aPrincipal, - const nsString& aMessageId, InfallibleTArray&& aData) override; + const nsString& aMessageId, InfallibleTArray&& aData); - virtual mozilla::ipc::IPCResult RecvNotifyPushSubscriptionChangeObservers( - const nsCString& aScope, const IPC::Principal& aPrincipal) override; + mozilla::ipc::IPCResult RecvNotifyPushSubscriptionChangeObservers( + const nsCString& aScope, const IPC::Principal& aPrincipal); - virtual mozilla::ipc::IPCResult RecvPushError( - const nsCString& aScope, const IPC::Principal& aPrincipal, - const nsString& aMessage, const uint32_t& aFlags) override; + mozilla::ipc::IPCResult RecvPushError(const nsCString& aScope, + const IPC::Principal& aPrincipal, + const nsString& aMessage, + const uint32_t& aFlags); - virtual mozilla::ipc::IPCResult RecvNotifyPushSubscriptionModifiedObservers( - const nsCString& aScope, const IPC::Principal& aPrincipal) override; + mozilla::ipc::IPCResult RecvNotifyPushSubscriptionModifiedObservers( + const nsCString& aScope, const IPC::Principal& aPrincipal); - virtual mozilla::ipc::IPCResult RecvGetFilesRequest( - const nsID& aID, const nsString& aDirectoryPath, - const bool& aRecursiveFlag) override; + mozilla::ipc::IPCResult RecvGetFilesRequest(const nsID& aID, + const nsString& aDirectoryPath, + const bool& aRecursiveFlag); - virtual mozilla::ipc::IPCResult RecvDeleteGetFilesRequest( - const nsID& aID) override; + mozilla::ipc::IPCResult RecvDeleteGetFilesRequest(const nsID& aID); - virtual mozilla::ipc::IPCResult RecvFileCreationRequest( + mozilla::ipc::IPCResult RecvFileCreationRequest( const nsID& aID, const nsString& aFullPath, const nsString& aType, const nsString& aName, const bool& aLastModifiedPassed, const int64_t& aLastModified, const bool& aExistenceCheck, - const bool& aIsFromNsIFile) override; + const bool& aIsFromNsIFile); - virtual mozilla::ipc::IPCResult RecvAccumulateChildHistograms( - InfallibleTArray&& aAccumulations) override; - virtual mozilla::ipc::IPCResult RecvAccumulateChildKeyedHistograms( - InfallibleTArray&& aAccumulations) override; - virtual mozilla::ipc::IPCResult RecvUpdateChildScalars( - InfallibleTArray&& aScalarActions) override; - virtual mozilla::ipc::IPCResult RecvUpdateChildKeyedScalars( - InfallibleTArray&& aScalarActions) override; - virtual mozilla::ipc::IPCResult RecvRecordChildEvents( - nsTArray&& events) override; - virtual mozilla::ipc::IPCResult RecvRecordDiscardedData( - const DiscardedData& aDiscardedData) override; + mozilla::ipc::IPCResult RecvAccumulateChildHistograms( + InfallibleTArray&& aAccumulations); + mozilla::ipc::IPCResult RecvAccumulateChildKeyedHistograms( + InfallibleTArray&& aAccumulations); + mozilla::ipc::IPCResult RecvUpdateChildScalars( + InfallibleTArray&& aScalarActions); + mozilla::ipc::IPCResult RecvUpdateChildKeyedScalars( + InfallibleTArray&& aScalarActions); + mozilla::ipc::IPCResult RecvRecordChildEvents( + nsTArray&& events); + mozilla::ipc::IPCResult RecvRecordDiscardedData( + const DiscardedData& aDiscardedData); - virtual mozilla::ipc::IPCResult RecvBHRThreadHang( - const HangDetails& aHangDetails) override; + mozilla::ipc::IPCResult RecvBHRThreadHang(const HangDetails& aHangDetails); - virtual mozilla::ipc::IPCResult RecvFirstPartyStorageAccessGrantedForOrigin( + mozilla::ipc::IPCResult RecvFirstPartyStorageAccessGrantedForOrigin( const Principal& aParentPrincipal, const Principal& aTrackingPrincipal, const nsCString& aTrackingOrigin, const nsCString& aGrantedOrigin, const int& aAllowMode, - FirstPartyStorageAccessGrantedForOriginResolver&& aResolver) override; + FirstPartyStorageAccessGrantedForOriginResolver&& aResolver); - virtual mozilla::ipc::IPCResult RecvStoreUserInteractionAsPermission( - const Principal& aPrincipal) override; + mozilla::ipc::IPCResult RecvStoreUserInteractionAsPermission( + const Principal& aPrincipal); // Notify the ContentChild to enable the input event prioritization when // initializing. diff --git a/dom/ipc/FilePickerParent.h b/dom/ipc/FilePickerParent.h index 0f48d3e555aa..ee4bede80815 100644 --- a/dom/ipc/FilePickerParent.h +++ b/dom/ipc/FilePickerParent.h @@ -37,15 +37,16 @@ class FilePickerParent : public PFilePickerParent { void SendFilesOrDirectories(const nsTArray& aData); - virtual mozilla::ipc::IPCResult RecvOpen( - const int16_t& aSelectedType, const bool& aAddToRecentDocs, - const nsString& aDefaultFile, const nsString& aDefaultExtension, - InfallibleTArray&& aFilters, - InfallibleTArray&& aFilterNames, - InfallibleTArray&& aRawFilters, - const nsString& aDisplayDirectory, - const nsString& aDisplaySpecialDirectory, - const nsString& aOkButtonLabel) override; + mozilla::ipc::IPCResult RecvOpen(const int16_t& aSelectedType, + const bool& aAddToRecentDocs, + const nsString& aDefaultFile, + const nsString& aDefaultExtension, + InfallibleTArray&& aFilters, + InfallibleTArray&& aFilterNames, + InfallibleTArray&& aRawFilters, + const nsString& aDisplayDirectory, + const nsString& aDisplaySpecialDirectory, + const nsString& aOkButtonLabel); virtual void ActorDestroy(ActorDestroyReason aWhy) override; diff --git a/dom/ipc/TabParent.h b/dom/ipc/TabParent.h index ba5b15149bd1..a3bc9b535144 100644 --- a/dom/ipc/TabParent.h +++ b/dom/ipc/TabParent.h @@ -136,163 +136,156 @@ class TabParent final : public PBrowserParent, void AddWindowListeners(); - virtual mozilla::ipc::IPCResult RecvMoveFocus( - const bool& aForward, const bool& aForDocumentNavigation) override; + mozilla::ipc::IPCResult RecvMoveFocus(const bool& aForward, + const bool& aForDocumentNavigation); - virtual mozilla::ipc::IPCResult RecvSizeShellTo( - const uint32_t& aFlags, const int32_t& aWidth, const int32_t& aHeight, - const int32_t& aShellItemWidth, const int32_t& aShellItemHeight) override; + mozilla::ipc::IPCResult RecvSizeShellTo(const uint32_t& aFlags, + const int32_t& aWidth, + const int32_t& aHeight, + const int32_t& aShellItemWidth, + const int32_t& aShellItemHeight); - virtual mozilla::ipc::IPCResult RecvDropLinks( - nsTArray&& aLinks) override; + mozilla::ipc::IPCResult RecvDropLinks(nsTArray&& aLinks); - virtual mozilla::ipc::IPCResult RecvEvent( - const RemoteDOMEvent& aEvent) override; + mozilla::ipc::IPCResult RecvEvent(const RemoteDOMEvent& aEvent); - virtual mozilla::ipc::IPCResult RecvReplyKeyEvent( - const WidgetKeyboardEvent& aEvent) override; + mozilla::ipc::IPCResult RecvReplyKeyEvent(const WidgetKeyboardEvent& aEvent); - virtual mozilla::ipc::IPCResult RecvAccessKeyNotHandled( - const WidgetKeyboardEvent& aEvent) override; + mozilla::ipc::IPCResult RecvAccessKeyNotHandled( + const WidgetKeyboardEvent& aEvent); - virtual mozilla::ipc::IPCResult RecvSetHasBeforeUnload( - const bool& aHasBeforeUnload) override; + mozilla::ipc::IPCResult RecvSetHasBeforeUnload(const bool& aHasBeforeUnload); - virtual mozilla::ipc::IPCResult RecvRegisterProtocolHandler( - const nsString& aScheme, nsIURI* aHandlerURI, const nsString& aTitle, - nsIURI* aDocURI) override; + mozilla::ipc::IPCResult RecvRegisterProtocolHandler(const nsString& aScheme, + nsIURI* aHandlerURI, + const nsString& aTitle, + nsIURI* aDocURI); - virtual mozilla::ipc::IPCResult RecvOnContentBlockingEvent( + mozilla::ipc::IPCResult RecvOnContentBlockingEvent( const OptionalWebProgressData& aWebProgressData, - const RequestData& aRequestData, const uint32_t& aEvent) override; + const RequestData& aRequestData, const uint32_t& aEvent); - virtual mozilla::ipc::IPCResult RecvBrowserFrameOpenWindow( + mozilla::ipc::IPCResult RecvBrowserFrameOpenWindow( PBrowserParent* aOpener, const nsString& aURL, const nsString& aName, - const nsString& aFeatures, - BrowserFrameOpenWindowResolver&& aResolve) override; + const nsString& aFeatures, BrowserFrameOpenWindowResolver&& aResolve); - virtual mozilla::ipc::IPCResult RecvSyncMessage( + mozilla::ipc::IPCResult RecvSyncMessage( const nsString& aMessage, const ClonedMessageData& aData, InfallibleTArray&& aCpows, const IPC::Principal& aPrincipal, - nsTArray* aRetVal) override; + nsTArray* aRetVal); - virtual mozilla::ipc::IPCResult RecvRpcMessage( + mozilla::ipc::IPCResult RecvRpcMessage( const nsString& aMessage, const ClonedMessageData& aData, InfallibleTArray&& aCpows, const IPC::Principal& aPrincipal, - nsTArray* aRetVal) override; + nsTArray* aRetVal); - virtual mozilla::ipc::IPCResult RecvAsyncMessage( - const nsString& aMessage, InfallibleTArray&& aCpows, - const IPC::Principal& aPrincipal, - const ClonedMessageData& aData) override; + mozilla::ipc::IPCResult RecvAsyncMessage(const nsString& aMessage, + InfallibleTArray&& aCpows, + const IPC::Principal& aPrincipal, + const ClonedMessageData& aData); - virtual mozilla::ipc::IPCResult RecvNotifyIMEFocus( + mozilla::ipc::IPCResult RecvNotifyIMEFocus( const ContentCache& aContentCache, const widget::IMENotification& aEventMessage, - NotifyIMEFocusResolver&& aResolve) override; + NotifyIMEFocusResolver&& aResolve); - virtual mozilla::ipc::IPCResult RecvNotifyIMETextChange( + mozilla::ipc::IPCResult RecvNotifyIMETextChange( const ContentCache& aContentCache, - const widget::IMENotification& aEventMessage) override; + const widget::IMENotification& aEventMessage); - virtual mozilla::ipc::IPCResult RecvNotifyIMECompositionUpdate( + mozilla::ipc::IPCResult RecvNotifyIMECompositionUpdate( const ContentCache& aContentCache, - const widget::IMENotification& aEventMessage) override; + const widget::IMENotification& aEventMessage); - virtual mozilla::ipc::IPCResult RecvNotifyIMESelection( + mozilla::ipc::IPCResult RecvNotifyIMESelection( const ContentCache& aContentCache, - const widget::IMENotification& aEventMessage) override; + const widget::IMENotification& aEventMessage); - virtual mozilla::ipc::IPCResult RecvUpdateContentCache( - const ContentCache& aContentCache) override; + mozilla::ipc::IPCResult RecvUpdateContentCache( + const ContentCache& aContentCache); - virtual mozilla::ipc::IPCResult RecvNotifyIMEMouseButtonEvent( - const widget::IMENotification& aEventMessage, - bool* aConsumedByIME) override; + mozilla::ipc::IPCResult RecvNotifyIMEMouseButtonEvent( + const widget::IMENotification& aEventMessage, bool* aConsumedByIME); - virtual mozilla::ipc::IPCResult RecvNotifyIMEPositionChange( + mozilla::ipc::IPCResult RecvNotifyIMEPositionChange( const ContentCache& aContentCache, - const widget::IMENotification& aEventMessage) override; + const widget::IMENotification& aEventMessage); - virtual mozilla::ipc::IPCResult RecvOnEventNeedingAckHandled( - const EventMessage& aMessage) override; + mozilla::ipc::IPCResult RecvOnEventNeedingAckHandled( + const EventMessage& aMessage); - virtual mozilla::ipc::IPCResult RecvRequestIMEToCommitComposition( - const bool& aCancel, bool* aIsCommitted, - nsString* aCommittedString) override; + mozilla::ipc::IPCResult RecvRequestIMEToCommitComposition( + const bool& aCancel, bool* aIsCommitted, nsString* aCommittedString); - virtual mozilla::ipc::IPCResult RecvStartPluginIME( + mozilla::ipc::IPCResult RecvStartPluginIME( const WidgetKeyboardEvent& aKeyboardEvent, const int32_t& aPanelX, - const int32_t& aPanelY, nsString* aCommitted) override; + const int32_t& aPanelY, nsString* aCommitted); - virtual mozilla::ipc::IPCResult RecvSetPluginFocused( - const bool& aFocused) override; + mozilla::ipc::IPCResult RecvSetPluginFocused(const bool& aFocused); - virtual mozilla::ipc::IPCResult RecvSetCandidateWindowForPlugin( - const widget::CandidateWindowPosition& aPosition) override; - virtual mozilla::ipc::IPCResult RecvEnableIMEForPlugin( - const bool& aEnable) override; + mozilla::ipc::IPCResult RecvSetCandidateWindowForPlugin( + const widget::CandidateWindowPosition& aPosition); + mozilla::ipc::IPCResult RecvEnableIMEForPlugin(const bool& aEnable); - virtual mozilla::ipc::IPCResult RecvDefaultProcOfPluginEvent( - const WidgetPluginEvent& aEvent) override; + mozilla::ipc::IPCResult RecvDefaultProcOfPluginEvent( + const WidgetPluginEvent& aEvent); - virtual mozilla::ipc::IPCResult RecvGetInputContext( - widget::IMEState* aIMEState) override; + mozilla::ipc::IPCResult RecvGetInputContext(widget::IMEState* aIMEState); - virtual mozilla::ipc::IPCResult RecvSetInputContext( + mozilla::ipc::IPCResult RecvSetInputContext( const widget::InputContext& aContext, - const widget::InputContextAction& aAction) override; + const widget::InputContextAction& aAction); // See nsIKeyEventInPluginCallback virtual void HandledWindowedPluginKeyEvent( const NativeEventData& aKeyEventData, bool aIsConsumed) override; - virtual mozilla::ipc::IPCResult RecvOnWindowedPluginKeyEvent( - const NativeEventData& aKeyEventData) override; + mozilla::ipc::IPCResult RecvOnWindowedPluginKeyEvent( + const NativeEventData& aKeyEventData); - virtual mozilla::ipc::IPCResult RecvRequestFocus( - const bool& aCanRaise) override; + mozilla::ipc::IPCResult RecvRequestFocus(const bool& aCanRaise); - virtual mozilla::ipc::IPCResult RecvLookUpDictionary( + mozilla::ipc::IPCResult RecvLookUpDictionary( const nsString& aText, nsTArray&& aFontRangeArray, - const bool& aIsVertical, const LayoutDeviceIntPoint& aPoint) override; + const bool& aIsVertical, const LayoutDeviceIntPoint& aPoint); - virtual mozilla::ipc::IPCResult RecvEnableDisableCommands( + mozilla::ipc::IPCResult RecvEnableDisableCommands( const nsString& aAction, nsTArray&& aEnabledCommands, - nsTArray&& aDisabledCommands) override; + nsTArray&& aDisabledCommands); - virtual mozilla::ipc::IPCResult RecvSetCursor( + mozilla::ipc::IPCResult RecvSetCursor( const nsCursor& aValue, const bool& aHasCustomCursor, const nsCString& aUri, const uint32_t& aWidth, const uint32_t& aHeight, const uint32_t& aStride, const gfx::SurfaceFormat& aFormat, const uint32_t& aHotspotX, const uint32_t& aHotspotY, - const bool& aForce) override; + const bool& aForce); - virtual mozilla::ipc::IPCResult RecvSetStatus( - const uint32_t& aType, const nsString& aStatus) override; + mozilla::ipc::IPCResult RecvSetStatus( + const uint32_t& aType, const nsString& aStatus); - virtual mozilla::ipc::IPCResult RecvShowTooltip( - const uint32_t& aX, const uint32_t& aY, const nsString& aTooltip, - const nsString& aDirection) override; + mozilla::ipc::IPCResult RecvShowTooltip(const uint32_t& aX, + const uint32_t& aY, + const nsString& aTooltip, + const nsString& aDirection); - virtual mozilla::ipc::IPCResult RecvHideTooltip() override; + mozilla::ipc::IPCResult RecvHideTooltip(); - virtual mozilla::ipc::IPCResult RecvSetNativeChildOfShareableWindow( - const uintptr_t& childWindow) override; + mozilla::ipc::IPCResult RecvSetNativeChildOfShareableWindow( + const uintptr_t& childWindow); - virtual mozilla::ipc::IPCResult RecvDispatchFocusToTopLevelWindow() override; + mozilla::ipc::IPCResult RecvDispatchFocusToTopLevelWindow(); - virtual mozilla::ipc::IPCResult RecvRespondStartSwipeEvent( - const uint64_t& aInputBlockId, const bool& aStartSwipe) override; + mozilla::ipc::IPCResult RecvRespondStartSwipeEvent( + const uint64_t& aInputBlockId, const bool& aStartSwipe); - virtual mozilla::ipc::IPCResult RecvDispatchWheelEvent( - const mozilla::WidgetWheelEvent& aEvent) override; + mozilla::ipc::IPCResult RecvDispatchWheelEvent( + const mozilla::WidgetWheelEvent& aEvent); - virtual mozilla::ipc::IPCResult RecvDispatchMouseEvent( - const mozilla::WidgetMouseEvent& aEvent) override; + mozilla::ipc::IPCResult RecvDispatchMouseEvent( + const mozilla::WidgetMouseEvent& aEvent); - virtual mozilla::ipc::IPCResult RecvDispatchKeyboardEvent( - const mozilla::WidgetKeyboardEvent& aEvent) override; + mozilla::ipc::IPCResult RecvDispatchKeyboardEvent( + const mozilla::WidgetKeyboardEvent& aEvent); PColorPickerParent* AllocPColorPickerParent(const nsString& aTitle, const nsString& aInitialColor); @@ -359,46 +352,43 @@ class TabParent final : public PBrowserParent, LayoutDeviceToCSSScale GetLayoutDeviceToCSSScale(); - virtual mozilla::ipc::IPCResult RecvRequestNativeKeyBindings( + mozilla::ipc::IPCResult RecvRequestNativeKeyBindings( const uint32_t& aType, const mozilla::WidgetKeyboardEvent& aEvent, - nsTArray* aCommands) override; + nsTArray* aCommands); - virtual mozilla::ipc::IPCResult RecvSynthesizeNativeKeyEvent( + mozilla::ipc::IPCResult RecvSynthesizeNativeKeyEvent( const int32_t& aNativeKeyboardLayout, const int32_t& aNativeKeyCode, const uint32_t& aModifierFlags, const nsString& aCharacters, - const nsString& aUnmodifiedCharacters, - const uint64_t& aObserverId) override; + const nsString& aUnmodifiedCharacters, const uint64_t& aObserverId); - virtual mozilla::ipc::IPCResult RecvSynthesizeNativeMouseEvent( + mozilla::ipc::IPCResult RecvSynthesizeNativeMouseEvent( const LayoutDeviceIntPoint& aPoint, const uint32_t& aNativeMessage, - const uint32_t& aModifierFlags, const uint64_t& aObserverId) override; + const uint32_t& aModifierFlags, const uint64_t& aObserverId); - virtual mozilla::ipc::IPCResult RecvSynthesizeNativeMouseMove( - const LayoutDeviceIntPoint& aPoint, const uint64_t& aObserverId) override; + mozilla::ipc::IPCResult RecvSynthesizeNativeMouseMove( + const LayoutDeviceIntPoint& aPoint, const uint64_t& aObserverId); - virtual mozilla::ipc::IPCResult RecvSynthesizeNativeMouseScrollEvent( + mozilla::ipc::IPCResult RecvSynthesizeNativeMouseScrollEvent( const LayoutDeviceIntPoint& aPoint, const uint32_t& aNativeMessage, const double& aDeltaX, const double& aDeltaY, const double& aDeltaZ, const uint32_t& aModifierFlags, const uint32_t& aAdditionalFlags, - const uint64_t& aObserverId) override; + const uint64_t& aObserverId); - virtual mozilla::ipc::IPCResult RecvSynthesizeNativeTouchPoint( + mozilla::ipc::IPCResult RecvSynthesizeNativeTouchPoint( const uint32_t& aPointerId, const TouchPointerState& aPointerState, const LayoutDeviceIntPoint& aPoint, const double& aPointerPressure, - const uint32_t& aPointerOrientation, - const uint64_t& aObserverId) override; + const uint32_t& aPointerOrientation, const uint64_t& aObserverId); - virtual mozilla::ipc::IPCResult RecvSynthesizeNativeTouchTap( + mozilla::ipc::IPCResult RecvSynthesizeNativeTouchTap( const LayoutDeviceIntPoint& aPoint, const bool& aLongTap, - const uint64_t& aObserverId) override; + const uint64_t& aObserverId); - virtual mozilla::ipc::IPCResult RecvClearNativeTouchSequence( - const uint64_t& aObserverId) override; + mozilla::ipc::IPCResult RecvClearNativeTouchSequence( + const uint64_t& aObserverId); - virtual mozilla::ipc::IPCResult RecvSetPrefersReducedMotionOverrideForTest( - const bool& aValue) override; - virtual mozilla::ipc::IPCResult RecvResetPrefersReducedMotionOverrideForTest() - override; + mozilla::ipc::IPCResult RecvSetPrefersReducedMotionOverrideForTest( + const bool& aValue); + mozilla::ipc::IPCResult RecvResetPrefersReducedMotionOverrideForTest(); void SendMouseEvent(const nsAString& aType, float aX, float aY, int32_t aButton, int32_t aClickCount, int32_t aModifiers, @@ -529,11 +519,11 @@ class TabParent final : public PBrowserParent, void RequestSubPaint(gfx::CrossProcessPaint* aPaint, float aScale, nscolor aBackgroundColor); - virtual mozilla::ipc::IPCResult RecvInvokeDragSession( + mozilla::ipc::IPCResult RecvInvokeDragSession( nsTArray&& aTransfers, const uint32_t& aAction, const OptionalShmem& aVisualDnDData, const uint32_t& aStride, const gfx::SurfaceFormat& aFormat, const LayoutDeviceIntRect& aDragRect, - const IPC::Principal& aPrincipal) override; + const IPC::Principal& aPrincipal); void AddInitialDnDDataTo(DataTransfer* aDataTransfer, nsIPrincipal** aPrincipal); @@ -544,7 +534,7 @@ class TabParent final : public PBrowserParent, layout::RenderFrame* GetRenderFrame(); mozilla::ipc::IPCResult RecvEnsureLayersConnected( - CompositorOptions* aCompositorOptions) override; + CompositorOptions* aCompositorOptions); // LiveResizeListener implementation void LiveResizeStarted() override; @@ -565,9 +555,9 @@ class TabParent final : public PBrowserParent, mozilla::jsipc::CpowHolder* aCpows, nsIPrincipal* aPrincipal, nsTArray* aJSONRetVal = nullptr); - virtual mozilla::ipc::IPCResult RecvAsyncAuthPrompt( - const nsCString& aUri, const nsString& aRealm, - const uint64_t& aCallbackId) override; + mozilla::ipc::IPCResult RecvAsyncAuthPrompt(const nsCString& aUri, + const nsString& aRealm, + const uint64_t& aCallbackId); virtual mozilla::ipc::IPCResult Recv__delete__() override; @@ -576,36 +566,35 @@ class TabParent final : public PBrowserParent, Element* mFrameElement; nsCOMPtr mBrowserDOMWindow; - virtual mozilla::ipc::IPCResult RecvRemotePaintIsReady() override; + mozilla::ipc::IPCResult RecvRemotePaintIsReady(); - virtual mozilla::ipc::IPCResult RecvNotifyCompositorTransaction() override; + mozilla::ipc::IPCResult RecvNotifyCompositorTransaction(); - virtual mozilla::ipc::IPCResult RecvRemoteIsReadyToHandleInputEvents() - override; + mozilla::ipc::IPCResult RecvRemoteIsReadyToHandleInputEvents(); - virtual mozilla::ipc::IPCResult RecvPaintWhileInterruptingJSNoOp( - const LayersObserverEpoch& aEpoch) override; + mozilla::ipc::IPCResult RecvPaintWhileInterruptingJSNoOp( + const LayersObserverEpoch& aEpoch); - virtual mozilla::ipc::IPCResult RecvSetDimensions( - const uint32_t& aFlags, const int32_t& aX, const int32_t& aY, - const int32_t& aCx, const int32_t& aCy) override; + mozilla::ipc::IPCResult RecvSetDimensions(const uint32_t& aFlags, + const int32_t& aX, + const int32_t& aY, + const int32_t& aCx, + const int32_t& aCy); - virtual mozilla::ipc::IPCResult RecvShowCanvasPermissionPrompt( - const nsCString& aFirstPartyURI, const bool& aHideDoorHanger) override; + mozilla::ipc::IPCResult RecvShowCanvasPermissionPrompt( + const nsCString& aFirstPartyURI, const bool& aHideDoorHanger); - virtual mozilla::ipc::IPCResult RecvRootBrowsingContext( - const BrowsingContextId& aId) override; + mozilla::ipc::IPCResult RecvRootBrowsingContext(const BrowsingContextId& aId); - mozilla::ipc::IPCResult RecvSetSystemFont( - const nsCString& aFontName) override; - mozilla::ipc::IPCResult RecvGetSystemFont(nsCString* aFontName) override; + mozilla::ipc::IPCResult RecvSetSystemFont(const nsCString& aFontName); + mozilla::ipc::IPCResult RecvGetSystemFont(nsCString* aFontName); - virtual mozilla::ipc::IPCResult RecvVisitURI( - const URIParams& aURI, const OptionalURIParams& aLastVisitedURI, - const uint32_t& aFlags) override; + mozilla::ipc::IPCResult RecvVisitURI(const URIParams& aURI, + const OptionalURIParams& aLastVisitedURI, + const uint32_t& aFlags); - virtual mozilla::ipc::IPCResult RecvQueryVisitedState( - InfallibleTArray&& aURIs) override; + mozilla::ipc::IPCResult RecvQueryVisitedState( + InfallibleTArray&& aURIs); ContentCacheInParent mContentCache; diff --git a/dom/ipc/WindowGlobalParent.h b/dom/ipc/WindowGlobalParent.h index a4714923a091..a4648866a78d 100644 --- a/dom/ipc/WindowGlobalParent.h +++ b/dom/ipc/WindowGlobalParent.h @@ -99,9 +99,9 @@ class WindowGlobalParent final : public nsISupports, protected: // IPC messages - mozilla::ipc::IPCResult RecvUpdateDocumentURI(nsIURI* aURI) override; - mozilla::ipc::IPCResult RecvBecomeCurrentWindowGlobal() override; - mozilla::ipc::IPCResult RecvDestroy() override; + mozilla::ipc::IPCResult RecvUpdateDocumentURI(nsIURI* aURI); + mozilla::ipc::IPCResult RecvBecomeCurrentWindowGlobal(); + mozilla::ipc::IPCResult RecvDestroy(); void ActorDestroy(ActorDestroyReason aWhy) override; diff --git a/dom/media/gmp/ChromiumCDMParent.h b/dom/media/gmp/ChromiumCDMParent.h index 21e6c19fa9a4..03f1cbf3e4eb 100644 --- a/dom/media/gmp/ChromiumCDMParent.h +++ b/dom/media/gmp/ChromiumCDMParent.h @@ -90,40 +90,39 @@ class ChromiumCDMParent final : public PChromiumCDMParent, ~ChromiumCDMParent() {} ipc::IPCResult Recv__delete__() override; - ipc::IPCResult RecvOnResolvePromiseWithKeyStatus( - const uint32_t& aPromiseId, const uint32_t& aKeyStatus) override; - ipc::IPCResult RecvOnResolveNewSessionPromise( - const uint32_t& aPromiseId, const nsCString& aSessionId) override; - ipc::IPCResult RecvResolveLoadSessionPromise( - const uint32_t& aPromiseId, const bool& aSuccessful) override; - ipc::IPCResult RecvOnResolvePromise(const uint32_t& aPromiseId) override; + ipc::IPCResult RecvOnResolvePromiseWithKeyStatus(const uint32_t& aPromiseId, + const uint32_t& aKeyStatus); + ipc::IPCResult RecvOnResolveNewSessionPromise(const uint32_t& aPromiseId, + const nsCString& aSessionId); + ipc::IPCResult RecvResolveLoadSessionPromise(const uint32_t& aPromiseId, + const bool& aSuccessful); + ipc::IPCResult RecvOnResolvePromise(const uint32_t& aPromiseId); ipc::IPCResult RecvOnRejectPromise(const uint32_t& aPromiseId, const uint32_t& aError, const uint32_t& aSystemCode, - const nsCString& aErrorMessage) override; + const nsCString& aErrorMessage); ipc::IPCResult RecvOnSessionMessage(const nsCString& aSessionId, const uint32_t& aMessageType, - nsTArray&& aMessage) override; + nsTArray&& aMessage); ipc::IPCResult RecvOnSessionKeysChange( - const nsCString& aSessionId, - nsTArray&& aKeysInfo) override; - ipc::IPCResult RecvOnExpirationChange( - const nsCString& aSessionId, const double& aSecondsSinceEpoch) override; - ipc::IPCResult RecvOnSessionClosed(const nsCString& aSessionId) override; + const nsCString& aSessionId, nsTArray&& aKeysInfo); + ipc::IPCResult RecvOnExpirationChange(const nsCString& aSessionId, + const double& aSecondsSinceEpoch); + ipc::IPCResult RecvOnSessionClosed(const nsCString& aSessionId); ipc::IPCResult RecvDecrypted(const uint32_t& aId, const uint32_t& aStatus, - ipc::Shmem&& aData) override; + ipc::Shmem&& aData); ipc::IPCResult RecvDecryptFailed(const uint32_t& aId, - const uint32_t& aStatus) override; - ipc::IPCResult RecvOnDecoderInitDone(const uint32_t& aStatus) override; + const uint32_t& aStatus); + ipc::IPCResult RecvOnDecoderInitDone(const uint32_t& aStatus); ipc::IPCResult RecvDecodedShmem(const CDMVideoFrame& aFrame, - ipc::Shmem&& aShmem) override; + ipc::Shmem&& aShmem); ipc::IPCResult RecvDecodedData(const CDMVideoFrame& aFrame, - nsTArray&& aData) override; - ipc::IPCResult RecvDecodeFailed(const uint32_t& aStatus) override; - ipc::IPCResult RecvShutdown() override; - ipc::IPCResult RecvResetVideoDecoderComplete() override; - ipc::IPCResult RecvDrainComplete() override; - ipc::IPCResult RecvIncreaseShmemPoolSize() override; + nsTArray&& aData); + ipc::IPCResult RecvDecodeFailed(const uint32_t& aStatus); + ipc::IPCResult RecvShutdown(); + ipc::IPCResult RecvResetVideoDecoderComplete(); + ipc::IPCResult RecvDrainComplete(); + ipc::IPCResult RecvIncreaseShmemPoolSize(); void ActorDestroy(ActorDestroyReason aWhy) override; bool SendBufferToCDM(uint32_t aSizeInBytes); diff --git a/dom/media/gmp/GMPChild.h b/dom/media/gmp/GMPChild.h index 77faf4ab31af..375ff4e5d469 100644 --- a/dom/media/gmp/GMPChild.h +++ b/dom/media/gmp/GMPChild.h @@ -45,11 +45,10 @@ class GMPChild : public PGMPChild { bool GetUTF8LibPath(nsACString& aOutLibPath); - mozilla::ipc::IPCResult RecvProvideStorageId( - const nsCString& aStorageId) override; + mozilla::ipc::IPCResult RecvProvideStorageId(const nsCString& aStorageId); - mozilla::ipc::IPCResult AnswerStartPlugin(const nsString& aAdapter) override; - mozilla::ipc::IPCResult RecvPreloadLibs(const nsCString& aLibs) override; + mozilla::ipc::IPCResult AnswerStartPlugin(const nsString& aAdapter); + mozilla::ipc::IPCResult RecvPreloadLibs(const nsCString& aLibs); PGMPTimerChild* AllocPGMPTimerChild(); bool DeallocPGMPTimerChild(PGMPTimerChild* aActor); @@ -59,11 +58,11 @@ class GMPChild : public PGMPChild { void GMPContentChildActorDestroy(GMPContentChild* aGMPContentChild); - mozilla::ipc::IPCResult RecvCrashPluginNow() override; - mozilla::ipc::IPCResult RecvCloseActive() override; + mozilla::ipc::IPCResult RecvCrashPluginNow(); + mozilla::ipc::IPCResult RecvCloseActive(); mozilla::ipc::IPCResult RecvInitGMPContentChild( - Endpoint&& aEndpoint) override; + Endpoint&& aEndpoint); void ActorDestroy(ActorDestroyReason aWhy) override; void ProcessingError(Result aCode, const char* aReason) override; diff --git a/dom/media/gmp/GMPParent.h b/dom/media/gmp/GMPParent.h index ef83c4d029b9..f8f7443f7915 100644 --- a/dom/media/gmp/GMPParent.h +++ b/dom/media/gmp/GMPParent.h @@ -158,7 +158,7 @@ class GMPParent final : public PGMPParent { void ActorDestroy(ActorDestroyReason aWhy) override; mozilla::ipc::IPCResult RecvInitCrashReporter( - Shmem&& shmem, const NativeThreadId& aThreadId) override; + Shmem&& shmem, const NativeThreadId& aThreadId); mozilla::ipc::IPCResult RecvPGMPStorageConstructor( PGMPStorageParent* actor) override; @@ -170,7 +170,7 @@ class GMPParent final : public PGMPParent { PGMPTimerParent* AllocPGMPTimerParent(); bool DeallocPGMPTimerParent(PGMPTimerParent* aActor); - mozilla::ipc::IPCResult RecvPGMPContentChildDestroyed() override; + mozilla::ipc::IPCResult RecvPGMPContentChildDestroyed(); bool IsUsed() { return mGMPContentChildCount > 0 || !mGetContentParentPromises.IsEmpty(); } diff --git a/dom/media/gmp/GMPStorageChild.h b/dom/media/gmp/GMPStorageChild.h index d3253ff1fc7b..68a19045dc13 100644 --- a/dom/media/gmp/GMPStorageChild.h +++ b/dom/media/gmp/GMPStorageChild.h @@ -75,13 +75,13 @@ class GMPStorageChild : public PGMPStorageChild { // PGMPStorageChild mozilla::ipc::IPCResult RecvOpenComplete(const nsCString& aRecordName, - const GMPErr& aStatus) override; - mozilla::ipc::IPCResult RecvReadComplete( - const nsCString& aRecordName, const GMPErr& aStatus, - InfallibleTArray&& aBytes) override; + const GMPErr& aStatus); + mozilla::ipc::IPCResult RecvReadComplete(const nsCString& aRecordName, + const GMPErr& aStatus, + InfallibleTArray&& aBytes); mozilla::ipc::IPCResult RecvWriteComplete(const nsCString& aRecordName, - const GMPErr& aStatus) override; - mozilla::ipc::IPCResult RecvShutdown() override; + const GMPErr& aStatus); + mozilla::ipc::IPCResult RecvShutdown(); private: Monitor mMonitor; diff --git a/dom/media/gmp/GMPTimerChild.h b/dom/media/gmp/GMPTimerChild.h index b57b43f3f332..29aa920d2779 100644 --- a/dom/media/gmp/GMPTimerChild.h +++ b/dom/media/gmp/GMPTimerChild.h @@ -30,7 +30,7 @@ class GMPTimerChild : public PGMPTimerChild { protected: // GMPTimerChild - mozilla::ipc::IPCResult RecvTimerExpired(const uint32_t& aTimerId) override; + mozilla::ipc::IPCResult RecvTimerExpired(const uint32_t& aTimerId); private: ~GMPTimerChild(); diff --git a/dom/media/gmp/GMPTimerParent.h b/dom/media/gmp/GMPTimerParent.h index 767e2867900c..29cc852c7344 100644 --- a/dom/media/gmp/GMPTimerParent.h +++ b/dom/media/gmp/GMPTimerParent.h @@ -28,7 +28,7 @@ class GMPTimerParent : public PGMPTimerParent { protected: mozilla::ipc::IPCResult RecvSetTimer(const uint32_t& aTimerId, - const uint32_t& aTimeoutMs) override; + const uint32_t& aTimeoutMs); void ActorDestroy(ActorDestroyReason aWhy) override; private: diff --git a/dom/media/gmp/GMPVideoDecoderChild.h b/dom/media/gmp/GMPVideoDecoderChild.h index 6de7db48f536..0d58d1301177 100644 --- a/dom/media/gmp/GMPVideoDecoderChild.h +++ b/dom/media/gmp/GMPVideoDecoderChild.h @@ -51,16 +51,15 @@ class GMPVideoDecoderChild : public PGMPVideoDecoderChild, // PGMPVideoDecoderChild mozilla::ipc::IPCResult RecvInitDecode( const GMPVideoCodec& aCodecSettings, - InfallibleTArray&& aCodecSpecific, - const int32_t& aCoreCount) override; + InfallibleTArray&& aCodecSpecific, const int32_t& aCoreCount); mozilla::ipc::IPCResult RecvDecode( const GMPVideoEncodedFrameData& aInputFrame, const bool& aMissingFrames, InfallibleTArray&& aCodecSpecificInfo, - const int64_t& aRenderTimeMs) override; - mozilla::ipc::IPCResult RecvChildShmemForPool(Shmem&& aFrameBuffer) override; - mozilla::ipc::IPCResult RecvReset() override; - mozilla::ipc::IPCResult RecvDrain() override; - mozilla::ipc::IPCResult RecvDecodingComplete() override; + const int64_t& aRenderTimeMs); + mozilla::ipc::IPCResult RecvChildShmemForPool(Shmem&& aFrameBuffer); + mozilla::ipc::IPCResult RecvReset(); + mozilla::ipc::IPCResult RecvDrain(); + mozilla::ipc::IPCResult RecvDecodingComplete(); GMPContentChild* mPlugin; GMPVideoDecoder* mVideoDecoder; diff --git a/dom/media/gmp/GMPVideoEncoderChild.h b/dom/media/gmp/GMPVideoEncoderChild.h index da68007f0dd2..f8abbb383ddc 100644 --- a/dom/media/gmp/GMPVideoEncoderChild.h +++ b/dom/media/gmp/GMPVideoEncoderChild.h @@ -48,20 +48,18 @@ class GMPVideoEncoderChild : public PGMPVideoEncoderChild, mozilla::ipc::IPCResult RecvInitEncode( const GMPVideoCodec& aCodecSettings, InfallibleTArray&& aCodecSpecific, const int32_t& aNumberOfCores, - const uint32_t& aMaxPayloadSize) override; + const uint32_t& aMaxPayloadSize); mozilla::ipc::IPCResult RecvEncode( const GMPVideoi420FrameData& aInputFrame, InfallibleTArray&& aCodecSpecificInfo, - InfallibleTArray&& aFrameTypes) override; - mozilla::ipc::IPCResult RecvChildShmemForPool( - Shmem&& aEncodedBuffer) override; - mozilla::ipc::IPCResult RecvSetChannelParameters( - const uint32_t& aPacketLoss, const uint32_t& aRTT) override; + InfallibleTArray&& aFrameTypes); + mozilla::ipc::IPCResult RecvChildShmemForPool(Shmem&& aEncodedBuffer); + mozilla::ipc::IPCResult RecvSetChannelParameters(const uint32_t& aPacketLoss, + const uint32_t& aRTT); mozilla::ipc::IPCResult RecvSetRates(const uint32_t& aNewBitRate, - const uint32_t& aFrameRate) override; - mozilla::ipc::IPCResult RecvSetPeriodicKeyFrames( - const bool& aEnable) override; - mozilla::ipc::IPCResult RecvEncodingComplete() override; + const uint32_t& aFrameRate); + mozilla::ipc::IPCResult RecvSetPeriodicKeyFrames(const bool& aEnable); + mozilla::ipc::IPCResult RecvEncodingComplete(); GMPContentChild* mPlugin; GMPVideoEncoder* mVideoEncoder; diff --git a/dom/media/ipc/RDDChild.h b/dom/media/ipc/RDDChild.h index 3d39d8d9bf49..647afc315310 100644 --- a/dom/media/ipc/RDDChild.h +++ b/dom/media/ipc/RDDChild.h @@ -33,16 +33,14 @@ class RDDChild final : public PRDDChild { bool EnsureRDDReady(); // PRDDChild overrides. - mozilla::ipc::IPCResult RecvInitComplete() override; + mozilla::ipc::IPCResult RecvInitComplete(); mozilla::ipc::IPCResult RecvInitCrashReporter( - Shmem&& shmem, const NativeThreadId& aThreadId) override; + Shmem&& shmem, const NativeThreadId& aThreadId); void ActorDestroy(ActorDestroyReason aWhy) override; - mozilla::ipc::IPCResult RecvAddMemoryReport( - const MemoryReport& aReport) override; - mozilla::ipc::IPCResult RecvFinishMemoryReport( - const uint32_t& aGeneration) override; + mozilla::ipc::IPCResult RecvAddMemoryReport(const MemoryReport& aReport); + mozilla::ipc::IPCResult RecvFinishMemoryReport(const uint32_t& aGeneration); bool SendRequestMemoryReport(const uint32_t& aGeneration, const bool& aAnonymize, diff --git a/dom/media/ipc/RDDParent.h b/dom/media/ipc/RDDParent.h index 94f2f3532156..8c52a4d9180c 100644 --- a/dom/media/ipc/RDDParent.h +++ b/dom/media/ipc/RDDParent.h @@ -24,15 +24,15 @@ class RDDParent final : public PRDDParent { bool Init(base::ProcessId aParentPid, const char* aParentBuildID, MessageLoop* aIOLoop, IPC::Channel* aChannel); - mozilla::ipc::IPCResult RecvInit() override; + mozilla::ipc::IPCResult RecvInit(); mozilla::ipc::IPCResult RecvInitProfiler( - Endpoint&& aEndpoint) override; + Endpoint&& aEndpoint); mozilla::ipc::IPCResult RecvNewContentRemoteDecoderManager( - Endpoint&& aEndpoint) override; + Endpoint&& aEndpoint); mozilla::ipc::IPCResult RecvRequestMemoryReport( const uint32_t& generation, const bool& anonymize, - const bool& minimizeMemoryUsage, const MaybeFileDesc& DMDFile) override; + const bool& minimizeMemoryUsage, const MaybeFileDesc& DMDFile); void ActorDestroy(ActorDestroyReason aWhy) override; diff --git a/dom/media/ipc/VideoDecoderManagerParent.h b/dom/media/ipc/VideoDecoderManagerParent.h index d2f5d8ccf673..8f7187f828db 100644 --- a/dom/media/ipc/VideoDecoderManagerParent.h +++ b/dom/media/ipc/VideoDecoderManagerParent.h @@ -42,9 +42,9 @@ class VideoDecoderManagerParent final : public PVideoDecoderManagerParent { bool DeallocPVideoDecoderParent(PVideoDecoderParent* actor); mozilla::ipc::IPCResult RecvReadback(const SurfaceDescriptorGPUVideo& aSD, - SurfaceDescriptor* aResult) override; + SurfaceDescriptor* aResult); mozilla::ipc::IPCResult RecvDeallocateSurfaceDescriptorGPUVideo( - const SurfaceDescriptorGPUVideo& aSD) override; + const SurfaceDescriptorGPUVideo& aSD); void ActorDestroy(mozilla::ipc::IProtocol::ActorDestroyReason) override; diff --git a/dom/media/systemservices/MediaSystemResourceManagerChild.h b/dom/media/systemservices/MediaSystemResourceManagerChild.h index 6782ee058ee4..66bf76cdd30e 100644 --- a/dom/media/systemservices/MediaSystemResourceManagerChild.h +++ b/dom/media/systemservices/MediaSystemResourceManagerChild.h @@ -48,7 +48,7 @@ class MediaSystemResourceManagerChild final protected: mozilla::ipc::IPCResult RecvResponse(const uint32_t& aId, - const bool& aSuccess) override; + const bool& aSuccess); private: void ActorDestroy(ActorDestroyReason aActorDestroyReason) override; diff --git a/dom/media/systemservices/MediaSystemResourceManagerParent.h b/dom/media/systemservices/MediaSystemResourceManagerParent.h index 0a88283f215a..d33c792b9ca9 100644 --- a/dom/media/systemservices/MediaSystemResourceManagerParent.h +++ b/dom/media/systemservices/MediaSystemResourceManagerParent.h @@ -28,11 +28,11 @@ class MediaSystemResourceManagerParent final protected: mozilla::ipc::IPCResult RecvAcquire( const uint32_t& aId, const MediaSystemResourceType& aResourceType, - const bool& aWillWait) override; + const bool& aWillWait); - mozilla::ipc::IPCResult RecvRelease(const uint32_t& aId) override; + mozilla::ipc::IPCResult RecvRelease(const uint32_t& aId); - mozilla::ipc::IPCResult RecvRemoveResourceManager() override; + mozilla::ipc::IPCResult RecvRemoveResourceManager(); private: void ActorDestroy(ActorDestroyReason aActorDestroyReason) override; diff --git a/dom/media/webspeech/synth/ipc/SpeechSynthesisChild.h b/dom/media/webspeech/synth/ipc/SpeechSynthesisChild.h index d697ffbea0be..3a2f6c2fc97e 100644 --- a/dom/media/webspeech/synth/ipc/SpeechSynthesisChild.h +++ b/dom/media/webspeech/synth/ipc/SpeechSynthesisChild.h @@ -24,19 +24,18 @@ class SpeechSynthesisChild : public PSpeechSynthesisChild { public: mozilla::ipc::IPCResult RecvInitialVoicesAndState( nsTArray&& aVoices, nsTArray&& aDefaults, - const bool& aIsSpeaking) override; + const bool& aIsSpeaking); - mozilla::ipc::IPCResult RecvVoiceAdded(const RemoteVoice& aVoice) override; + mozilla::ipc::IPCResult RecvVoiceAdded(const RemoteVoice& aVoice); - mozilla::ipc::IPCResult RecvVoiceRemoved(const nsString& aUri) override; + mozilla::ipc::IPCResult RecvVoiceRemoved(const nsString& aUri); mozilla::ipc::IPCResult RecvSetDefaultVoice(const nsString& aUri, - const bool& aIsDefault) override; + const bool& aIsDefault); - mozilla::ipc::IPCResult RecvIsSpeakingChanged( - const bool& aIsSpeaking) override; + mozilla::ipc::IPCResult RecvIsSpeakingChanged(const bool& aIsSpeaking); - mozilla::ipc::IPCResult RecvNotifyVoicesChanged() override; + mozilla::ipc::IPCResult RecvNotifyVoicesChanged(); protected: SpeechSynthesisChild(); diff --git a/dom/messagechannel/MessagePortChild.h b/dom/messagechannel/MessagePortChild.h index c50242a7232d..4cdcc97bc195 100644 --- a/dom/messagechannel/MessagePortChild.h +++ b/dom/messagechannel/MessagePortChild.h @@ -29,13 +29,13 @@ class MessagePortChild final : public PMessagePortChild { private: ~MessagePortChild() { MOZ_ASSERT(!mPort); } - virtual mozilla::ipc::IPCResult RecvEntangled( - nsTArray&& aMessages) override; + mozilla::ipc::IPCResult RecvEntangled( + nsTArray&& aMessages); - virtual mozilla::ipc::IPCResult RecvReceiveData( - nsTArray&& aMessages) override; + mozilla::ipc::IPCResult RecvReceiveData( + nsTArray&& aMessages); - virtual mozilla::ipc::IPCResult RecvStopSendingDataConfirmed() override; + mozilla::ipc::IPCResult RecvStopSendingDataConfirmed(); virtual void ActorDestroy(ActorDestroyReason aWhy) override; diff --git a/dom/messagechannel/MessagePortParent.h b/dom/messagechannel/MessagePortParent.h index 0669090e10fa..597798242eb3 100644 --- a/dom/messagechannel/MessagePortParent.h +++ b/dom/messagechannel/MessagePortParent.h @@ -36,15 +36,15 @@ class MessagePortParent final : public PMessagePortParent { const uint32_t& aSequenceID); private: - virtual mozilla::ipc::IPCResult RecvPostMessages( - nsTArray&& aMessages) override; + mozilla::ipc::IPCResult RecvPostMessages( + nsTArray&& aMessages); - virtual mozilla::ipc::IPCResult RecvDisentangle( - nsTArray&& aMessages) override; + mozilla::ipc::IPCResult RecvDisentangle( + nsTArray&& aMessages); - virtual mozilla::ipc::IPCResult RecvStopSendingData() override; + mozilla::ipc::IPCResult RecvStopSendingData(); - virtual mozilla::ipc::IPCResult RecvClose() override; + mozilla::ipc::IPCResult RecvClose(); virtual void ActorDestroy(ActorDestroyReason aWhy) override; diff --git a/dom/midi/MIDIManagerParent.h b/dom/midi/MIDIManagerParent.h index 5024707c5d35..6714ed6ab4c7 100644 --- a/dom/midi/MIDIManagerParent.h +++ b/dom/midi/MIDIManagerParent.h @@ -22,7 +22,7 @@ class MIDIManagerParent final : public PMIDIManagerParent { public: NS_INLINE_DECL_REFCOUNTING(MIDIManagerParent); MIDIManagerParent() = default; - mozilla::ipc::IPCResult RecvShutdown() override; + mozilla::ipc::IPCResult RecvShutdown(); void Teardown(); void ActorDestroy(ActorDestroyReason aWhy) override; diff --git a/dom/midi/MIDIPortChild.h b/dom/midi/MIDIPortChild.h index f3ad6b3e8e24..e0d1e5a24748 100644 --- a/dom/midi/MIDIPortChild.h +++ b/dom/midi/MIDIPortChild.h @@ -25,13 +25,12 @@ class MIDIPortInfo; class MIDIPortChild final : public PMIDIPortChild, public MIDIPortInterface { public: NS_INLINE_DECL_REFCOUNTING(MIDIPortChild); - virtual mozilla::ipc::IPCResult RecvReceive( - nsTArray&& aMsgs) override; + mozilla::ipc::IPCResult RecvReceive(nsTArray&& aMsgs); virtual void ActorDestroy(ActorDestroyReason aWhy) override; - virtual mozilla::ipc::IPCResult RecvUpdateStatus( - const uint32_t& aDeviceState, const uint32_t& aConnectionState) override; + mozilla::ipc::IPCResult RecvUpdateStatus(const uint32_t& aDeviceState, + const uint32_t& aConnectionState); MIDIPortChild(const MIDIPortInfo& aPortInfo, bool aSysexEnabled, MIDIPort* aPort); diff --git a/dom/midi/MIDIPortParent.h b/dom/midi/MIDIPortParent.h index 4dfbe77e03bf..946e45792809 100644 --- a/dom/midi/MIDIPortParent.h +++ b/dom/midi/MIDIPortParent.h @@ -23,11 +23,11 @@ class MIDIPortParent final : public PMIDIPortParent, public MIDIPortInterface { public: NS_INLINE_DECL_REFCOUNTING(MIDIPortParent); void ActorDestroy(ActorDestroyReason) override; - mozilla::ipc::IPCResult RecvSend(nsTArray&& aMsg) override; - mozilla::ipc::IPCResult RecvOpen() override; - mozilla::ipc::IPCResult RecvClose() override; - mozilla::ipc::IPCResult RecvClear() override; - mozilla::ipc::IPCResult RecvShutdown() override; + mozilla::ipc::IPCResult RecvSend(nsTArray&& aMsg); + mozilla::ipc::IPCResult RecvOpen(); + mozilla::ipc::IPCResult RecvClose(); + mozilla::ipc::IPCResult RecvClear(); + mozilla::ipc::IPCResult RecvShutdown(); MOZ_IMPLICIT MIDIPortParent(const MIDIPortInfo& aPortInfo, const bool aSysexEnabled); // Sends the current port status to the child actor. May also send message diff --git a/dom/network/TCPServerSocketChild.h b/dom/network/TCPServerSocketChild.h index 0316469f26ed..145618c47b79 100644 --- a/dom/network/TCPServerSocketChild.h +++ b/dom/network/TCPServerSocketChild.h @@ -53,8 +53,7 @@ class TCPServerSocketChild : public mozilla::net::PTCPServerSocketChild, void Close(); - virtual mozilla::ipc::IPCResult RecvCallbackAccept( - PTCPSocketChild* socket) override; + mozilla::ipc::IPCResult RecvCallbackAccept(PTCPSocketChild* socket); }; } // namespace dom diff --git a/dom/network/TCPServerSocketParent.h b/dom/network/TCPServerSocketParent.h index 7f040530ff6e..e049da5f6ffd 100644 --- a/dom/network/TCPServerSocketParent.h +++ b/dom/network/TCPServerSocketParent.h @@ -30,8 +30,8 @@ class TCPServerSocketParent : public mozilla::net::PTCPServerSocketParent, void Init(); - virtual mozilla::ipc::IPCResult RecvClose() override; - virtual mozilla::ipc::IPCResult RecvRequestDelete() override; + mozilla::ipc::IPCResult RecvClose(); + mozilla::ipc::IPCResult RecvRequestDelete(); void AddIPDLReference(); void ReleaseIPDLReference(); diff --git a/dom/network/TCPSocketChild.h b/dom/network/TCPSocketChild.h index 7b9aef9a186b..5e8a046c70f3 100644 --- a/dom/network/TCPSocketChild.h +++ b/dom/network/TCPSocketChild.h @@ -68,12 +68,12 @@ class TCPSocketChild : public mozilla::net::PTCPSocketChild, void GetHost(nsAString& aHost); void GetPort(uint16_t* aPort); - virtual mozilla::ipc::IPCResult RecvCallback( - const nsString& aType, const CallbackData& aData, - const uint32_t& aReadyState) override; - virtual mozilla::ipc::IPCResult RecvRequestDelete() override; - virtual mozilla::ipc::IPCResult RecvUpdateBufferedAmount( - const uint32_t& aBufferred, const uint32_t& aTrackingNumber) override; + mozilla::ipc::IPCResult RecvCallback(const nsString& aType, + const CallbackData& aData, + const uint32_t& aReadyState); + mozilla::ipc::IPCResult RecvRequestDelete(); + mozilla::ipc::IPCResult RecvUpdateBufferedAmount( + const uint32_t& aBufferred, const uint32_t& aTrackingNumber); nsresult SetFilterName(const nsACString& aFilterName); private: diff --git a/dom/network/TCPSocketParent.h b/dom/network/TCPSocketParent.h index 81cabbd9458a..e12db78eac56 100644 --- a/dom/network/TCPSocketParent.h +++ b/dom/network/TCPSocketParent.h @@ -49,23 +49,23 @@ class TCPSocketParent : public mozilla::net::PTCPSocketParent, TCPSocketParent() {} - virtual mozilla::ipc::IPCResult RecvOpen( - const nsString& aHost, const uint16_t& aPort, const bool& useSSL, - const bool& aUseArrayBuffers) override; + mozilla::ipc::IPCResult RecvOpen(const nsString& aHost, const uint16_t& aPort, + const bool& useSSL, + const bool& aUseArrayBuffers); - virtual mozilla::ipc::IPCResult RecvOpenBind( + mozilla::ipc::IPCResult RecvOpenBind( const nsCString& aRemoteHost, const uint16_t& aRemotePort, const nsCString& aLocalAddr, const uint16_t& aLocalPort, const bool& aUseSSL, const bool& aReuseAddrPort, - const bool& aUseArrayBuffers, const nsCString& aFilter) override; + const bool& aUseArrayBuffers, const nsCString& aFilter); - virtual mozilla::ipc::IPCResult RecvStartTLS() override; - virtual mozilla::ipc::IPCResult RecvSuspend() override; - virtual mozilla::ipc::IPCResult RecvResume() override; - virtual mozilla::ipc::IPCResult RecvClose() override; - virtual mozilla::ipc::IPCResult RecvData( - const SendableData& aData, const uint32_t& aTrackingNumber) override; - virtual mozilla::ipc::IPCResult RecvRequestDelete() override; + mozilla::ipc::IPCResult RecvStartTLS(); + mozilla::ipc::IPCResult RecvSuspend(); + mozilla::ipc::IPCResult RecvResume(); + mozilla::ipc::IPCResult RecvClose(); + mozilla::ipc::IPCResult RecvData(const SendableData& aData, + const uint32_t& aTrackingNumber); + mozilla::ipc::IPCResult RecvRequestDelete(); void FireErrorEvent(const nsAString& aName, const nsAString& aType, TCPReadyState aReadyState); diff --git a/dom/network/UDPSocketChild.h b/dom/network/UDPSocketChild.h index b75e14ca730b..a2ec4fccd6e9 100644 --- a/dom/network/UDPSocketChild.h +++ b/dom/network/UDPSocketChild.h @@ -45,17 +45,16 @@ class UDPSocketChild : public mozilla::net::PUDPSocketChild, UDPSocketChild(); virtual ~UDPSocketChild(); - virtual mozilla::ipc::IPCResult RecvCallbackOpened( - const UDPAddressInfo& aAddressInfo) override; - virtual mozilla::ipc::IPCResult RecvCallbackConnected( - const UDPAddressInfo& aAddressInfo) override; - virtual mozilla::ipc::IPCResult RecvCallbackClosed() override; - virtual mozilla::ipc::IPCResult RecvCallbackReceivedData( - const UDPAddressInfo& aAddressInfo, - InfallibleTArray&& aData) override; - virtual mozilla::ipc::IPCResult RecvCallbackError( - const nsCString& aMessage, const nsCString& aFilename, - const uint32_t& aLineNumber) override; + mozilla::ipc::IPCResult RecvCallbackOpened( + const UDPAddressInfo& aAddressInfo); + mozilla::ipc::IPCResult RecvCallbackConnected( + const UDPAddressInfo& aAddressInfo); + mozilla::ipc::IPCResult RecvCallbackClosed(); + mozilla::ipc::IPCResult RecvCallbackReceivedData( + const UDPAddressInfo& aAddressInfo, InfallibleTArray&& aData); + mozilla::ipc::IPCResult RecvCallbackError(const nsCString& aMessage, + const nsCString& aFilename, + const uint32_t& aLineNumber); private: nsresult SendDataInternal(const UDPSocketAddr& aAddr, const uint8_t* aData, diff --git a/dom/network/UDPSocketParent.h b/dom/network/UDPSocketParent.h index a72e614463a1..71e3bea6db76 100644 --- a/dom/network/UDPSocketParent.h +++ b/dom/network/UDPSocketParent.h @@ -31,12 +31,12 @@ class UDPSocketParent : public mozilla::net::PUDPSocketParent, bool Init(const IPC::Principal& aPrincipal, const nsACString& aFilter); - virtual mozilla::ipc::IPCResult RecvBind( - const UDPAddressInfo& aAddressInfo, const bool& aAddressReuse, - const bool& aLoopback, const uint32_t& recvBufferSize, - const uint32_t& sendBufferSize) override; - virtual mozilla::ipc::IPCResult RecvConnect( - const UDPAddressInfo& aAddressInfo) override; + mozilla::ipc::IPCResult RecvBind(const UDPAddressInfo& aAddressInfo, + const bool& aAddressReuse, + const bool& aLoopback, + const uint32_t& recvBufferSize, + const uint32_t& sendBufferSize); + mozilla::ipc::IPCResult RecvConnect(const UDPAddressInfo& aAddressInfo); void DoSendConnectResponse(const UDPAddressInfo& aAddressInfo); void SendConnectResponse(nsIEventTarget* aThread, const UDPAddressInfo& aAddressInfo); @@ -44,15 +44,15 @@ class UDPSocketParent : public mozilla::net::PUDPSocketParent, nsCOMPtr& aReturnThread, const UDPAddressInfo& aAddressInfo); - virtual mozilla::ipc::IPCResult RecvOutgoingData( - const UDPData& aData, const UDPSocketAddr& aAddr) override; + mozilla::ipc::IPCResult RecvOutgoingData(const UDPData& aData, + const UDPSocketAddr& aAddr); - virtual mozilla::ipc::IPCResult RecvClose() override; - virtual mozilla::ipc::IPCResult RecvRequestDelete() override; - virtual mozilla::ipc::IPCResult RecvJoinMulticast( - const nsCString& aMulticastAddress, const nsCString& aInterface) override; - virtual mozilla::ipc::IPCResult RecvLeaveMulticast( - const nsCString& aMulticastAddress, const nsCString& aInterface) override; + mozilla::ipc::IPCResult RecvClose(); + mozilla::ipc::IPCResult RecvRequestDelete(); + mozilla::ipc::IPCResult RecvJoinMulticast(const nsCString& aMulticastAddress, + const nsCString& aInterface); + mozilla::ipc::IPCResult RecvLeaveMulticast(const nsCString& aMulticastAddress, + const nsCString& aInterface); private: virtual ~UDPSocketParent(); diff --git a/dom/payments/ipc/PaymentRequestChild.h b/dom/payments/ipc/PaymentRequestChild.h index 393ab84da582..92496c6db8a0 100644 --- a/dom/payments/ipc/PaymentRequestChild.h +++ b/dom/payments/ipc/PaymentRequestChild.h @@ -26,21 +26,22 @@ class PaymentRequestChild final : public PPaymentRequestChild { protected: mozilla::ipc::IPCResult RecvRespondPayment( - const IPCPaymentActionResponse& aResponse) override; + const IPCPaymentActionResponse& aResponse); mozilla::ipc::IPCResult RecvChangeShippingAddress( - const nsString& aRequestId, const IPCPaymentAddress& aAddress) override; + const nsString& aRequestId, const IPCPaymentAddress& aAddress); - mozilla::ipc::IPCResult RecvChangeShippingOption( - const nsString& aRequestId, const nsString& aOption) override; + mozilla::ipc::IPCResult RecvChangeShippingOption(const nsString& aRequestId, + const nsString& aOption); - mozilla::ipc::IPCResult RecvChangePayerDetail( - const nsString& aRequestId, const nsString& aPayerName, - const nsString& aPayerEmail, const nsString& aPayerPhone) override; + mozilla::ipc::IPCResult RecvChangePayerDetail(const nsString& aRequestId, + const nsString& aPayerName, + const nsString& aPayerEmail, + const nsString& aPayerPhone); mozilla::ipc::IPCResult RecvChangePaymentMethod( const nsString& aRequestId, const nsString& aMethodName, - const IPCMethodChangeDetails& aMethodDetails) override; + const IPCMethodChangeDetails& aMethodDetails); void ActorDestroy(ActorDestroyReason aWhy) override; diff --git a/dom/payments/ipc/PaymentRequestParent.h b/dom/payments/ipc/PaymentRequestParent.h index a80e046fda32..9a6954687d8b 100644 --- a/dom/payments/ipc/PaymentRequestParent.h +++ b/dom/payments/ipc/PaymentRequestParent.h @@ -36,7 +36,7 @@ class PaymentRequestParent final : public PPaymentRequestParent { protected: mozilla::ipc::IPCResult RecvRequestPayment( - const IPCPaymentActionRequest& aRequest) override; + const IPCPaymentActionRequest& aRequest); mozilla::ipc::IPCResult Recv__delete__() override; diff --git a/dom/plugins/ipc/BrowserStreamChild.h b/dom/plugins/ipc/BrowserStreamChild.h index cf11aba043bb..5df88d9aabae 100644 --- a/dom/plugins/ipc/BrowserStreamChild.h +++ b/dom/plugins/ipc/BrowserStreamChild.h @@ -29,11 +29,10 @@ class BrowserStreamChild : public PBrowserStreamChild, public AStream { NPError StreamConstructed(const nsCString& mimeType, const bool& seekable, uint16_t* stype); - virtual mozilla::ipc::IPCResult RecvWrite(const int32_t& offset, - const uint32_t& newsize, - const Buffer& data) override; - virtual mozilla::ipc::IPCResult RecvNPP_DestroyStream( - const NPReason& reason) override; + mozilla::ipc::IPCResult RecvWrite(const int32_t& offset, + const uint32_t& newsize, + const Buffer& data); + mozilla::ipc::IPCResult RecvNPP_DestroyStream(const NPReason& reason); virtual mozilla::ipc::IPCResult Recv__delete__() override; void EnsureCorrectInstance(PluginInstanceChild* i) { diff --git a/dom/plugins/ipc/PluginInstanceChild.h b/dom/plugins/ipc/PluginInstanceChild.h index f16424abde1e..3a209b220ee9 100644 --- a/dom/plugins/ipc/PluginInstanceChild.h +++ b/dom/plugins/ipc/PluginInstanceChild.h @@ -63,44 +63,38 @@ class PluginInstanceChild : public PPluginInstanceChild { #endif protected: - virtual mozilla::ipc::IPCResult AnswerCreateChildPluginWindow( - NativeWindowHandle* aChildPluginWindow) override; + mozilla::ipc::IPCResult AnswerCreateChildPluginWindow( + NativeWindowHandle* aChildPluginWindow); - virtual mozilla::ipc::IPCResult RecvCreateChildPopupSurrogate( - const NativeWindowHandle& aNetscapeWindow) override; + mozilla::ipc::IPCResult RecvCreateChildPopupSurrogate( + const NativeWindowHandle& aNetscapeWindow); - virtual mozilla::ipc::IPCResult AnswerNPP_SetWindow( - const NPRemoteWindow& window) override; + mozilla::ipc::IPCResult AnswerNPP_SetWindow(const NPRemoteWindow& window); - virtual mozilla::ipc::IPCResult - AnswerNPP_GetValue_NPPVpluginWantsAllNetworkStreams(bool* wantsAllStreams, - NPError* rv) override; - virtual mozilla::ipc::IPCResult - AnswerNPP_GetValue_NPPVpluginScriptableNPObject( - PPluginScriptableObjectChild** value, NPError* result) override; - virtual mozilla::ipc::IPCResult - AnswerNPP_GetValue_NPPVpluginNativeAccessibleAtkPlugId( - nsCString* aPlugId, NPError* aResult) override; - virtual mozilla::ipc::IPCResult AnswerNPP_SetValue_NPNVprivateModeBool( - const bool& value, NPError* result) override; - virtual mozilla::ipc::IPCResult AnswerNPP_SetValue_NPNVmuteAudioBool( - const bool& value, NPError* result) override; - virtual mozilla::ipc::IPCResult AnswerNPP_SetValue_NPNVCSSZoomFactor( - const double& value, NPError* result) override; + mozilla::ipc::IPCResult AnswerNPP_GetValue_NPPVpluginWantsAllNetworkStreams( + bool* wantsAllStreams, NPError* rv); + mozilla::ipc::IPCResult AnswerNPP_GetValue_NPPVpluginScriptableNPObject( + PPluginScriptableObjectChild** value, NPError* result); + mozilla::ipc::IPCResult + AnswerNPP_GetValue_NPPVpluginNativeAccessibleAtkPlugId(nsCString* aPlugId, + NPError* aResult); + mozilla::ipc::IPCResult AnswerNPP_SetValue_NPNVprivateModeBool( + const bool& value, NPError* result); + mozilla::ipc::IPCResult AnswerNPP_SetValue_NPNVmuteAudioBool( + const bool& value, NPError* result); + mozilla::ipc::IPCResult AnswerNPP_SetValue_NPNVCSSZoomFactor( + const double& value, NPError* result); - virtual mozilla::ipc::IPCResult AnswerNPP_HandleEvent( - const NPRemoteEvent& event, int16_t* handled) override; - virtual mozilla::ipc::IPCResult AnswerNPP_HandleEvent_Shmem( - const NPRemoteEvent& event, Shmem&& mem, int16_t* handled, - Shmem* rtnmem) override; - virtual mozilla::ipc::IPCResult AnswerNPP_HandleEvent_IOSurface( - const NPRemoteEvent& event, const uint32_t& surface, - int16_t* handled) override; + mozilla::ipc::IPCResult AnswerNPP_HandleEvent(const NPRemoteEvent& event, + int16_t* handled); + mozilla::ipc::IPCResult AnswerNPP_HandleEvent_Shmem( + const NPRemoteEvent& event, Shmem&& mem, int16_t* handled, Shmem* rtnmem); + mozilla::ipc::IPCResult AnswerNPP_HandleEvent_IOSurface( + const NPRemoteEvent& event, const uint32_t& surface, int16_t* handled); // Async rendering - virtual mozilla::ipc::IPCResult RecvAsyncSetWindow( - const gfxSurfaceType& aSurfaceType, - const NPRemoteWindow& aWindow) override; + mozilla::ipc::IPCResult RecvAsyncSetWindow(const gfxSurfaceType& aSurfaceType, + const NPRemoteWindow& aWindow); virtual void DoAsyncSetWindow(const gfxSurfaceType& aSurfaceType, const NPRemoteWindow& aWindow, bool aIsAsync); @@ -115,8 +109,8 @@ class PluginInstanceChild : public PPluginInstanceChild { return true; } - virtual mozilla::ipc::IPCResult AnswerPaint(const NPRemoteEvent& event, - int16_t* handled) override { + mozilla::ipc::IPCResult AnswerPaint(const NPRemoteEvent& event, + int16_t* handled) { PaintTracker pt; if (!AnswerNPP_HandleEvent(event, handled)) { return IPC_FAIL_NO_REASON(this); @@ -124,13 +118,12 @@ class PluginInstanceChild : public PPluginInstanceChild { return IPC_OK(); } - virtual mozilla::ipc::IPCResult RecvWindowPosChanged( - const NPRemoteEvent& event) override; + mozilla::ipc::IPCResult RecvWindowPosChanged(const NPRemoteEvent& event); - virtual mozilla::ipc::IPCResult RecvContentsScaleFactorChanged( - const double& aContentsScaleFactor) override; + mozilla::ipc::IPCResult RecvContentsScaleFactorChanged( + const double& aContentsScaleFactor); - virtual mozilla::ipc::IPCResult AnswerNPP_Destroy(NPError* result) override; + mozilla::ipc::IPCResult AnswerNPP_Destroy(NPError* result); PPluginScriptableObjectChild* AllocPPluginScriptableObjectChild(); @@ -145,9 +138,10 @@ class PluginInstanceChild : public PPluginInstanceChild { const uint32_t& aLength, const uint32_t& aLastmodified, PStreamNotifyChild* aNotifyData, const nsCString& aHeaders) override; - virtual mozilla::ipc::IPCResult AnswerNPP_NewStream( - PBrowserStreamChild* actor, const nsCString& mimeType, - const bool& seekable, NPError* rv, uint16_t* stype) override; + mozilla::ipc::IPCResult AnswerNPP_NewStream(PBrowserStreamChild* actor, + const nsCString& mimeType, + const bool& seekable, NPError* rv, + uint16_t* stype); PBrowserStreamChild* AllocPBrowserStreamChild(const nsCString& url, const uint32_t& length, @@ -163,11 +157,11 @@ class PluginInstanceChild : public PPluginInstanceChild { bool DeallocPStreamNotifyChild(PStreamNotifyChild* notifyData); - virtual mozilla::ipc::IPCResult AnswerSetPluginFocus() override; + mozilla::ipc::IPCResult AnswerSetPluginFocus(); - virtual mozilla::ipc::IPCResult AnswerUpdateWindow() override; + mozilla::ipc::IPCResult AnswerUpdateWindow(); - virtual mozilla::ipc::IPCResult RecvNPP_DidComposite() override; + mozilla::ipc::IPCResult RecvNPP_DidComposite(); public: PluginInstanceChild(const NPPluginFuncs* aPluginIface, @@ -217,8 +211,8 @@ class PluginInstanceChild : public PPluginInstanceChild { void DoAsyncRedraw(); - virtual mozilla::ipc::IPCResult RecvHandledWindowedPluginKeyEvent( - const NativeEventData& aKeyEventData, const bool& aIsConsumed) override; + mozilla::ipc::IPCResult RecvHandledWindowedPluginKeyEvent( + const NativeEventData& aKeyEventData, const bool& aIsConsumed); #if defined(XP_WIN) NPError DefaultAudioDeviceChanged(NPAudioDeviceChangeDetails& details); @@ -232,8 +226,8 @@ class PluginInstanceChild : public PPluginInstanceChild { bool IsUsingDirectDrawing(); - virtual mozilla::ipc::IPCResult RecvUpdateBackground( - const SurfaceDescriptor& aBackground, const nsIntRect& aRect) override; + mozilla::ipc::IPCResult RecvUpdateBackground( + const SurfaceDescriptor& aBackground, const nsIntRect& aRect); PPluginBackgroundDestroyerChild* AllocPPluginBackgroundDestroyerChild(); diff --git a/dom/plugins/ipc/PluginInstanceParent.h b/dom/plugins/ipc/PluginInstanceParent.h index 707f40e2599b..a40112086852 100644 --- a/dom/plugins/ipc/PluginInstanceParent.h +++ b/dom/plugins/ipc/PluginInstanceParent.h @@ -83,52 +83,51 @@ class PluginInstanceParent : public PPluginInstanceParent { const nsCString& headers); bool DeallocPBrowserStreamParent(PBrowserStreamParent* stream); - virtual mozilla::ipc::IPCResult AnswerNPN_GetValue_NPNVnetscapeWindow( - NativeWindowHandle* value, NPError* result) override; - virtual mozilla::ipc::IPCResult AnswerNPN_GetValue_NPNVWindowNPObject( - PPluginScriptableObjectParent** value, NPError* result) override; - virtual mozilla::ipc::IPCResult AnswerNPN_GetValue_NPNVPluginElementNPObject( - PPluginScriptableObjectParent** value, NPError* result) override; - virtual mozilla::ipc::IPCResult AnswerNPN_GetValue_NPNVprivateModeBool( - bool* value, NPError* result) override; + mozilla::ipc::IPCResult AnswerNPN_GetValue_NPNVnetscapeWindow( + NativeWindowHandle* value, NPError* result); + mozilla::ipc::IPCResult AnswerNPN_GetValue_NPNVWindowNPObject( + PPluginScriptableObjectParent** value, NPError* result); + mozilla::ipc::IPCResult AnswerNPN_GetValue_NPNVPluginElementNPObject( + PPluginScriptableObjectParent** value, NPError* result); + mozilla::ipc::IPCResult AnswerNPN_GetValue_NPNVprivateModeBool( + bool* value, NPError* result); - virtual mozilla::ipc::IPCResult AnswerNPN_GetValue_DrawingModelSupport( - const NPNVariable& model, bool* value) override; + mozilla::ipc::IPCResult AnswerNPN_GetValue_DrawingModelSupport( + const NPNVariable& model, bool* value); - virtual mozilla::ipc::IPCResult AnswerNPN_GetValue_NPNVdocumentOrigin( - nsCString* value, NPError* result) override; + mozilla::ipc::IPCResult AnswerNPN_GetValue_NPNVdocumentOrigin( + nsCString* value, NPError* result); - virtual mozilla::ipc::IPCResult AnswerNPN_GetValue_SupportsAsyncBitmapSurface( - bool* value) override; + mozilla::ipc::IPCResult AnswerNPN_GetValue_SupportsAsyncBitmapSurface( + bool* value); - virtual mozilla::ipc::IPCResult AnswerNPN_GetValue_SupportsAsyncDXGISurface( - bool* value) override; + mozilla::ipc::IPCResult AnswerNPN_GetValue_SupportsAsyncDXGISurface( + bool* value); - virtual mozilla::ipc::IPCResult AnswerNPN_GetValue_PreferredDXGIAdapter( - DxgiAdapterDesc* desc) override; + mozilla::ipc::IPCResult AnswerNPN_GetValue_PreferredDXGIAdapter( + DxgiAdapterDesc* desc); - virtual mozilla::ipc::IPCResult AnswerNPN_SetValue_NPPVpluginWindow( - const bool& windowed, NPError* result) override; - virtual mozilla::ipc::IPCResult AnswerNPN_SetValue_NPPVpluginTransparent( - const bool& transparent, NPError* result) override; - virtual mozilla::ipc::IPCResult AnswerNPN_SetValue_NPPVpluginUsesDOMForCursor( - const bool& useDOMForCursor, NPError* result) override; - virtual mozilla::ipc::IPCResult AnswerNPN_SetValue_NPPVpluginDrawingModel( - const int& drawingModel, NPError* result) override; - virtual mozilla::ipc::IPCResult AnswerNPN_SetValue_NPPVpluginEventModel( - const int& eventModel, NPError* result) override; - virtual mozilla::ipc::IPCResult AnswerNPN_SetValue_NPPVpluginIsPlayingAudio( - const bool& isAudioPlaying, NPError* result) override; + mozilla::ipc::IPCResult AnswerNPN_SetValue_NPPVpluginWindow( + const bool& windowed, NPError* result); + mozilla::ipc::IPCResult AnswerNPN_SetValue_NPPVpluginTransparent( + const bool& transparent, NPError* result); + mozilla::ipc::IPCResult AnswerNPN_SetValue_NPPVpluginUsesDOMForCursor( + const bool& useDOMForCursor, NPError* result); + mozilla::ipc::IPCResult AnswerNPN_SetValue_NPPVpluginDrawingModel( + const int& drawingModel, NPError* result); + mozilla::ipc::IPCResult AnswerNPN_SetValue_NPPVpluginEventModel( + const int& eventModel, NPError* result); + mozilla::ipc::IPCResult AnswerNPN_SetValue_NPPVpluginIsPlayingAudio( + const bool& isAudioPlaying, NPError* result); - virtual mozilla::ipc::IPCResult AnswerNPN_GetURL(const nsCString& url, - const nsCString& target, - NPError* result) override; + mozilla::ipc::IPCResult AnswerNPN_GetURL(const nsCString& url, + const nsCString& target, + NPError* result); - virtual mozilla::ipc::IPCResult AnswerNPN_PostURL(const nsCString& url, - const nsCString& target, - const nsCString& buffer, - const bool& file, - NPError* result) override; + mozilla::ipc::IPCResult AnswerNPN_PostURL(const nsCString& url, + const nsCString& target, + const nsCString& buffer, + const bool& file, NPError* result); PStreamNotifyParent* AllocPStreamNotifyParent( const nsCString& url, const nsCString& target, const bool& post, @@ -141,28 +140,29 @@ class PluginInstanceParent : public PPluginInstanceParent { bool DeallocPStreamNotifyParent(PStreamNotifyParent* notifyData); - virtual mozilla::ipc::IPCResult RecvNPN_InvalidateRect( - const NPRect& rect) override; + mozilla::ipc::IPCResult RecvNPN_InvalidateRect(const NPRect& rect); - virtual mozilla::ipc::IPCResult RecvRevokeCurrentDirectSurface() override; + mozilla::ipc::IPCResult RecvRevokeCurrentDirectSurface(); - virtual mozilla::ipc::IPCResult RecvInitDXGISurface( - const gfx::SurfaceFormat& format, const gfx::IntSize& size, - WindowsHandle* outHandle, NPError* outError) override; - virtual mozilla::ipc::IPCResult RecvFinalizeDXGISurface( - const WindowsHandle& handle) override; + mozilla::ipc::IPCResult RecvInitDXGISurface(const gfx::SurfaceFormat& format, + const gfx::IntSize& size, + WindowsHandle* outHandle, + NPError* outError); + mozilla::ipc::IPCResult RecvFinalizeDXGISurface(const WindowsHandle& handle); - virtual mozilla::ipc::IPCResult RecvShowDirectBitmap( - Shmem&& buffer, const gfx::SurfaceFormat& format, const uint32_t& stride, - const gfx::IntSize& size, const gfx::IntRect& dirty) override; + mozilla::ipc::IPCResult RecvShowDirectBitmap(Shmem&& buffer, + const gfx::SurfaceFormat& format, + const uint32_t& stride, + const gfx::IntSize& size, + const gfx::IntRect& dirty); - virtual mozilla::ipc::IPCResult RecvShowDirectDXGISurface( - const WindowsHandle& handle, const gfx::IntRect& rect) override; + mozilla::ipc::IPCResult RecvShowDirectDXGISurface(const WindowsHandle& handle, + const gfx::IntRect& rect); // Async rendering - virtual mozilla::ipc::IPCResult RecvShow( - const NPRect& updatedRect, const SurfaceDescriptor& newSurface, - SurfaceDescriptor* prevSurface) override; + mozilla::ipc::IPCResult RecvShow(const NPRect& updatedRect, + const SurfaceDescriptor& newSurface, + SurfaceDescriptor* prevSurface); PPluginSurfaceParent* AllocPPluginSurfaceParent( const WindowsSharedMemoryHandle& handle, @@ -170,29 +170,28 @@ class PluginInstanceParent : public PPluginInstanceParent { bool DeallocPPluginSurfaceParent(PPluginSurfaceParent* s); - virtual mozilla::ipc::IPCResult AnswerNPN_PushPopupsEnabledState( - const bool& aState) override; + mozilla::ipc::IPCResult AnswerNPN_PushPopupsEnabledState(const bool& aState); - virtual mozilla::ipc::IPCResult AnswerNPN_PopPopupsEnabledState() override; + mozilla::ipc::IPCResult AnswerNPN_PopPopupsEnabledState(); - virtual mozilla::ipc::IPCResult AnswerNPN_GetValueForURL( + mozilla::ipc::IPCResult AnswerNPN_GetValueForURL( const NPNURLVariable& variable, const nsCString& url, nsCString* value, - NPError* result) override; + NPError* result); - virtual mozilla::ipc::IPCResult AnswerNPN_SetValueForURL( + mozilla::ipc::IPCResult AnswerNPN_SetValueForURL( const NPNURLVariable& variable, const nsCString& url, - const nsCString& value, NPError* result) override; + const nsCString& value, NPError* result); - virtual mozilla::ipc::IPCResult AnswerNPN_ConvertPoint( + mozilla::ipc::IPCResult AnswerNPN_ConvertPoint( const double& sourceX, const bool& ignoreDestX, const double& sourceY, const bool& ignoreDestY, const NPCoordinateSpace& sourceSpace, const NPCoordinateSpace& destSpace, double* destX, double* destY, - bool* result) override; + bool* result); - virtual mozilla::ipc::IPCResult RecvRedrawPlugin() override; + mozilla::ipc::IPCResult RecvRedrawPlugin(); - virtual mozilla::ipc::IPCResult RecvSetNetscapeWindowAsParent( - const NativeWindowHandle& childWindow) override; + mozilla::ipc::IPCResult RecvSetNetscapeWindowAsParent( + const NativeWindowHandle& childWindow); NPError NPP_SetWindow(const NPWindow* aWindow); @@ -226,8 +225,7 @@ class PluginInstanceParent : public PPluginInstanceParent { void GetSrcAttribute(nsACString& aOutput) const { aOutput = mSrcAttribute; } - virtual mozilla::ipc::IPCResult AnswerPluginFocusChange( - const bool& gotFocus) override; + mozilla::ipc::IPCResult AnswerPluginFocusChange(const bool& gotFocus); nsresult AsyncSetWindow(NPWindow* window); nsresult GetImageContainer(mozilla::layers::ImageContainer** aContainer); @@ -254,20 +252,19 @@ class PluginInstanceParent : public PPluginInstanceParent { static PluginInstanceParent* Cast(NPP instance); // for IME hook - virtual mozilla::ipc::IPCResult RecvGetCompositionString( - const uint32_t& aIndex, nsTArray* aBuffer, - int32_t* aLength) override; - virtual mozilla::ipc::IPCResult RecvSetCandidateWindow( - const mozilla::widget::CandidateWindowPosition& aPosition) override; - virtual mozilla::ipc::IPCResult RecvRequestCommitOrCancel( - const bool& aCommitted) override; - virtual mozilla::ipc::IPCResult RecvEnableIME(const bool& aEnable) override; + mozilla::ipc::IPCResult RecvGetCompositionString(const uint32_t& aIndex, + nsTArray* aBuffer, + int32_t* aLength); + mozilla::ipc::IPCResult RecvSetCandidateWindow( + const mozilla::widget::CandidateWindowPosition& aPosition); + mozilla::ipc::IPCResult RecvRequestCommitOrCancel(const bool& aCommitted); + mozilla::ipc::IPCResult RecvEnableIME(const bool& aEnable); // for reserved shortcut key handling with windowed plugin on Windows nsresult HandledWindowedPluginKeyEvent( const mozilla::NativeEventData& aKeyEventData, bool aIsConsumed); - virtual mozilla::ipc::IPCResult RecvOnWindowedPluginKeyEvent( - const mozilla::NativeEventData& aKeyEventData) override; + mozilla::ipc::IPCResult RecvOnWindowedPluginKeyEvent( + const mozilla::NativeEventData& aKeyEventData); private: // Create an appropriate platform surface for a background of size diff --git a/dom/plugins/ipc/PluginModuleChild.h b/dom/plugins/ipc/PluginModuleChild.h index f80b605bf5d7..e770c97ece87 100644 --- a/dom/plugins/ipc/PluginModuleChild.h +++ b/dom/plugins/ipc/PluginModuleChild.h @@ -51,24 +51,23 @@ class PluginModuleChild : public PPluginModuleChild { virtual bool ShouldContinueFromReplyTimeout() override; - virtual mozilla::ipc::IPCResult RecvSettingChanged( - const PluginSettings& aSettings) override; + mozilla::ipc::IPCResult RecvSettingChanged(const PluginSettings& aSettings); // Implement the PPluginModuleChild interface - virtual mozilla::ipc::IPCResult RecvInitProfiler( - Endpoint&& aEndpoint) override; - virtual mozilla::ipc::IPCResult RecvDisableFlashProtectedMode() override; - virtual mozilla::ipc::IPCResult AnswerNP_GetEntryPoints(NPError* rv) override; - virtual mozilla::ipc::IPCResult AnswerNP_Initialize( - const PluginSettings& aSettings, NPError* rv) override; - virtual mozilla::ipc::IPCResult AnswerSyncNPP_New( - PPluginInstanceChild* aActor, NPError* rv) override; + mozilla::ipc::IPCResult RecvInitProfiler( + Endpoint&& aEndpoint); + mozilla::ipc::IPCResult RecvDisableFlashProtectedMode(); + mozilla::ipc::IPCResult AnswerNP_GetEntryPoints(NPError* rv); + mozilla::ipc::IPCResult AnswerNP_Initialize(const PluginSettings& aSettings, + NPError* rv); + mozilla::ipc::IPCResult AnswerSyncNPP_New(PPluginInstanceChild* aActor, + NPError* rv); - virtual mozilla::ipc::IPCResult RecvInitPluginModuleChild( - Endpoint&& endpoint) override; + mozilla::ipc::IPCResult RecvInitPluginModuleChild( + Endpoint&& endpoint); - virtual mozilla::ipc::IPCResult RecvInitPluginFunctionBroker( - Endpoint&& endpoint) override; + mozilla::ipc::IPCResult RecvInitPluginFunctionBroker( + Endpoint&& endpoint); PPluginInstanceChild* AllocPPluginInstanceChild( const nsCString& aMimeType, const InfallibleTArray& aNames, @@ -76,40 +75,36 @@ class PluginModuleChild : public PPluginModuleChild { bool DeallocPPluginInstanceChild(PPluginInstanceChild* aActor); - virtual mozilla::ipc::IPCResult RecvPPluginInstanceConstructor( + mozilla::ipc::IPCResult RecvPPluginInstanceConstructor( PPluginInstanceChild* aActor, const nsCString& aMimeType, InfallibleTArray&& aNames, InfallibleTArray&& aValues) override; - virtual mozilla::ipc::IPCResult AnswerNP_Shutdown(NPError* rv) override; + mozilla::ipc::IPCResult AnswerNP_Shutdown(NPError* rv); - virtual mozilla::ipc::IPCResult AnswerOptionalFunctionsSupported( - bool* aURLRedirectNotify, bool* aClearSiteData, - bool* aGetSitesWithData) override; + mozilla::ipc::IPCResult AnswerOptionalFunctionsSupported( + bool* aURLRedirectNotify, bool* aClearSiteData, bool* aGetSitesWithData); - virtual mozilla::ipc::IPCResult RecvNPP_ClearSiteData( - const nsCString& aSite, const uint64_t& aFlags, const uint64_t& aMaxAge, - const uint64_t& aCallbackId) override; + mozilla::ipc::IPCResult RecvNPP_ClearSiteData(const nsCString& aSite, + const uint64_t& aFlags, + const uint64_t& aMaxAge, + const uint64_t& aCallbackId); - virtual mozilla::ipc::IPCResult RecvNPP_GetSitesWithData( - const uint64_t& aCallbackId) override; + mozilla::ipc::IPCResult RecvNPP_GetSitesWithData(const uint64_t& aCallbackId); - virtual mozilla::ipc::IPCResult RecvSetAudioSessionData( - const nsID& aId, const nsString& aDisplayName, - const nsString& aIconPath) override; + mozilla::ipc::IPCResult RecvSetAudioSessionData(const nsID& aId, + const nsString& aDisplayName, + const nsString& aIconPath); - virtual mozilla::ipc::IPCResult RecvSetParentHangTimeout( - const uint32_t& aSeconds) override; + mozilla::ipc::IPCResult RecvSetParentHangTimeout(const uint32_t& aSeconds); - virtual mozilla::ipc::IPCResult AnswerInitCrashReporter( - Shmem&& aShmem, mozilla::dom::NativeThreadId* aId) override; + mozilla::ipc::IPCResult AnswerInitCrashReporter( + Shmem&& aShmem, mozilla::dom::NativeThreadId* aId); virtual void ActorDestroy(ActorDestroyReason why) override; - virtual mozilla::ipc::IPCResult RecvProcessNativeEventsInInterruptCall() - override; + mozilla::ipc::IPCResult RecvProcessNativeEventsInInterruptCall(); - virtual mozilla::ipc::IPCResult AnswerModuleSupportsAsyncRender( - bool* aResult) override; + mozilla::ipc::IPCResult AnswerModuleSupportsAsyncRender(bool* aResult); public: explicit PluginModuleChild(bool aIsChrome); @@ -198,9 +193,9 @@ class PluginModuleChild : public PPluginModuleChild { NPError PluginRequiresAudioDeviceChanges(PluginInstanceChild* aInstance, NPBool aShouldRegister); mozilla::ipc::IPCResult RecvNPP_SetValue_NPNVaudioDeviceChangeDetails( - const NPAudioDeviceChangeDetailsIPC& detailsIPC) override; + const NPAudioDeviceChangeDetailsIPC& detailsIPC); mozilla::ipc::IPCResult RecvNPP_SetValue_NPNVaudioDeviceStateChanged( - const NPAudioDeviceStateChangedIPC& aDeviceStateIPC) override; + const NPAudioDeviceStateChangedIPC& aDeviceStateIPC); private: NPError DoNP_Initialize(const PluginSettings& aSettings); diff --git a/dom/plugins/ipc/PluginModuleParent.h b/dom/plugins/ipc/PluginModuleParent.h index b0d4015e32c6..2b0063fe0852 100644 --- a/dom/plugins/ipc/PluginModuleParent.h +++ b/dom/plugins/ipc/PluginModuleParent.h @@ -115,42 +115,36 @@ class PluginModuleParent : public PPluginModuleParent, return MediateRace(parent, child); } - virtual mozilla::ipc::IPCResult RecvBackUpXResources( - const FileDescriptor& aXSocketFd) override; + mozilla::ipc::IPCResult RecvBackUpXResources( + const FileDescriptor& aXSocketFd); - virtual mozilla::ipc::IPCResult AnswerProcessSomeEvents() override; + mozilla::ipc::IPCResult AnswerProcessSomeEvents(); - virtual mozilla::ipc::IPCResult RecvProcessNativeEventsInInterruptCall() - override; + mozilla::ipc::IPCResult RecvProcessNativeEventsInInterruptCall(); - virtual mozilla::ipc::IPCResult RecvPluginShowWindow( + mozilla::ipc::IPCResult RecvPluginShowWindow( const uint32_t& aWindowId, const bool& aModal, const int32_t& aX, - const int32_t& aY, const size_t& aWidth, const size_t& aHeight) override; + const int32_t& aY, const size_t& aWidth, const size_t& aHeight); - virtual mozilla::ipc::IPCResult RecvPluginHideWindow( - const uint32_t& aWindowId) override; + mozilla::ipc::IPCResult RecvPluginHideWindow(const uint32_t& aWindowId); - virtual mozilla::ipc::IPCResult RecvSetCursor( - const NSCursorInfo& aCursorInfo) override; + mozilla::ipc::IPCResult RecvSetCursor(const NSCursorInfo& aCursorInfo); - virtual mozilla::ipc::IPCResult RecvShowCursor(const bool& aShow) override; + mozilla::ipc::IPCResult RecvShowCursor(const bool& aShow); - virtual mozilla::ipc::IPCResult RecvPushCursor( - const NSCursorInfo& aCursorInfo) override; + mozilla::ipc::IPCResult RecvPushCursor(const NSCursorInfo& aCursorInfo); - virtual mozilla::ipc::IPCResult RecvPopCursor() override; + mozilla::ipc::IPCResult RecvPopCursor(); - virtual mozilla::ipc::IPCResult RecvNPN_SetException( - const nsCString& aMessage) override; + mozilla::ipc::IPCResult RecvNPN_SetException(const nsCString& aMessage); - virtual mozilla::ipc::IPCResult RecvNPN_ReloadPlugins( - const bool& aReloadPages) override; + mozilla::ipc::IPCResult RecvNPN_ReloadPlugins(const bool& aReloadPages); static BrowserStreamParent* StreamCast(NPP instance, NPStream* s); virtual mozilla::ipc::IPCResult AnswerNPN_SetValue_NPPVpluginRequiresAudioDeviceChanges( - const bool& shouldRegister, NPError* result) override; + const bool& shouldRegister, NPError* result); protected: void SetChildTimeout(const int32_t aChildTimeout); @@ -158,15 +152,15 @@ class PluginModuleParent : public PPluginModuleParent, virtual void UpdatePluginTimeout() {} - virtual mozilla::ipc::IPCResult RecvNotifyContentModuleDestroyed() override { + virtual mozilla::ipc::IPCResult RecvNotifyContentModuleDestroyed() { return IPC_OK(); } - virtual mozilla::ipc::IPCResult RecvReturnClearSiteData( - const NPError& aRv, const uint64_t& aCallbackId) override; + mozilla::ipc::IPCResult RecvReturnClearSiteData(const NPError& aRv, + const uint64_t& aCallbackId); - virtual mozilla::ipc::IPCResult RecvReturnSitesWithData( - nsTArray&& aSites, const uint64_t& aCallbackId) override; + mozilla::ipc::IPCResult RecvReturnSitesWithData(nsTArray&& aSites, + const uint64_t& aCallbackId); void SetPluginFuncs(NPPluginFuncs* aFuncs); @@ -461,12 +455,12 @@ class PluginModuleChromeParent : public PluginModuleParent, bool InitCrashReporter(); - virtual mozilla::ipc::IPCResult RecvNotifyContentModuleDestroyed() override; + mozilla::ipc::IPCResult RecvNotifyContentModuleDestroyed() override; static void CachedSettingChanged(const char* aPref, PluginModuleChromeParent* aModule); - virtual mozilla::ipc::IPCResult + mozilla::ipc::IPCResult AnswerNPN_SetValue_NPPVpluginRequiresAudioDeviceChanges( const bool& shouldRegister, NPError* result) override; diff --git a/dom/plugins/ipc/PluginScriptableObjectChild.h b/dom/plugins/ipc/PluginScriptableObjectChild.h index b55f8121d483..325c185727c9 100644 --- a/dom/plugins/ipc/PluginScriptableObjectChild.h +++ b/dom/plugins/ipc/PluginScriptableObjectChild.h @@ -44,43 +44,43 @@ class PluginScriptableObjectChild : public PPluginScriptableObjectChild { void InitializeLocal(NPObject* aObject); - virtual mozilla::ipc::IPCResult AnswerInvalidate() override; + mozilla::ipc::IPCResult AnswerInvalidate(); - virtual mozilla::ipc::IPCResult AnswerHasMethod(const PluginIdentifier& aId, - bool* aHasMethod) override; + mozilla::ipc::IPCResult AnswerHasMethod(const PluginIdentifier& aId, + bool* aHasMethod); - virtual mozilla::ipc::IPCResult AnswerInvoke( - const PluginIdentifier& aId, InfallibleTArray&& aArgs, - Variant* aResult, bool* aSuccess) override; + mozilla::ipc::IPCResult AnswerInvoke(const PluginIdentifier& aId, + InfallibleTArray&& aArgs, + Variant* aResult, bool* aSuccess); - virtual mozilla::ipc::IPCResult AnswerInvokeDefault( - InfallibleTArray&& aArgs, Variant* aResult, - bool* aSuccess) override; + mozilla::ipc::IPCResult AnswerInvokeDefault(InfallibleTArray&& aArgs, + Variant* aResult, bool* aSuccess); - virtual mozilla::ipc::IPCResult AnswerHasProperty( - const PluginIdentifier& aId, bool* aHasProperty) override; + mozilla::ipc::IPCResult AnswerHasProperty(const PluginIdentifier& aId, + bool* aHasProperty); - virtual mozilla::ipc::IPCResult AnswerGetChildProperty( - const PluginIdentifier& aId, bool* aHasProperty, bool* aHasMethod, - Variant* aResult, bool* aSuccess) override; + mozilla::ipc::IPCResult AnswerGetChildProperty(const PluginIdentifier& aId, + bool* aHasProperty, + bool* aHasMethod, + Variant* aResult, + bool* aSuccess); - virtual mozilla::ipc::IPCResult AnswerSetProperty(const PluginIdentifier& aId, - const Variant& aValue, - bool* aSuccess) override; + mozilla::ipc::IPCResult AnswerSetProperty(const PluginIdentifier& aId, + const Variant& aValue, + bool* aSuccess); - virtual mozilla::ipc::IPCResult AnswerRemoveProperty( - const PluginIdentifier& aId, bool* aSuccess) override; + mozilla::ipc::IPCResult AnswerRemoveProperty(const PluginIdentifier& aId, + bool* aSuccess); - virtual mozilla::ipc::IPCResult AnswerEnumerate( - InfallibleTArray* aProperties, bool* aSuccess) override; + mozilla::ipc::IPCResult AnswerEnumerate( + InfallibleTArray* aProperties, bool* aSuccess); - virtual mozilla::ipc::IPCResult AnswerConstruct( - InfallibleTArray&& aArgs, Variant* aResult, - bool* aSuccess) override; + mozilla::ipc::IPCResult AnswerConstruct(InfallibleTArray&& aArgs, + Variant* aResult, bool* aSuccess); - virtual mozilla::ipc::IPCResult RecvProtect() override; + mozilla::ipc::IPCResult RecvProtect(); - virtual mozilla::ipc::IPCResult RecvUnprotect() override; + mozilla::ipc::IPCResult RecvUnprotect(); NPObject* GetObject(bool aCanResurrect); diff --git a/dom/plugins/ipc/PluginScriptableObjectParent.h b/dom/plugins/ipc/PluginScriptableObjectParent.h index 00a0be4628bb..63b12f60896c 100644 --- a/dom/plugins/ipc/PluginScriptableObjectParent.h +++ b/dom/plugins/ipc/PluginScriptableObjectParent.h @@ -43,44 +43,42 @@ class PluginScriptableObjectParent : public PPluginScriptableObjectParent { virtual void ActorDestroy(ActorDestroyReason aWhy) override; - virtual mozilla::ipc::IPCResult AnswerHasMethod(const PluginIdentifier& aId, - bool* aHasMethod) override; + mozilla::ipc::IPCResult AnswerHasMethod(const PluginIdentifier& aId, + bool* aHasMethod); - virtual mozilla::ipc::IPCResult AnswerInvoke( - const PluginIdentifier& aId, InfallibleTArray&& aArgs, - Variant* aResult, bool* aSuccess) override; + mozilla::ipc::IPCResult AnswerInvoke(const PluginIdentifier& aId, + InfallibleTArray&& aArgs, + Variant* aResult, bool* aSuccess); - virtual mozilla::ipc::IPCResult AnswerInvokeDefault( - InfallibleTArray&& aArgs, Variant* aResult, - bool* aSuccess) override; + mozilla::ipc::IPCResult AnswerInvokeDefault(InfallibleTArray&& aArgs, + Variant* aResult, bool* aSuccess); - virtual mozilla::ipc::IPCResult AnswerHasProperty( - const PluginIdentifier& aId, bool* aHasProperty) override; + mozilla::ipc::IPCResult AnswerHasProperty(const PluginIdentifier& aId, + bool* aHasProperty); - virtual mozilla::ipc::IPCResult AnswerGetParentProperty( - const PluginIdentifier& aId, Variant* aResult, bool* aSuccess) override; + mozilla::ipc::IPCResult AnswerGetParentProperty(const PluginIdentifier& aId, + Variant* aResult, + bool* aSuccess); - virtual mozilla::ipc::IPCResult AnswerSetProperty(const PluginIdentifier& aId, - const Variant& aValue, - bool* aSuccess) override; + mozilla::ipc::IPCResult AnswerSetProperty(const PluginIdentifier& aId, + const Variant& aValue, + bool* aSuccess); - virtual mozilla::ipc::IPCResult AnswerRemoveProperty( - const PluginIdentifier& aId, bool* aSuccess) override; + mozilla::ipc::IPCResult AnswerRemoveProperty(const PluginIdentifier& aId, + bool* aSuccess); - virtual mozilla::ipc::IPCResult AnswerEnumerate( - InfallibleTArray* aProperties, bool* aSuccess) override; + mozilla::ipc::IPCResult AnswerEnumerate( + InfallibleTArray* aProperties, bool* aSuccess); - virtual mozilla::ipc::IPCResult AnswerConstruct( - InfallibleTArray&& aArgs, Variant* aResult, - bool* aSuccess) override; + mozilla::ipc::IPCResult AnswerConstruct(InfallibleTArray&& aArgs, + Variant* aResult, bool* aSuccess); - virtual mozilla::ipc::IPCResult AnswerNPN_Evaluate(const nsCString& aScript, - Variant* aResult, - bool* aSuccess) override; + mozilla::ipc::IPCResult AnswerNPN_Evaluate(const nsCString& aScript, + Variant* aResult, bool* aSuccess); - virtual mozilla::ipc::IPCResult RecvProtect() override; + mozilla::ipc::IPCResult RecvProtect(); - virtual mozilla::ipc::IPCResult RecvUnprotect() override; + mozilla::ipc::IPCResult RecvUnprotect(); static const NPClass* GetClass() { return &sNPClass; } diff --git a/dom/plugins/ipc/StreamNotifyChild.h b/dom/plugins/ipc/StreamNotifyChild.h index 02af82cf0402..47477359b87f 100644 --- a/dom/plugins/ipc/StreamNotifyChild.h +++ b/dom/plugins/ipc/StreamNotifyChild.h @@ -34,7 +34,7 @@ class StreamNotifyChild : public PStreamNotifyChild { const NPReason& reason) override; mozilla::ipc::IPCResult RecvRedirectNotify(const nsCString& url, - const int32_t& status) override; + const int32_t& status); /** * If a stream is created for this this URLNotify, we associate the objects diff --git a/dom/plugins/ipc/StreamNotifyParent.h b/dom/plugins/ipc/StreamNotifyParent.h index 96c2304d3147..6020f702ac68 100644 --- a/dom/plugins/ipc/StreamNotifyParent.h +++ b/dom/plugins/ipc/StreamNotifyParent.h @@ -30,8 +30,7 @@ class StreamNotifyParent : public PStreamNotifyParent { virtual void ActorDestroy(ActorDestroyReason aWhy) override; private: - mozilla::ipc::IPCResult RecvRedirectNotifyResponse( - const bool& allow) override; + mozilla::ipc::IPCResult RecvRedirectNotifyResponse(const bool& allow); bool* mDestructionFlag; }; diff --git a/dom/presentation/ipc/PresentationBuilderChild.h b/dom/presentation/ipc/PresentationBuilderChild.h index 36b58c82941f..8da43245da47 100644 --- a/dom/presentation/ipc/PresentationBuilderChild.h +++ b/dom/presentation/ipc/PresentationBuilderChild.h @@ -26,12 +26,11 @@ class PresentationBuilderChild final virtual void ActorDestroy(ActorDestroyReason aWhy) override; - virtual mozilla::ipc::IPCResult RecvOnOffer(const nsString& aSDP) override; + mozilla::ipc::IPCResult RecvOnOffer(const nsString& aSDP); - virtual mozilla::ipc::IPCResult RecvOnAnswer(const nsString& aSDP) override; + mozilla::ipc::IPCResult RecvOnAnswer(const nsString& aSDP); - virtual mozilla::ipc::IPCResult RecvOnIceCandidate( - const nsString& aCandidate) override; + mozilla::ipc::IPCResult RecvOnIceCandidate(const nsString& aCandidate); private: virtual ~PresentationBuilderChild() = default; diff --git a/dom/presentation/ipc/PresentationBuilderParent.h b/dom/presentation/ipc/PresentationBuilderParent.h index 8d005ac176ad..6f8e097c16c6 100644 --- a/dom/presentation/ipc/PresentationBuilderParent.h +++ b/dom/presentation/ipc/PresentationBuilderParent.h @@ -24,21 +24,19 @@ class PresentationBuilderParent final explicit PresentationBuilderParent(PresentationParent* aParent); - virtual mozilla::ipc::IPCResult RecvSendOffer(const nsString& aSDP) override; + mozilla::ipc::IPCResult RecvSendOffer(const nsString& aSDP); - virtual mozilla::ipc::IPCResult RecvSendAnswer(const nsString& aSDP) override; + mozilla::ipc::IPCResult RecvSendAnswer(const nsString& aSDP); - virtual mozilla::ipc::IPCResult RecvSendIceCandidate( - const nsString& aCandidate) override; + mozilla::ipc::IPCResult RecvSendIceCandidate(const nsString& aCandidate); - virtual mozilla::ipc::IPCResult RecvClose(const nsresult& aReason) override; + mozilla::ipc::IPCResult RecvClose(const nsresult& aReason); virtual void ActorDestroy(ActorDestroyReason aWhy) override; - virtual mozilla::ipc::IPCResult RecvOnSessionTransport() override; + mozilla::ipc::IPCResult RecvOnSessionTransport(); - virtual mozilla::ipc::IPCResult RecvOnSessionTransportError( - const nsresult& aReason) override; + mozilla::ipc::IPCResult RecvOnSessionTransportError(const nsresult& aReason); private: virtual ~PresentationBuilderParent(); diff --git a/dom/presentation/ipc/PresentationChild.h b/dom/presentation/ipc/PresentationChild.h index 864497add41c..71c7e9402d8f 100644 --- a/dom/presentation/ipc/PresentationChild.h +++ b/dom/presentation/ipc/PresentationChild.h @@ -38,23 +38,23 @@ class PresentationChild final : public PPresentationChild { bool DeallocPPresentationBuilderChild(PPresentationBuilderChild* aActor); - virtual mozilla::ipc::IPCResult RecvNotifyAvailableChange( - nsTArray&& aAvailabilityUrls, const bool& aAvailable) override; + mozilla::ipc::IPCResult RecvNotifyAvailableChange( + nsTArray&& aAvailabilityUrls, const bool& aAvailable); - virtual mozilla::ipc::IPCResult RecvNotifySessionStateChange( + mozilla::ipc::IPCResult RecvNotifySessionStateChange( const nsString& aSessionId, const uint16_t& aState, - const nsresult& aReason) override; + const nsresult& aReason); - virtual mozilla::ipc::IPCResult RecvNotifyMessage( - const nsString& aSessionId, const nsCString& aData, - const bool& aIsBinary) override; + mozilla::ipc::IPCResult RecvNotifyMessage(const nsString& aSessionId, + const nsCString& aData, + const bool& aIsBinary); - virtual mozilla::ipc::IPCResult RecvNotifySessionConnect( - const uint64_t& aWindowId, const nsString& aSessionId) override; + mozilla::ipc::IPCResult RecvNotifySessionConnect(const uint64_t& aWindowId, + const nsString& aSessionId); - virtual mozilla::ipc::IPCResult RecvNotifyCloseSessionTransport( + mozilla::ipc::IPCResult RecvNotifyCloseSessionTransport( const nsString& aSessionId, const uint8_t& aRole, - const nsresult& aReason) override; + const nsresult& aReason); private: virtual ~PresentationChild(); @@ -74,8 +74,7 @@ class PresentationRequestChild final : public PPresentationRequestChild { virtual mozilla::ipc::IPCResult Recv__delete__( const nsresult& aResult) override; - virtual mozilla::ipc::IPCResult RecvNotifyRequestUrlSelected( - const nsString& aUrl) override; + mozilla::ipc::IPCResult RecvNotifyRequestUrlSelected(const nsString& aUrl); private: virtual ~PresentationRequestChild(); diff --git a/dom/presentation/ipc/PresentationParent.h b/dom/presentation/ipc/PresentationParent.h index f0476974091f..3f76981c672b 100644 --- a/dom/presentation/ipc/PresentationParent.h +++ b/dom/presentation/ipc/PresentationParent.h @@ -53,31 +53,31 @@ class PresentationParent final : public PPresentationParent, virtual mozilla::ipc::IPCResult Recv__delete__() override; - virtual mozilla::ipc::IPCResult RecvRegisterAvailabilityHandler( - nsTArray&& aAvailabilityUrls) override; + mozilla::ipc::IPCResult RecvRegisterAvailabilityHandler( + nsTArray&& aAvailabilityUrls); - virtual mozilla::ipc::IPCResult RecvUnregisterAvailabilityHandler( - nsTArray&& aAvailabilityUrls) override; + mozilla::ipc::IPCResult RecvUnregisterAvailabilityHandler( + nsTArray&& aAvailabilityUrls); - virtual mozilla::ipc::IPCResult RecvRegisterSessionHandler( - const nsString& aSessionId, const uint8_t& aRole) override; + mozilla::ipc::IPCResult RecvRegisterSessionHandler(const nsString& aSessionId, + const uint8_t& aRole); - virtual mozilla::ipc::IPCResult RecvUnregisterSessionHandler( - const nsString& aSessionId, const uint8_t& aRole) override; + mozilla::ipc::IPCResult RecvUnregisterSessionHandler( + const nsString& aSessionId, const uint8_t& aRole); - virtual mozilla::ipc::IPCResult RecvRegisterRespondingHandler( - const uint64_t& aWindowId) override; + mozilla::ipc::IPCResult RecvRegisterRespondingHandler( + const uint64_t& aWindowId); - virtual mozilla::ipc::IPCResult RecvUnregisterRespondingHandler( - const uint64_t& aWindowId) override; + mozilla::ipc::IPCResult RecvUnregisterRespondingHandler( + const uint64_t& aWindowId); - virtual mozilla::ipc::IPCResult RecvNotifyReceiverReady( - const nsString& aSessionId, const uint64_t& aWindowId, - const bool& aIsLoading) override; + mozilla::ipc::IPCResult RecvNotifyReceiverReady(const nsString& aSessionId, + const uint64_t& aWindowId, + const bool& aIsLoading); - virtual mozilla::ipc::IPCResult RecvNotifyTransportClosed( - const nsString& aSessionId, const uint8_t& aRole, - const nsresult& aReason) override; + mozilla::ipc::IPCResult RecvNotifyTransportClosed(const nsString& aSessionId, + const uint8_t& aRole, + const nsresult& aReason); private: virtual ~PresentationParent(); diff --git a/dom/serviceworkers/ServiceWorkerManagerChild.h b/dom/serviceworkers/ServiceWorkerManagerChild.h index aafda10419d7..05c216ed0156 100644 --- a/dom/serviceworkers/ServiceWorkerManagerChild.h +++ b/dom/serviceworkers/ServiceWorkerManagerChild.h @@ -28,20 +28,18 @@ class ServiceWorkerManagerChild final : public PServiceWorkerManagerChild { void ManagerShuttingDown() { mShuttingDown = true; } - virtual mozilla::ipc::IPCResult RecvNotifyRegister( - const ServiceWorkerRegistrationData& aData) override; + mozilla::ipc::IPCResult RecvNotifyRegister( + const ServiceWorkerRegistrationData& aData); - virtual mozilla::ipc::IPCResult RecvNotifySoftUpdate( - const OriginAttributes& aOriginAttributes, - const nsString& aScope) override; + mozilla::ipc::IPCResult RecvNotifySoftUpdate( + const OriginAttributes& aOriginAttributes, const nsString& aScope); - virtual mozilla::ipc::IPCResult RecvNotifyUnregister( - const PrincipalInfo& aPrincipalInfo, const nsString& aScope) override; + mozilla::ipc::IPCResult RecvNotifyUnregister( + const PrincipalInfo& aPrincipalInfo, const nsString& aScope); - virtual mozilla::ipc::IPCResult RecvNotifyRemove( - const nsCString& aHost) override; + mozilla::ipc::IPCResult RecvNotifyRemove(const nsCString& aHost); - virtual mozilla::ipc::IPCResult RecvNotifyRemoveAll() override; + mozilla::ipc::IPCResult RecvNotifyRemoveAll(); PServiceWorkerUpdaterChild* AllocPServiceWorkerUpdaterChild( const OriginAttributes& originAttributes, const nsCString& scope); diff --git a/dom/serviceworkers/ServiceWorkerManagerParent.h b/dom/serviceworkers/ServiceWorkerManagerParent.h index 7e015da43bb4..40e0a62cd04c 100644 --- a/dom/serviceworkers/ServiceWorkerManagerParent.h +++ b/dom/serviceworkers/ServiceWorkerManagerParent.h @@ -34,25 +34,23 @@ class ServiceWorkerManagerParent final : public PServiceWorkerManagerParent { ServiceWorkerManagerParent(); ~ServiceWorkerManagerParent(); - virtual mozilla::ipc::IPCResult RecvRegister( - const ServiceWorkerRegistrationData& aData) override; + mozilla::ipc::IPCResult RecvRegister( + const ServiceWorkerRegistrationData& aData); - virtual mozilla::ipc::IPCResult RecvUnregister( - const PrincipalInfo& aPrincipalInfo, const nsString& aScope) override; + mozilla::ipc::IPCResult RecvUnregister(const PrincipalInfo& aPrincipalInfo, + const nsString& aScope); - virtual mozilla::ipc::IPCResult RecvPropagateSoftUpdate( - const OriginAttributes& aOriginAttributes, - const nsString& aScope) override; + mozilla::ipc::IPCResult RecvPropagateSoftUpdate( + const OriginAttributes& aOriginAttributes, const nsString& aScope); - virtual mozilla::ipc::IPCResult RecvPropagateUnregister( - const PrincipalInfo& aPrincipalInfo, const nsString& aScope) override; + mozilla::ipc::IPCResult RecvPropagateUnregister( + const PrincipalInfo& aPrincipalInfo, const nsString& aScope); - virtual mozilla::ipc::IPCResult RecvPropagateRemove( - const nsCString& aHost) override; + mozilla::ipc::IPCResult RecvPropagateRemove(const nsCString& aHost); - virtual mozilla::ipc::IPCResult RecvPropagateRemoveAll() override; + mozilla::ipc::IPCResult RecvPropagateRemoveAll(); - virtual mozilla::ipc::IPCResult RecvShutdown() override; + mozilla::ipc::IPCResult RecvShutdown(); PServiceWorkerUpdaterParent* AllocPServiceWorkerUpdaterParent( const OriginAttributes& aOriginAttributes, const nsCString& aScope); diff --git a/dom/webauthn/WebAuthnTransactionChild.h b/dom/webauthn/WebAuthnTransactionChild.h index 42473a6f16d7..1dcf7a71bfa7 100644 --- a/dom/webauthn/WebAuthnTransactionChild.h +++ b/dom/webauthn/WebAuthnTransactionChild.h @@ -27,14 +27,14 @@ class WebAuthnTransactionChild final : public PWebAuthnTransactionChild { mozilla::ipc::IPCResult RecvConfirmRegister( const uint64_t& aTransactionId, - const WebAuthnMakeCredentialResult& aResult) override; + const WebAuthnMakeCredentialResult& aResult); mozilla::ipc::IPCResult RecvConfirmSign( const uint64_t& aTransactionId, - const WebAuthnGetAssertionResult& aResult) override; + const WebAuthnGetAssertionResult& aResult); mozilla::ipc::IPCResult RecvAbort(const uint64_t& aTransactionId, - const nsresult& aError) override; + const nsresult& aError); void ActorDestroy(ActorDestroyReason why) override; diff --git a/dom/webauthn/WebAuthnTransactionParent.h b/dom/webauthn/WebAuthnTransactionParent.h index c182ee1c37b4..2df4a4d29a50 100644 --- a/dom/webauthn/WebAuthnTransactionParent.h +++ b/dom/webauthn/WebAuthnTransactionParent.h @@ -23,18 +23,17 @@ class WebAuthnTransactionParent final : public PWebAuthnTransactionParent { NS_INLINE_DECL_REFCOUNTING(WebAuthnTransactionParent); WebAuthnTransactionParent() = default; - virtual mozilla::ipc::IPCResult RecvRequestRegister( + mozilla::ipc::IPCResult RecvRequestRegister( const uint64_t& aTransactionId, - const WebAuthnMakeCredentialInfo& aTransactionInfo) override; + const WebAuthnMakeCredentialInfo& aTransactionInfo); - virtual mozilla::ipc::IPCResult RecvRequestSign( + mozilla::ipc::IPCResult RecvRequestSign( const uint64_t& aTransactionId, - const WebAuthnGetAssertionInfo& aTransactionInfo) override; + const WebAuthnGetAssertionInfo& aTransactionInfo); - virtual mozilla::ipc::IPCResult RecvRequestCancel( - const uint64_t& aTransactionId) override; + mozilla::ipc::IPCResult RecvRequestCancel(const uint64_t& aTransactionId); - virtual mozilla::ipc::IPCResult RecvDestroyMe() override; + mozilla::ipc::IPCResult RecvDestroyMe(); virtual void ActorDestroy(ActorDestroyReason aWhy) override; diff --git a/dom/webbrowserpersist/WebBrowserPersistDocumentChild.h b/dom/webbrowserpersist/WebBrowserPersistDocumentChild.h index df75fea2010c..fdeff1f16e26 100644 --- a/dom/webbrowserpersist/WebBrowserPersistDocumentChild.h +++ b/dom/webbrowserpersist/WebBrowserPersistDocumentChild.h @@ -24,8 +24,7 @@ class WebBrowserPersistDocumentChild final void Start(nsIWebBrowserPersistDocument* aDocument); void Start(dom::Document* aDocument); - virtual mozilla::ipc::IPCResult RecvSetPersistFlags( - const uint32_t& aNewFlags) override; + mozilla::ipc::IPCResult RecvSetPersistFlags(const uint32_t& aNewFlags); PWebBrowserPersistResourcesChild* AllocPWebBrowserPersistResourcesChild(); virtual mozilla::ipc::IPCResult RecvPWebBrowserPersistResourcesConstructor( diff --git a/dom/webbrowserpersist/WebBrowserPersistDocumentParent.h b/dom/webbrowserpersist/WebBrowserPersistDocumentParent.h index 88a3309f8d66..2d0c9939b0e3 100644 --- a/dom/webbrowserpersist/WebBrowserPersistDocumentParent.h +++ b/dom/webbrowserpersist/WebBrowserPersistDocumentParent.h @@ -44,10 +44,9 @@ class WebBrowserPersistDocumentParent final using Attrs = WebBrowserPersistDocumentAttrs; // IPDL methods: - virtual mozilla::ipc::IPCResult RecvAttributes( - const Attrs& aAttrs, const OptionalIPCStream& aPostStream) override; - virtual mozilla::ipc::IPCResult RecvInitFailure( - const nsresult& aFailure) override; + mozilla::ipc::IPCResult RecvAttributes(const Attrs& aAttrs, + const OptionalIPCStream& aPostStream); + mozilla::ipc::IPCResult RecvInitFailure(const nsresult& aFailure); PWebBrowserPersistResourcesParent* AllocPWebBrowserPersistResourcesParent(); bool DeallocPWebBrowserPersistResourcesParent( diff --git a/dom/workers/remoteworkers/RemoteWorkerChild.h b/dom/workers/remoteworkers/RemoteWorkerChild.h index c6bd8b66116b..a4bfe1240527 100644 --- a/dom/workers/remoteworkers/RemoteWorkerChild.h +++ b/dom/workers/remoteworkers/RemoteWorkerChild.h @@ -53,7 +53,7 @@ class RemoteWorkerChild final : public PRemoteWorkerChild { void ActorDestroy(ActorDestroyReason aWhy) override; - mozilla::ipc::IPCResult RecvExecOp(const RemoteWorkerOp& aOp) override; + mozilla::ipc::IPCResult RecvExecOp(const RemoteWorkerOp& aOp); void RecvExecOpOnMainThread(const RemoteWorkerOp& aOp); diff --git a/dom/workers/remoteworkers/RemoteWorkerParent.h b/dom/workers/remoteworkers/RemoteWorkerParent.h index a91fe8df0367..1db6816ae4cb 100644 --- a/dom/workers/remoteworkers/RemoteWorkerParent.h +++ b/dom/workers/remoteworkers/RemoteWorkerParent.h @@ -31,11 +31,11 @@ class RemoteWorkerParent final : public PRemoteWorkerParent { void ActorDestroy(mozilla::ipc::IProtocol::ActorDestroyReason) override; - mozilla::ipc::IPCResult RecvError(const ErrorValue& aValue) override; + mozilla::ipc::IPCResult RecvError(const ErrorValue& aValue); - mozilla::ipc::IPCResult RecvClose() override; + mozilla::ipc::IPCResult RecvClose(); - mozilla::ipc::IPCResult RecvCreated(const bool& aStatus) override; + mozilla::ipc::IPCResult RecvCreated(const bool& aStatus); RefPtr mController; }; diff --git a/dom/workers/sharedworkers/SharedWorkerChild.h b/dom/workers/sharedworkers/SharedWorkerChild.h index 132c8dd9afbb..12832a317b34 100644 --- a/dom/workers/sharedworkers/SharedWorkerChild.h +++ b/dom/workers/sharedworkers/SharedWorkerChild.h @@ -38,9 +38,9 @@ class SharedWorkerChild final : public mozilla::dom::PSharedWorkerChild { private: ~SharedWorkerChild(); - mozilla::ipc::IPCResult RecvError(const ErrorValue& aValue) override; + mozilla::ipc::IPCResult RecvError(const ErrorValue& aValue); - mozilla::ipc::IPCResult RecvTerminate() override; + mozilla::ipc::IPCResult RecvTerminate(); void ActorDestroy(ActorDestroyReason aWhy) override; diff --git a/dom/workers/sharedworkers/SharedWorkerParent.h b/dom/workers/sharedworkers/SharedWorkerParent.h index e5c9cd06abdc..2a867bc2665f 100644 --- a/dom/workers/sharedworkers/SharedWorkerParent.h +++ b/dom/workers/sharedworkers/SharedWorkerParent.h @@ -32,15 +32,15 @@ class SharedWorkerParent final : public mozilla::dom::PSharedWorkerParent { void ErrorPropagation(nsresult aError); - mozilla::ipc::IPCResult RecvClose() override; + mozilla::ipc::IPCResult RecvClose(); - mozilla::ipc::IPCResult RecvSuspend() override; + mozilla::ipc::IPCResult RecvSuspend(); - mozilla::ipc::IPCResult RecvResume() override; + mozilla::ipc::IPCResult RecvResume(); - mozilla::ipc::IPCResult RecvFreeze() override; + mozilla::ipc::IPCResult RecvFreeze(); - mozilla::ipc::IPCResult RecvThaw() override; + mozilla::ipc::IPCResult RecvThaw(); bool IsSuspended() const { return mSuspended; } diff --git a/extensions/spellcheck/hunspell/glue/RemoteSpellCheckEngineParent.h b/extensions/spellcheck/hunspell/glue/RemoteSpellCheckEngineParent.h index f1d27f596091..e19be536fd34 100644 --- a/extensions/spellcheck/hunspell/glue/RemoteSpellCheckEngineParent.h +++ b/extensions/spellcheck/hunspell/glue/RemoteSpellCheckEngineParent.h @@ -21,21 +21,20 @@ class RemoteSpellcheckEngineParent : public PRemoteSpellcheckEngineParent { virtual void ActorDestroy(ActorDestroyReason aWhy) override; virtual mozilla::ipc::IPCResult RecvSetDictionary(const nsString& aDictionary, - bool* success) override; + bool* success); virtual mozilla::ipc::IPCResult RecvSetDictionaryFromList( - nsTArray&& aList, - SetDictionaryFromListResolver&& aResolve) override; + nsTArray&& aList, SetDictionaryFromListResolver&& aResolve); virtual mozilla::ipc::IPCResult RecvCheck(const nsString& aWord, - bool* aIsMisspelled) override; + bool* aIsMisspelled); - virtual mozilla::ipc::IPCResult RecvCheckAsync( - nsTArray&& aWord, CheckAsyncResolver&& aResolve) override; + virtual mozilla::ipc::IPCResult RecvCheckAsync(nsTArray&& aWord, + CheckAsyncResolver&& aResolve); virtual mozilla::ipc::IPCResult RecvCheckAndSuggest( const nsString& aWord, bool* aIsMisspelled, - InfallibleTArray* aSuggestions) override; + InfallibleTArray* aSuggestions); private: RefPtr mSpellChecker; diff --git a/gfx/ipc/GPUChild.h b/gfx/ipc/GPUChild.h index 7457cf64070a..6fc2c2a71814 100644 --- a/gfx/ipc/GPUChild.h +++ b/gfx/ipc/GPUChild.h @@ -42,43 +42,38 @@ class GPUChild final : public PGPUChild, public gfxVarReceiver { void OnVarChanged(const GfxVarUpdate& aVar) override; // PGPUChild overrides. - mozilla::ipc::IPCResult RecvInitComplete(const GPUDeviceData& aData) override; - mozilla::ipc::IPCResult RecvReportCheckerboard( - const uint32_t& aSeverity, const nsCString& aLog) override; + mozilla::ipc::IPCResult RecvInitComplete(const GPUDeviceData& aData); + mozilla::ipc::IPCResult RecvReportCheckerboard(const uint32_t& aSeverity, + const nsCString& aLog); mozilla::ipc::IPCResult RecvInitCrashReporter( - Shmem&& shmem, const NativeThreadId& aThreadId) override; - mozilla::ipc::IPCResult RecvCreateVRProcess() override; - mozilla::ipc::IPCResult RecvShutdownVRProcess() override; + Shmem&& shmem, const NativeThreadId& aThreadId); + mozilla::ipc::IPCResult RecvCreateVRProcess(); + mozilla::ipc::IPCResult RecvShutdownVRProcess(); mozilla::ipc::IPCResult RecvAccumulateChildHistograms( - InfallibleTArray&& aAccumulations) override; + InfallibleTArray&& aAccumulations); mozilla::ipc::IPCResult RecvAccumulateChildKeyedHistograms( - InfallibleTArray&& aAccumulations) override; + InfallibleTArray&& aAccumulations); mozilla::ipc::IPCResult RecvUpdateChildScalars( - InfallibleTArray&& aScalarActions) override; + InfallibleTArray&& aScalarActions); mozilla::ipc::IPCResult RecvUpdateChildKeyedScalars( - InfallibleTArray&& aScalarActions) override; + InfallibleTArray&& aScalarActions); mozilla::ipc::IPCResult RecvRecordChildEvents( - nsTArray&& events) override; + nsTArray&& events); mozilla::ipc::IPCResult RecvRecordDiscardedData( - const DiscardedData& aDiscardedData) override; + const DiscardedData& aDiscardedData); void ActorDestroy(ActorDestroyReason aWhy) override; - mozilla::ipc::IPCResult RecvGraphicsError(const nsCString& aError) override; - mozilla::ipc::IPCResult RecvNotifyUiObservers( - const nsCString& aTopic) override; - mozilla::ipc::IPCResult RecvNotifyDeviceReset( - const GPUDeviceData& aData) override; - mozilla::ipc::IPCResult RecvAddMemoryReport( - const MemoryReport& aReport) override; - mozilla::ipc::IPCResult RecvFinishMemoryReport( - const uint32_t& aGeneration) override; - mozilla::ipc::IPCResult RecvUpdateFeature( - const Feature& aFeature, const FeatureFailure& aChange) override; + mozilla::ipc::IPCResult RecvGraphicsError(const nsCString& aError); + mozilla::ipc::IPCResult RecvNotifyUiObservers(const nsCString& aTopic); + mozilla::ipc::IPCResult RecvNotifyDeviceReset(const GPUDeviceData& aData); + mozilla::ipc::IPCResult RecvAddMemoryReport(const MemoryReport& aReport); + mozilla::ipc::IPCResult RecvFinishMemoryReport(const uint32_t& aGeneration); + mozilla::ipc::IPCResult RecvUpdateFeature(const Feature& aFeature, + const FeatureFailure& aChange); mozilla::ipc::IPCResult RecvUsedFallback(const Fallback& aFallback, - const nsCString& aMessage) override; - mozilla::ipc::IPCResult RecvBHRThreadHang( - const HangDetails& aDetails) override; + const nsCString& aMessage); + mozilla::ipc::IPCResult RecvBHRThreadHang(const HangDetails& aDetails); bool SendRequestMemoryReport(const uint32_t& aGeneration, const bool& aAnonymize, diff --git a/gfx/ipc/GPUParent.h b/gfx/ipc/GPUParent.h index fb382b336435..5f628bf26d3d 100644 --- a/gfx/ipc/GPUParent.h +++ b/gfx/ipc/GPUParent.h @@ -37,49 +37,45 @@ class GPUParent final : public PGPUParent { PAPZInputBridgeParent* AllocPAPZInputBridgeParent(const LayersId& aLayersId); bool DeallocPAPZInputBridgeParent(PAPZInputBridgeParent* aActor); - mozilla::ipc::IPCResult RecvInit( - nsTArray&& prefs, nsTArray&& vars, - const DevicePrefs& devicePrefs, - nsTArray&& mappings) override; + mozilla::ipc::IPCResult RecvInit(nsTArray&& prefs, + nsTArray&& vars, + const DevicePrefs& devicePrefs, + nsTArray&& mappings); mozilla::ipc::IPCResult RecvInitCompositorManager( - Endpoint&& aEndpoint) override; + Endpoint&& aEndpoint); mozilla::ipc::IPCResult RecvInitVsyncBridge( - Endpoint&& aVsyncEndpoint) override; + Endpoint&& aVsyncEndpoint); mozilla::ipc::IPCResult RecvInitImageBridge( - Endpoint&& aEndpoint) override; + Endpoint&& aEndpoint); mozilla::ipc::IPCResult RecvInitVRManager( - Endpoint&& aEndpoint) override; - mozilla::ipc::IPCResult RecvInitVR( - Endpoint&& aVRGPUChild) override; + Endpoint&& aEndpoint); + mozilla::ipc::IPCResult RecvInitVR(Endpoint&& aVRGPUChild); mozilla::ipc::IPCResult RecvInitUiCompositorController( const LayersId& aRootLayerTreeId, - Endpoint&& aEndpoint) override; + Endpoint&& aEndpoint); mozilla::ipc::IPCResult RecvInitProfiler( - Endpoint&& aEndpoint) override; - mozilla::ipc::IPCResult RecvUpdatePref(const GfxPrefSetting& pref) override; - mozilla::ipc::IPCResult RecvUpdateVar(const GfxVarUpdate& pref) override; + Endpoint&& aEndpoint); + mozilla::ipc::IPCResult RecvUpdatePref(const GfxPrefSetting& pref); + mozilla::ipc::IPCResult RecvUpdateVar(const GfxVarUpdate& pref); mozilla::ipc::IPCResult RecvNewContentCompositorManager( - Endpoint&& aEndpoint) override; + Endpoint&& aEndpoint); mozilla::ipc::IPCResult RecvNewContentImageBridge( - Endpoint&& aEndpoint) override; + Endpoint&& aEndpoint); mozilla::ipc::IPCResult RecvNewContentVRManager( - Endpoint&& aEndpoint) override; + Endpoint&& aEndpoint); mozilla::ipc::IPCResult RecvNewContentVideoDecoderManager( - Endpoint&& aEndpoint) override; - mozilla::ipc::IPCResult RecvGetDeviceStatus( - GPUDeviceData* aOutStatus) override; - mozilla::ipc::IPCResult RecvSimulateDeviceReset( - GPUDeviceData* aOutStatus) override; + Endpoint&& aEndpoint); + mozilla::ipc::IPCResult RecvGetDeviceStatus(GPUDeviceData* aOutStatus); + mozilla::ipc::IPCResult RecvSimulateDeviceReset(GPUDeviceData* aOutStatus); mozilla::ipc::IPCResult RecvAddLayerTreeIdMapping( - const LayerTreeIdMapping& aMapping) override; + const LayerTreeIdMapping& aMapping); mozilla::ipc::IPCResult RecvRemoveLayerTreeIdMapping( - const LayerTreeIdMapping& aMapping) override; - mozilla::ipc::IPCResult RecvNotifyGpuObservers( - const nsCString& aTopic) override; + const LayerTreeIdMapping& aMapping); + mozilla::ipc::IPCResult RecvNotifyGpuObservers(const nsCString& aTopic); mozilla::ipc::IPCResult RecvRequestMemoryReport( const uint32_t& generation, const bool& anonymize, - const bool& minimizeMemoryUsage, const MaybeFileDesc& DMDFile) override; - mozilla::ipc::IPCResult RecvShutdownVR() override; + const bool& minimizeMemoryUsage, const MaybeFileDesc& DMDFile); + mozilla::ipc::IPCResult RecvShutdownVR(); void ActorDestroy(ActorDestroyReason aWhy) override; diff --git a/gfx/ipc/VsyncBridgeParent.h b/gfx/ipc/VsyncBridgeParent.h index 6ca810b7238c..2e04e90cef4c 100644 --- a/gfx/ipc/VsyncBridgeParent.h +++ b/gfx/ipc/VsyncBridgeParent.h @@ -24,7 +24,7 @@ class VsyncBridgeParent final : public PVsyncBridgeParent { Endpoint&& aEndpoint); mozilla::ipc::IPCResult RecvNotifyVsync(const VsyncEvent& aVsync, - const LayersId& aLayersId) override; + const LayersId& aLayersId); void ActorDestroy(ActorDestroyReason aWhy) override; void DeallocPVsyncBridgeParent() override; diff --git a/gfx/layers/ipc/APZCTreeManagerChild.h b/gfx/layers/ipc/APZCTreeManagerChild.h index 345f0ae696dd..51be05ceaba4 100644 --- a/gfx/layers/ipc/APZCTreeManagerChild.h +++ b/gfx/layers/ipc/APZCTreeManagerChild.h @@ -70,15 +70,14 @@ class APZCTreeManagerChild : public IAPZCTreeManager, const LayoutDevicePoint& aPoint, const Modifiers& aModifiers, const ScrollableLayerGuid& aGuid, - const uint64_t& aInputBlockId) override; + const uint64_t& aInputBlockId); mozilla::ipc::IPCResult RecvNotifyPinchGesture( const PinchGestureType& aType, const ScrollableLayerGuid& aGuid, - const LayoutDeviceCoord& aSpanChange, - const Modifiers& aModifiers) override; + const LayoutDeviceCoord& aSpanChange, const Modifiers& aModifiers); mozilla::ipc::IPCResult RecvCancelAutoscroll( - const ScrollableLayerGuid::ViewID& aScrollId) override; + const ScrollableLayerGuid::ViewID& aScrollId); virtual ~APZCTreeManagerChild(); diff --git a/gfx/layers/ipc/APZCTreeManagerParent.h b/gfx/layers/ipc/APZCTreeManagerParent.h index b6f65d146f3d..499993eb7590 100644 --- a/gfx/layers/ipc/APZCTreeManagerParent.h +++ b/gfx/layers/ipc/APZCTreeManagerParent.h @@ -31,43 +31,36 @@ class APZCTreeManagerParent : public PAPZCTreeManagerParent { void ChildAdopted(RefPtr aAPZCTreeManager, RefPtr aAPZUpdater); - mozilla::ipc::IPCResult RecvSetKeyboardMap( - const KeyboardMap& aKeyboardMap) override; + mozilla::ipc::IPCResult RecvSetKeyboardMap(const KeyboardMap& aKeyboardMap); mozilla::ipc::IPCResult RecvZoomToRect(const ScrollableLayerGuid& aGuid, const CSSRect& aRect, - const uint32_t& aFlags) override; + const uint32_t& aFlags); mozilla::ipc::IPCResult RecvContentReceivedInputBlock( - const uint64_t& aInputBlockId, const bool& aPreventDefault) override; + const uint64_t& aInputBlockId, const bool& aPreventDefault); mozilla::ipc::IPCResult RecvSetTargetAPZC( - const uint64_t& aInputBlockId, - nsTArray&& aTargets) override; + const uint64_t& aInputBlockId, nsTArray&& aTargets); mozilla::ipc::IPCResult RecvUpdateZoomConstraints( const ScrollableLayerGuid& aGuid, - const MaybeZoomConstraints& aConstraints) override; + const MaybeZoomConstraints& aConstraints); - mozilla::ipc::IPCResult RecvSetDPI(const float& aDpiValue) override; + mozilla::ipc::IPCResult RecvSetDPI(const float& aDpiValue); mozilla::ipc::IPCResult RecvSetAllowedTouchBehavior( - const uint64_t& aInputBlockId, - nsTArray&& aValues) override; + const uint64_t& aInputBlockId, nsTArray&& aValues); mozilla::ipc::IPCResult RecvStartScrollbarDrag( - const ScrollableLayerGuid& aGuid, - const AsyncDragMetrics& aDragMetrics) override; + const ScrollableLayerGuid& aGuid, const AsyncDragMetrics& aDragMetrics); mozilla::ipc::IPCResult RecvStartAutoscroll( - const ScrollableLayerGuid& aGuid, - const ScreenPoint& aAnchorLocation) override; + const ScrollableLayerGuid& aGuid, const ScreenPoint& aAnchorLocation); - mozilla::ipc::IPCResult RecvStopAutoscroll( - const ScrollableLayerGuid& aGuid) override; + mozilla::ipc::IPCResult RecvStopAutoscroll(const ScrollableLayerGuid& aGuid); - mozilla::ipc::IPCResult RecvSetLongTapEnabled( - const bool& aTapGestureEnabled) override; + mozilla::ipc::IPCResult RecvSetLongTapEnabled(const bool& aTapGestureEnabled); void ActorDestroy(ActorDestroyReason aWhy) override {} diff --git a/gfx/layers/ipc/APZChild.h b/gfx/layers/ipc/APZChild.h index c62108b4040f..d623b1448af0 100644 --- a/gfx/layers/ipc/APZChild.h +++ b/gfx/layers/ipc/APZChild.h @@ -25,33 +25,33 @@ class APZChild final : public PAPZChild { ~APZChild(); mozilla::ipc::IPCResult RecvRequestContentRepaint( - const RepaintRequest& aRequest) override; + const RepaintRequest& aRequest); mozilla::ipc::IPCResult RecvUpdateOverscrollVelocity( - const float& aX, const float& aY, const bool& aIsRootContent) override; + const float& aX, const float& aY, const bool& aIsRootContent); mozilla::ipc::IPCResult RecvUpdateOverscrollOffset( - const float& aX, const float& aY, const bool& aIsRootContent) override; + const float& aX, const float& aY, const bool& aIsRootContent); - mozilla::ipc::IPCResult RecvNotifyMozMouseScrollEvent( - const ViewID& aScrollId, const nsString& aEvent) override; + mozilla::ipc::IPCResult RecvNotifyMozMouseScrollEvent(const ViewID& aScrollId, + const nsString& aEvent); mozilla::ipc::IPCResult RecvNotifyAPZStateChange( const ScrollableLayerGuid& aGuid, const APZStateChange& aChange, - const int& aArg) override; + const int& aArg); - mozilla::ipc::IPCResult RecvNotifyFlushComplete() override; + mozilla::ipc::IPCResult RecvNotifyFlushComplete(); mozilla::ipc::IPCResult RecvNotifyAsyncScrollbarDragInitiated( const uint64_t& aDragBlockId, const ViewID& aScrollId, - const ScrollDirection& aDirection) override; + const ScrollDirection& aDirection); mozilla::ipc::IPCResult RecvNotifyAsyncScrollbarDragRejected( - const ViewID& aScrollId) override; + const ViewID& aScrollId); mozilla::ipc::IPCResult RecvNotifyAsyncAutoscrollRejected( - const ViewID& aScrollId) override; + const ViewID& aScrollId); - mozilla::ipc::IPCResult RecvDestroy() override; + mozilla::ipc::IPCResult RecvDestroy(); private: RefPtr mController; diff --git a/gfx/layers/ipc/APZInputBridgeParent.h b/gfx/layers/ipc/APZInputBridgeParent.h index ec17a87c3add..c740d370e9ff 100644 --- a/gfx/layers/ipc/APZInputBridgeParent.h +++ b/gfx/layers/ipc/APZInputBridgeParent.h @@ -23,46 +23,44 @@ class APZInputBridgeParent : public PAPZInputBridgeParent { mozilla::ipc::IPCResult RecvReceiveMultiTouchInputEvent( const MultiTouchInput& aEvent, nsEventStatus* aOutStatus, MultiTouchInput* aOutEvent, ScrollableLayerGuid* aOutTargetGuid, - uint64_t* aOutInputBlockId) override; + uint64_t* aOutInputBlockId); mozilla::ipc::IPCResult RecvReceiveMouseInputEvent( const MouseInput& aEvent, nsEventStatus* aOutStatus, MouseInput* aOutEvent, ScrollableLayerGuid* aOutTargetGuid, - uint64_t* aOutInputBlockId) override; + uint64_t* aOutInputBlockId); mozilla::ipc::IPCResult RecvReceivePanGestureInputEvent( const PanGestureInput& aEvent, nsEventStatus* aOutStatus, PanGestureInput* aOutEvent, ScrollableLayerGuid* aOutTargetGuid, - uint64_t* aOutInputBlockId) override; + uint64_t* aOutInputBlockId); mozilla::ipc::IPCResult RecvReceivePinchGestureInputEvent( const PinchGestureInput& aEvent, nsEventStatus* aOutStatus, PinchGestureInput* aOutEvent, ScrollableLayerGuid* aOutTargetGuid, - uint64_t* aOutInputBlockId) override; + uint64_t* aOutInputBlockId); mozilla::ipc::IPCResult RecvReceiveTapGestureInputEvent( const TapGestureInput& aEvent, nsEventStatus* aOutStatus, TapGestureInput* aOutEvent, ScrollableLayerGuid* aOutTargetGuid, - uint64_t* aOutInputBlockId) override; + uint64_t* aOutInputBlockId); mozilla::ipc::IPCResult RecvReceiveScrollWheelInputEvent( const ScrollWheelInput& aEvent, nsEventStatus* aOutStatus, ScrollWheelInput* aOutEvent, ScrollableLayerGuid* aOutTargetGuid, - uint64_t* aOutInputBlockId) override; + uint64_t* aOutInputBlockId); mozilla::ipc::IPCResult RecvReceiveKeyboardInputEvent( const KeyboardInput& aEvent, nsEventStatus* aOutStatus, KeyboardInput* aOutEvent, ScrollableLayerGuid* aOutTargetGuid, - uint64_t* aOutInputBlockId) override; + uint64_t* aOutInputBlockId); mozilla::ipc::IPCResult RecvUpdateWheelTransaction( - const LayoutDeviceIntPoint& aRefPoint, - const EventMessage& aEventMessage) override; + const LayoutDeviceIntPoint& aRefPoint, const EventMessage& aEventMessage); mozilla::ipc::IPCResult RecvProcessUnhandledEvent( const LayoutDeviceIntPoint& aRefPoint, LayoutDeviceIntPoint* aOutRefPoint, - ScrollableLayerGuid* aOutTargetGuid, - uint64_t* aOutFocusSequenceNumber) override; + ScrollableLayerGuid* aOutTargetGuid, uint64_t* aOutFocusSequenceNumber); void ActorDestroy(ActorDestroyReason aWhy) override; diff --git a/gfx/layers/ipc/CompositorBridgeChild.h b/gfx/layers/ipc/CompositorBridgeChild.h index ff69a0004810..94b39a70fd41 100644 --- a/gfx/layers/ipc/CompositorBridgeChild.h +++ b/gfx/layers/ipc/CompositorBridgeChild.h @@ -86,27 +86,24 @@ class CompositorBridgeChild final : public PCompositorBridgeChild, // process). This may only be called on the main thread. static bool CompositorIsInGPUProcess(); - virtual mozilla::ipc::IPCResult RecvDidComposite( - const LayersId& aId, const TransactionId& aTransactionId, - const TimeStamp& aCompositeStart, - const TimeStamp& aCompositeEnd) override; + mozilla::ipc::IPCResult RecvDidComposite(const LayersId& aId, + const TransactionId& aTransactionId, + const TimeStamp& aCompositeStart, + const TimeStamp& aCompositeEnd); - virtual mozilla::ipc::IPCResult RecvNotifyFrameStats( - nsTArray&& aFrameStats) override; + mozilla::ipc::IPCResult RecvNotifyFrameStats( + nsTArray&& aFrameStats); - virtual mozilla::ipc::IPCResult RecvInvalidateLayers( - const LayersId& aLayersId) override; + mozilla::ipc::IPCResult RecvInvalidateLayers(const LayersId& aLayersId); - virtual mozilla::ipc::IPCResult RecvUpdatePluginConfigurations( + mozilla::ipc::IPCResult RecvUpdatePluginConfigurations( const LayoutDeviceIntPoint& aContentOffset, const LayoutDeviceIntRegion& aVisibleRegion, - nsTArray&& aPlugins) override; + nsTArray&& aPlugins); - virtual mozilla::ipc::IPCResult RecvCaptureAllPlugins( - const uintptr_t& aParentWidget) override; + mozilla::ipc::IPCResult RecvCaptureAllPlugins(const uintptr_t& aParentWidget); - virtual mozilla::ipc::IPCResult RecvHideAllPlugins( - const uintptr_t& aParentWidget) override; + mozilla::ipc::IPCResult RecvHideAllPlugins(const uintptr_t& aParentWidget); PTextureChild* AllocPTextureChild( const SurfaceDescriptor& aSharedData, const ReadLockDescriptor& aReadLock, @@ -116,8 +113,8 @@ class CompositorBridgeChild final : public PCompositorBridgeChild, bool DeallocPTextureChild(PTextureChild* actor); - virtual mozilla::ipc::IPCResult RecvParentAsyncMessages( - InfallibleTArray&& aMessages) override; + mozilla::ipc::IPCResult RecvParentAsyncMessages( + InfallibleTArray&& aMessages); virtual PTextureChild* CreateTexture( const SurfaceDescriptor& aSharedData, const ReadLockDescriptor& aReadLock, LayersBackend aLayersBackend, TextureFlags aFlags, uint64_t aSerial, @@ -270,22 +267,22 @@ class CompositorBridgeChild final : public PCompositorBridgeChild, virtual void ActorDestroy(ActorDestroyReason aWhy) override; - virtual mozilla::ipc::IPCResult RecvSharedCompositorFrameMetrics( + mozilla::ipc::IPCResult RecvSharedCompositorFrameMetrics( const mozilla::ipc::SharedMemoryBasic::Handle& metrics, const CrossProcessMutexHandle& handle, const LayersId& aLayersId, - const uint32_t& aAPZCId) override; + const uint32_t& aAPZCId); - virtual mozilla::ipc::IPCResult RecvReleaseSharedCompositorFrameMetrics( - const ViewID& aId, const uint32_t& aAPZCId) override; + mozilla::ipc::IPCResult RecvReleaseSharedCompositorFrameMetrics( + const ViewID& aId, const uint32_t& aAPZCId); - virtual mozilla::ipc::IPCResult RecvRemotePaintIsReady() override; + mozilla::ipc::IPCResult RecvRemotePaintIsReady(); mozilla::ipc::IPCResult RecvObserveLayersUpdate( const LayersId& aLayersId, const LayersObserverEpoch& aEpoch, - const bool& aActive) override; + const bool& aActive); - virtual mozilla::ipc::IPCResult RecvNotifyWebRenderError( - const WebRenderError& aError) override; + mozilla::ipc::IPCResult RecvNotifyWebRenderError( + const WebRenderError& aError); uint64_t GetNextResourceId(); diff --git a/gfx/layers/ipc/CompositorBridgeParent.h b/gfx/layers/ipc/CompositorBridgeParent.h index df0e6f8b1572..34979edf5800 100644 --- a/gfx/layers/ipc/CompositorBridgeParent.h +++ b/gfx/layers/ipc/CompositorBridgeParent.h @@ -148,7 +148,7 @@ class CompositorBridgeParentBase : public PCompositorBridgeParent, return this; } - mozilla::ipc::IPCResult RecvSyncWithCompositor() override { return IPC_OK(); } + mozilla::ipc::IPCResult RecvSyncWithCompositor() { return IPC_OK(); } mozilla::ipc::IPCResult Recv__delete__() override { return IPC_OK(); } @@ -230,6 +230,39 @@ class CompositorBridgeParentBase : public PCompositorBridgeParent, virtual bool DeallocPCompositorWidgetParent( PCompositorWidgetParent* aActor) = 0; + virtual mozilla::ipc::IPCResult RecvRemotePluginsReady() = 0; + virtual mozilla::ipc::IPCResult RecvAdoptChild(const LayersId& id) = 0; + virtual mozilla::ipc::IPCResult RecvFlushRenderingAsync() = 0; + virtual mozilla::ipc::IPCResult RecvForcePresent() = 0; + virtual mozilla::ipc::IPCResult RecvNotifyRegionInvalidated( + const nsIntRegion& region) = 0; + virtual mozilla::ipc::IPCResult RecvRequestNotifyAfterRemotePaint() = 0; + virtual mozilla::ipc::IPCResult RecvAllPluginsCaptured() = 0; + virtual mozilla::ipc::IPCResult RecvInitialize( + const LayersId& rootLayerTreeId) = 0; + virtual mozilla::ipc::IPCResult RecvGetFrameUniformity( + FrameUniformityData* data) = 0; + virtual mozilla::ipc::IPCResult RecvWillClose() = 0; + virtual mozilla::ipc::IPCResult RecvPause() = 0; + virtual mozilla::ipc::IPCResult RecvResume() = 0; + virtual mozilla::ipc::IPCResult RecvNotifyChildCreated( + const LayersId& id, CompositorOptions* compositorOptions) = 0; + virtual mozilla::ipc::IPCResult RecvMapAndNotifyChildCreated( + const LayersId& id, const ProcessId& owner, + CompositorOptions* compositorOptions) = 0; + virtual mozilla::ipc::IPCResult RecvNotifyChildRecreated( + const LayersId& id, CompositorOptions* compositorOptions) = 0; + virtual mozilla::ipc::IPCResult RecvMakeSnapshot( + const SurfaceDescriptor& inSnapshot, const IntRect& dirtyRect) = 0; + virtual mozilla::ipc::IPCResult RecvFlushRendering() = 0; + virtual mozilla::ipc::IPCResult RecvWaitOnTransactionProcessed() = 0; + virtual mozilla::ipc::IPCResult RecvStartFrameTimeRecording( + const int32_t& bufferSize, uint32_t* startIndex) = 0; + virtual mozilla::ipc::IPCResult RecvStopFrameTimeRecording( + const uint32_t& startIndex, nsTArray* intervals) = 0; + virtual mozilla::ipc::IPCResult RecvCheckContentOnlyTDR( + const uint32_t& sequenceNum, bool* isContentOnlyTDR) = 0; + bool mCanSend; private: diff --git a/gfx/layers/ipc/CompositorManagerParent.h b/gfx/layers/ipc/CompositorManagerParent.h index 998d9358b2b5..e18dc095a6ba 100644 --- a/gfx/layers/ipc/CompositorManagerParent.h +++ b/gfx/layers/ipc/CompositorManagerParent.h @@ -40,17 +40,15 @@ class CompositorManagerParent final : public PCompositorManagerParent { const gfx::IntSize& aSurfaceSize); mozilla::ipc::IPCResult RecvAddSharedSurface( - const wr::ExternalImageId& aId, - const SurfaceDescriptorShared& aDesc) override; + const wr::ExternalImageId& aId, const SurfaceDescriptorShared& aDesc); mozilla::ipc::IPCResult RecvRemoveSharedSurface( - const wr::ExternalImageId& aId) override; + const wr::ExternalImageId& aId); mozilla::ipc::IPCResult RecvReportSharedSurfacesMemory( - ReportSharedSurfacesMemoryResolver&&) override; + ReportSharedSurfacesMemoryResolver&&); - virtual mozilla::ipc::IPCResult RecvNotifyMemoryPressure() override; + mozilla::ipc::IPCResult RecvNotifyMemoryPressure(); - virtual mozilla::ipc::IPCResult RecvReportMemory( - ReportMemoryResolver&&) override; + mozilla::ipc::IPCResult RecvReportMemory(ReportMemoryResolver&&); void BindComplete(); void ActorDestroy(ActorDestroyReason aReason) override; diff --git a/gfx/layers/ipc/ImageBridgeChild.h b/gfx/layers/ipc/ImageBridgeChild.h index 711d1c4b2004..e5a8482a6ed0 100644 --- a/gfx/layers/ipc/ImageBridgeChild.h +++ b/gfx/layers/ipc/ImageBridgeChild.h @@ -191,14 +191,14 @@ class ImageBridgeChild final : public PImageBridgeChild, bool DeallocPMediaSystemResourceManagerChild( PMediaSystemResourceManagerChild* aActor); - virtual mozilla::ipc::IPCResult RecvParentAsyncMessages( - InfallibleTArray&& aMessages) override; + mozilla::ipc::IPCResult RecvParentAsyncMessages( + InfallibleTArray&& aMessages); - virtual mozilla::ipc::IPCResult RecvDidComposite( - InfallibleTArray&& aNotifications) override; + mozilla::ipc::IPCResult RecvDidComposite( + InfallibleTArray&& aNotifications); - virtual mozilla::ipc::IPCResult RecvReportFramesDropped( - const CompositableHandle& aHandle, const uint32_t& aFrames) override; + mozilla::ipc::IPCResult RecvReportFramesDropped( + const CompositableHandle& aHandle, const uint32_t& aFrames); // Create an ImageClient from any thread. RefPtr CreateImageClient(CompositableType aType, diff --git a/gfx/layers/ipc/ImageBridgeParent.h b/gfx/layers/ipc/ImageBridgeParent.h index 3e0d7ea42c39..3973e2544cf3 100644 --- a/gfx/layers/ipc/ImageBridgeParent.h +++ b/gfx/layers/ipc/ImageBridgeParent.h @@ -74,9 +74,9 @@ class ImageBridgeParent final : public PImageBridgeParent, virtual base::ProcessId GetChildProcessId() override { return OtherPid(); } // PImageBridge - virtual mozilla::ipc::IPCResult RecvUpdate( - EditArray&& aEdits, OpDestroyArray&& aToDestroy, - const uint64_t& aFwdTransactionId) override; + mozilla::ipc::IPCResult RecvUpdate(EditArray&& aEdits, + OpDestroyArray&& aToDestroy, + const uint64_t& aFwdTransactionId); PTextureParent* AllocPTextureParent( const SurfaceDescriptor& aSharedData, const ReadLockDescriptor& aReadLock, @@ -85,18 +85,18 @@ class ImageBridgeParent final : public PImageBridgeParent, const wr::MaybeExternalImageId& aExternalImageId); bool DeallocPTextureParent(PTextureParent* actor); - virtual mozilla::ipc::IPCResult RecvNewCompositable( + mozilla::ipc::IPCResult RecvNewCompositable( const CompositableHandle& aHandle, const TextureInfo& aInfo, - const LayersBackend& aLayersBackend) override; - virtual mozilla::ipc::IPCResult RecvReleaseCompositable( - const CompositableHandle& aHandle) override; + const LayersBackend& aLayersBackend); + mozilla::ipc::IPCResult RecvReleaseCompositable( + const CompositableHandle& aHandle); PMediaSystemResourceManagerParent* AllocPMediaSystemResourceManagerParent(); bool DeallocPMediaSystemResourceManagerParent( PMediaSystemResourceManagerParent* aActor); // Shutdown step 1 - virtual mozilla::ipc::IPCResult RecvWillClose() override; + mozilla::ipc::IPCResult RecvWillClose(); MessageLoop* GetMessageLoop() const { return mMessageLoop; } diff --git a/gfx/layers/ipc/LayerTransactionParent.h b/gfx/layers/ipc/LayerTransactionParent.h index 2ca217799760..788a447b9c82 100644 --- a/gfx/layers/ipc/LayerTransactionParent.h +++ b/gfx/layers/ipc/LayerTransactionParent.h @@ -97,48 +97,43 @@ class LayerTransactionParent final : public PLayerTransactionParent, base::ProcessId GetChildProcessId() override { return OtherPid(); } protected: - mozilla::ipc::IPCResult RecvShutdown() override; - mozilla::ipc::IPCResult RecvShutdownSync() override; + mozilla::ipc::IPCResult RecvShutdown(); + mozilla::ipc::IPCResult RecvShutdownSync(); - mozilla::ipc::IPCResult RecvPaintTime( - const TransactionId& aTransactionId, - const TimeDuration& aPaintTime) override; + mozilla::ipc::IPCResult RecvPaintTime(const TransactionId& aTransactionId, + const TimeDuration& aPaintTime); - mozilla::ipc::IPCResult RecvUpdate(const TransactionInfo& aInfo) override; + mozilla::ipc::IPCResult RecvUpdate(const TransactionInfo& aInfo); mozilla::ipc::IPCResult RecvSetLayersObserverEpoch( - const LayersObserverEpoch& aChildEpoch) override; - mozilla::ipc::IPCResult RecvNewCompositable( - const CompositableHandle& aHandle, const TextureInfo& aInfo) override; - mozilla::ipc::IPCResult RecvReleaseLayer(const LayerHandle& aHandle) override; + const LayersObserverEpoch& aChildEpoch); + mozilla::ipc::IPCResult RecvNewCompositable(const CompositableHandle& aHandle, + const TextureInfo& aInfo); + mozilla::ipc::IPCResult RecvReleaseLayer(const LayerHandle& aHandle); mozilla::ipc::IPCResult RecvReleaseCompositable( - const CompositableHandle& aHandle) override; + const CompositableHandle& aHandle); - mozilla::ipc::IPCResult RecvClearCachedResources() override; - mozilla::ipc::IPCResult RecvScheduleComposite() override; - mozilla::ipc::IPCResult RecvSetTestSampleTime( - const TimeStamp& aTime) override; - mozilla::ipc::IPCResult RecvLeaveTestMode() override; + mozilla::ipc::IPCResult RecvClearCachedResources(); + mozilla::ipc::IPCResult RecvScheduleComposite(); + mozilla::ipc::IPCResult RecvSetTestSampleTime(const TimeStamp& aTime); + mozilla::ipc::IPCResult RecvLeaveTestMode(); mozilla::ipc::IPCResult RecvGetAnimationValue( - const uint64_t& aCompositorAnimationsId, OMTAValue* aValue) override; + const uint64_t& aCompositorAnimationsId, OMTAValue* aValue); mozilla::ipc::IPCResult RecvGetTransform(const LayerHandle& aHandle, - MaybeTransform* aTransform) override; + MaybeTransform* aTransform); mozilla::ipc::IPCResult RecvSetAsyncScrollOffset( - const ScrollableLayerGuid::ViewID& aId, const float& aX, - const float& aY) override; + const ScrollableLayerGuid::ViewID& aId, const float& aX, const float& aY); mozilla::ipc::IPCResult RecvSetAsyncZoom( - const ScrollableLayerGuid::ViewID& aId, const float& aValue) override; - mozilla::ipc::IPCResult RecvFlushApzRepaints() override; - mozilla::ipc::IPCResult RecvGetAPZTestData(APZTestData* aOutData) override; + const ScrollableLayerGuid::ViewID& aId, const float& aValue); + mozilla::ipc::IPCResult RecvFlushApzRepaints(); + mozilla::ipc::IPCResult RecvGetAPZTestData(APZTestData* aOutData); mozilla::ipc::IPCResult RecvRequestProperty(const nsString& aProperty, - float* aValue) override; + float* aValue); mozilla::ipc::IPCResult RecvSetConfirmedTargetAPZC( - const uint64_t& aBlockId, - nsTArray&& aTargets) override; - mozilla::ipc::IPCResult RecvRecordPaintTimes( - const PaintTiming& aTiming) override; + const uint64_t& aBlockId, nsTArray&& aTargets); + mozilla::ipc::IPCResult RecvRecordPaintTimes(const PaintTiming& aTiming); mozilla::ipc::IPCResult RecvGetTextureFactoryIdentifier( - TextureFactoryIdentifier* aIdentifier) override; + TextureFactoryIdentifier* aIdentifier); bool SetLayerAttributes(const OpSetLayerAttributes& aOp); diff --git a/gfx/layers/ipc/UiCompositorControllerChild.h b/gfx/layers/ipc/UiCompositorControllerChild.h index af5587efc979..dff6ef463ad7 100644 --- a/gfx/layers/ipc/UiCompositorControllerChild.h +++ b/gfx/layers/ipc/UiCompositorControllerChild.h @@ -58,11 +58,11 @@ class UiCompositorControllerChild final void ProcessingError(Result aCode, const char* aReason) override; virtual void HandleFatalError(const char* aMsg) const override; mozilla::ipc::IPCResult RecvToolbarAnimatorMessageFromCompositor( - const int32_t& aMessage) override; - mozilla::ipc::IPCResult RecvRootFrameMetrics( - const ScreenPoint& aScrollOffset, const CSSToScreenScale& aZoom) override; + const int32_t& aMessage); + mozilla::ipc::IPCResult RecvRootFrameMetrics(const ScreenPoint& aScrollOffset, + const CSSToScreenScale& aZoom); mozilla::ipc::IPCResult RecvScreenPixels(ipc::Shmem&& aMem, - const ScreenIntSize& aSize) override; + const ScreenIntSize& aSize); private: explicit UiCompositorControllerChild(const uint64_t& aProcessToken); diff --git a/gfx/layers/ipc/UiCompositorControllerParent.h b/gfx/layers/ipc/UiCompositorControllerParent.h index e2173334574d..f48603a17a95 100644 --- a/gfx/layers/ipc/UiCompositorControllerParent.h +++ b/gfx/layers/ipc/UiCompositorControllerParent.h @@ -34,25 +34,24 @@ class UiCompositorControllerParent final Endpoint&& aEndpoint); // PUiCompositorControllerParent functions - mozilla::ipc::IPCResult RecvPause() override; - mozilla::ipc::IPCResult RecvResume() override; + mozilla::ipc::IPCResult RecvPause(); + mozilla::ipc::IPCResult RecvResume(); mozilla::ipc::IPCResult RecvResumeAndResize(const int32_t& aX, const int32_t& aY, const int32_t& aHeight, - const int32_t& aWidth) override; - mozilla::ipc::IPCResult RecvInvalidateAndRender() override; - mozilla::ipc::IPCResult RecvMaxToolbarHeight(const int32_t& aHeight) override; + const int32_t& aWidth); + mozilla::ipc::IPCResult RecvInvalidateAndRender(); + mozilla::ipc::IPCResult RecvMaxToolbarHeight(const int32_t& aHeight); mozilla::ipc::IPCResult RecvPinned(const bool& aPinned, - const int32_t& aReason) override; + const int32_t& aReason); mozilla::ipc::IPCResult RecvToolbarAnimatorMessageFromUI( - const int32_t& aMessage) override; - mozilla::ipc::IPCResult RecvDefaultClearColor( - const uint32_t& aColor) override; - mozilla::ipc::IPCResult RecvRequestScreenPixels() override; + const int32_t& aMessage); + mozilla::ipc::IPCResult RecvDefaultClearColor(const uint32_t& aColor); + mozilla::ipc::IPCResult RecvRequestScreenPixels(); mozilla::ipc::IPCResult RecvEnableLayerUpdateNotifications( - const bool& aEnable) override; + const bool& aEnable); mozilla::ipc::IPCResult RecvToolbarPixelsToCompositor( - Shmem&& aMem, const ScreenIntSize& aSize) override; + Shmem&& aMem, const ScreenIntSize& aSize); void ActorDestroy(ActorDestroyReason aWhy) override; void DeallocPUiCompositorControllerParent() override; diff --git a/gfx/layers/wr/WebRenderBridgeChild.h b/gfx/layers/wr/WebRenderBridgeChild.h index 3c4a360bfa13..d113589c14b5 100644 --- a/gfx/layers/wr/WebRenderBridgeChild.h +++ b/gfx/layers/wr/WebRenderBridgeChild.h @@ -214,9 +214,9 @@ class WebRenderBridgeChild final : public PWebRenderBridgeChild, mozilla::ipc::IPCResult RecvWrUpdated( const wr::IdNamespace& aNewIdNamespace, - const TextureFactoryIdentifier& textureFactoryIdentifier) override; + const TextureFactoryIdentifier& textureFactoryIdentifier); mozilla::ipc::IPCResult RecvWrReleasedImages( - nsTArray&& aPairs) override; + nsTArray&& aPairs); void AddIPDLReference() { MOZ_ASSERT(mIPCOpen == false); diff --git a/gfx/vr/ipc/VRChild.h b/gfx/vr/ipc/VRChild.h index cf9862f903c4..9b2c2c77f3ec 100644 --- a/gfx/vr/ipc/VRChild.h +++ b/gfx/vr/ipc/VRChild.h @@ -34,12 +34,12 @@ class VRChild final : public PVRChild, public gfxVarReceiver { protected: virtual void ActorDestroy(ActorDestroyReason aWhy) override; - virtual mozilla::ipc::IPCResult RecvOpenVRControllerActionPathToParent( - const nsCString& aPath) override; - virtual mozilla::ipc::IPCResult RecvOpenVRControllerManifestPathToParent( - const OpenVRControllerType& aType, const nsCString& aPath) override; - virtual mozilla::ipc::IPCResult RecvInitCrashReporter( - Shmem&& shmem, const NativeThreadId& aThreadId) override; + mozilla::ipc::IPCResult RecvOpenVRControllerActionPathToParent( + const nsCString& aPath); + mozilla::ipc::IPCResult RecvOpenVRControllerManifestPathToParent( + const OpenVRControllerType& aType, const nsCString& aPath); + mozilla::ipc::IPCResult RecvInitCrashReporter( + Shmem&& shmem, const NativeThreadId& aThreadId); private: VRProcessParent* mHost; diff --git a/gfx/vr/ipc/VRGPUParent.h b/gfx/vr/ipc/VRGPUParent.h index a96c72fa7419..74501b433284 100644 --- a/gfx/vr/ipc/VRGPUParent.h +++ b/gfx/vr/ipc/VRGPUParent.h @@ -25,8 +25,8 @@ class VRGPUParent final : public PVRGPUParent { protected: void Bind(Endpoint&& aEndpoint); - virtual mozilla::ipc::IPCResult RecvStartVRService() override; - virtual mozilla::ipc::IPCResult RecvStopVRService() override; + mozilla::ipc::IPCResult RecvStartVRService(); + mozilla::ipc::IPCResult RecvStopVRService(); private: explicit VRGPUParent(ProcessId aChildProcessId); diff --git a/gfx/vr/ipc/VRManagerChild.h b/gfx/vr/ipc/VRManagerChild.h index b7b50ca118db..e0185a31a0df 100644 --- a/gfx/vr/ipc/VRManagerChild.h +++ b/gfx/vr/ipc/VRManagerChild.h @@ -96,23 +96,22 @@ class VRManagerChild : public PVRManagerChild { const uint32_t& aGroup); bool DeallocPVRLayerChild(PVRLayerChild* actor); - virtual mozilla::ipc::IPCResult RecvUpdateDisplayInfo( - nsTArray&& aDisplayUpdates) override; + mozilla::ipc::IPCResult RecvUpdateDisplayInfo( + nsTArray&& aDisplayUpdates); - virtual mozilla::ipc::IPCResult RecvDispatchSubmitFrameResult( - const uint32_t& aDisplayID, - const VRSubmitFrameResultInfo& aResult) override; - virtual mozilla::ipc::IPCResult RecvGamepadUpdate( - const GamepadChangeEvent& aGamepadEvent) override; - virtual mozilla::ipc::IPCResult RecvReplyGamepadVibrateHaptic( - const uint32_t& aPromiseID) override; + mozilla::ipc::IPCResult RecvDispatchSubmitFrameResult( + const uint32_t& aDisplayID, const VRSubmitFrameResultInfo& aResult); + mozilla::ipc::IPCResult RecvGamepadUpdate( + const GamepadChangeEvent& aGamepadEvent); + mozilla::ipc::IPCResult RecvReplyGamepadVibrateHaptic( + const uint32_t& aPromiseID); - virtual mozilla::ipc::IPCResult RecvReplyCreateVRServiceTestDisplay( + mozilla::ipc::IPCResult RecvReplyCreateVRServiceTestDisplay( const nsCString& aID, const uint32_t& aPromiseID, - const uint32_t& aDeviceID) override; - virtual mozilla::ipc::IPCResult RecvReplyCreateVRServiceTestController( + const uint32_t& aDeviceID); + mozilla::ipc::IPCResult RecvReplyCreateVRServiceTestController( const nsCString& aID, const uint32_t& aPromiseID, - const uint32_t& aDeviceID) override; + const uint32_t& aDeviceID); bool IsSameProcess() const { return OtherPid() == base::GetCurrentProcId(); } private: diff --git a/gfx/vr/ipc/VRManagerParent.h b/gfx/vr/ipc/VRManagerParent.h index 8581621ed1ef..c1143f8ac580 100644 --- a/gfx/vr/ipc/VRManagerParent.h +++ b/gfx/vr/ipc/VRManagerParent.h @@ -55,44 +55,40 @@ class VRManagerParent final : public PVRManagerParent { virtual void ActorDestroy(ActorDestroyReason why) override; void OnChannelConnected(int32_t pid) override; - virtual mozilla::ipc::IPCResult RecvRefreshDisplays() override; - virtual mozilla::ipc::IPCResult RecvResetSensor( - const uint32_t& aDisplayID) override; - virtual mozilla::ipc::IPCResult RecvSetGroupMask( - const uint32_t& aDisplayID, const uint32_t& aGroupMask) override; - virtual mozilla::ipc::IPCResult RecvSetHaveEventListener( - const bool& aHaveEventListener) override; - virtual mozilla::ipc::IPCResult RecvControllerListenerAdded() override; - virtual mozilla::ipc::IPCResult RecvControllerListenerRemoved() override; - virtual mozilla::ipc::IPCResult RecvVibrateHaptic( - const uint32_t& aControllerIdx, const uint32_t& aHapticIndex, - const double& aIntensity, const double& aDuration, - const uint32_t& aPromiseID) override; - virtual mozilla::ipc::IPCResult RecvStopVibrateHaptic( - const uint32_t& aControllerIdx) override; - virtual mozilla::ipc::IPCResult RecvCreateVRTestSystem() override; - virtual mozilla::ipc::IPCResult RecvCreateVRServiceTestDisplay( - const nsCString& aID, const uint32_t& aPromiseID) override; - virtual mozilla::ipc::IPCResult RecvCreateVRServiceTestController( - const nsCString& aID, const uint32_t& aPromiseID) override; - virtual mozilla::ipc::IPCResult RecvSetDisplayInfoToMockDisplay( - const uint32_t& aDeviceID, const VRDisplayInfo& aDisplayInfo) override; - virtual mozilla::ipc::IPCResult RecvSetSensorStateToMockDisplay( - const uint32_t& aDeviceID, const VRHMDSensorState& aSensorState) override; - virtual mozilla::ipc::IPCResult RecvNewButtonEventToMockController( - const uint32_t& aDeviceID, const long& aButton, - const bool& aPressed) override; - virtual mozilla::ipc::IPCResult RecvNewAxisMoveEventToMockController( - const uint32_t& aDeviceID, const long& aAxis, - const double& aValue) override; - virtual mozilla::ipc::IPCResult RecvNewPoseMoveToMockController( - const uint32_t& aDeviceID, const GamepadPoseState& pose) override; - virtual mozilla::ipc::IPCResult RecvStartVRNavigation( - const uint32_t& aDeviceID) override; - virtual mozilla::ipc::IPCResult RecvStopVRNavigation( - const uint32_t& aDeviceID, const TimeDuration& aTimeout) override; - virtual mozilla::ipc::IPCResult RecvStartActivity() override; - virtual mozilla::ipc::IPCResult RecvStopActivity() override; + mozilla::ipc::IPCResult RecvRefreshDisplays(); + mozilla::ipc::IPCResult RecvResetSensor(const uint32_t& aDisplayID); + mozilla::ipc::IPCResult RecvSetGroupMask(const uint32_t& aDisplayID, + const uint32_t& aGroupMask); + mozilla::ipc::IPCResult RecvSetHaveEventListener( + const bool& aHaveEventListener); + mozilla::ipc::IPCResult RecvControllerListenerAdded(); + mozilla::ipc::IPCResult RecvControllerListenerRemoved(); + mozilla::ipc::IPCResult RecvVibrateHaptic(const uint32_t& aControllerIdx, + const uint32_t& aHapticIndex, + const double& aIntensity, + const double& aDuration, + const uint32_t& aPromiseID); + mozilla::ipc::IPCResult RecvStopVibrateHaptic(const uint32_t& aControllerIdx); + mozilla::ipc::IPCResult RecvCreateVRTestSystem(); + mozilla::ipc::IPCResult RecvCreateVRServiceTestDisplay( + const nsCString& aID, const uint32_t& aPromiseID); + mozilla::ipc::IPCResult RecvCreateVRServiceTestController( + const nsCString& aID, const uint32_t& aPromiseID); + mozilla::ipc::IPCResult RecvSetDisplayInfoToMockDisplay( + const uint32_t& aDeviceID, const VRDisplayInfo& aDisplayInfo); + mozilla::ipc::IPCResult RecvSetSensorStateToMockDisplay( + const uint32_t& aDeviceID, const VRHMDSensorState& aSensorState); + mozilla::ipc::IPCResult RecvNewButtonEventToMockController( + const uint32_t& aDeviceID, const long& aButton, const bool& aPressed); + mozilla::ipc::IPCResult RecvNewAxisMoveEventToMockController( + const uint32_t& aDeviceID, const long& aAxis, const double& aValue); + mozilla::ipc::IPCResult RecvNewPoseMoveToMockController( + const uint32_t& aDeviceID, const GamepadPoseState& pose); + mozilla::ipc::IPCResult RecvStartVRNavigation(const uint32_t& aDeviceID); + mozilla::ipc::IPCResult RecvStopVRNavigation(const uint32_t& aDeviceID, + const TimeDuration& aTimeout); + mozilla::ipc::IPCResult RecvStartActivity(); + mozilla::ipc::IPCResult RecvStopActivity(); private: void RegisterWithManager(); diff --git a/gfx/vr/ipc/VRParent.h b/gfx/vr/ipc/VRParent.h index c0d9c145193b..999b94a244b6 100644 --- a/gfx/vr/ipc/VRParent.h +++ b/gfx/vr/ipc/VRParent.h @@ -34,21 +34,18 @@ class VRParent final : public PVRParent { protected: ~VRParent() = default; - virtual mozilla::ipc::IPCResult RecvNewGPUVRManager( - Endpoint&& aEndpoint) override; - virtual mozilla::ipc::IPCResult RecvInit( - nsTArray&& prefs, nsTArray&& vars, - const DevicePrefs& devicePrefs) override; - virtual mozilla::ipc::IPCResult RecvNotifyVsync( - const TimeStamp& vsyncTimestamp) override; - virtual mozilla::ipc::IPCResult RecvUpdatePref( - const GfxPrefSetting& setting) override; - virtual mozilla::ipc::IPCResult RecvUpdateVar( - const GfxVarUpdate& pref) override; - virtual mozilla::ipc::IPCResult RecvOpenVRControllerActionPathToVR( - const nsCString& aPath) override; - virtual mozilla::ipc::IPCResult RecvOpenVRControllerManifestPathToVR( - const OpenVRControllerType& aType, const nsCString& aPath) override; + mozilla::ipc::IPCResult RecvNewGPUVRManager( + Endpoint&& aEndpoint); + mozilla::ipc::IPCResult RecvInit(nsTArray&& prefs, + nsTArray&& vars, + const DevicePrefs& devicePrefs); + mozilla::ipc::IPCResult RecvNotifyVsync(const TimeStamp& vsyncTimestamp); + mozilla::ipc::IPCResult RecvUpdatePref(const GfxPrefSetting& setting); + mozilla::ipc::IPCResult RecvUpdateVar(const GfxVarUpdate& pref); + mozilla::ipc::IPCResult RecvOpenVRControllerActionPathToVR( + const nsCString& aPath); + mozilla::ipc::IPCResult RecvOpenVRControllerManifestPathToVR( + const OpenVRControllerType& aType, const nsCString& aPath); private: nsCString mOpenVRControllerAction; diff --git a/ipc/glue/FileDescriptorSetChild.h b/ipc/glue/FileDescriptorSetChild.h index a55288dd9dc8..f01b654a8ec8 100644 --- a/ipc/glue/FileDescriptorSetChild.h +++ b/ipc/glue/FileDescriptorSetChild.h @@ -39,8 +39,8 @@ class FileDescriptorSetChild final : public PFileDescriptorSetChild { explicit FileDescriptorSetChild(const FileDescriptor& aFileDescriptor); ~FileDescriptorSetChild(); - virtual mozilla::ipc::IPCResult RecvAddFileDescriptor( - const FileDescriptor& aFileDescriptor) override; + mozilla::ipc::IPCResult RecvAddFileDescriptor( + const FileDescriptor& aFileDescriptor); }; } // namespace ipc diff --git a/ipc/glue/FileDescriptorSetParent.h b/ipc/glue/FileDescriptorSetParent.h index f57d3a39adf7..c3cf1745aa82 100644 --- a/ipc/glue/FileDescriptorSetParent.h +++ b/ipc/glue/FileDescriptorSetParent.h @@ -41,8 +41,8 @@ class FileDescriptorSetParent final : public PFileDescriptorSetParent { virtual void ActorDestroy(ActorDestroyReason aWhy) override; - virtual mozilla::ipc::IPCResult RecvAddFileDescriptor( - const FileDescriptor& aFileDescriptor) override; + mozilla::ipc::IPCResult RecvAddFileDescriptor( + const FileDescriptor& aFileDescriptor); }; } // namespace ipc diff --git a/ipc/ipdl/ipdl/lower.py b/ipc/ipdl/ipdl/lower.py index 9abe08edbd38..d5b39d0f3dee 100644 --- a/ipc/ipdl/ipdl/lower.py +++ b/ipc/ipdl/ipdl/lower.py @@ -3157,7 +3157,9 @@ class _GenerateProtocolActorCode(ipdl.ast.Visitor): defaultRecv = MethodDefn(recvDecl) defaultRecv.addstmt(StmtReturn(ExprCall(ExprVar('IPC_OK')))) self.cls.addstmt(defaultRecv) - else: + elif (self.protocol.name, self.side) in VIRTUAL_CALL_CLASSES: + # If we're using virtual calls, we need the methods to be + # declared on the base class. recvDecl.methodspec = MethodSpec.PURE self.cls.addstmt(StmtDecl(recvDecl)) diff --git a/ipc/testshell/TestShellChild.h b/ipc/testshell/TestShellChild.h index 33017625f7af..a2b89c29437d 100644 --- a/ipc/testshell/TestShellChild.h +++ b/ipc/testshell/TestShellChild.h @@ -21,7 +21,7 @@ class TestShellChild : public PTestShellChild { public: TestShellChild(); - mozilla::ipc::IPCResult RecvExecuteCommand(const nsString& aCommand) override; + mozilla::ipc::IPCResult RecvExecuteCommand(const nsString& aCommand); PTestShellCommandChild* AllocPTestShellCommandChild(const nsString& aCommand); diff --git a/layout/ipc/VsyncChild.h b/layout/ipc/VsyncChild.h index 15fcec54216d..23c915f3358f 100644 --- a/layout/ipc/VsyncChild.h +++ b/layout/ipc/VsyncChild.h @@ -53,9 +53,8 @@ class VsyncChild final : public PVsyncChild { VsyncChild(); virtual ~VsyncChild(); - virtual mozilla::ipc::IPCResult RecvNotify(const VsyncEvent& aVsync) override; - virtual mozilla::ipc::IPCResult RecvVsyncRate( - const float& aVsyncRate) override; + mozilla::ipc::IPCResult RecvNotify(const VsyncEvent& aVsync); + mozilla::ipc::IPCResult RecvVsyncRate(const float& aVsyncRate); virtual void ActorDestroy(ActorDestroyReason aActorDestroyReason) override; bool mObservingVsync; diff --git a/layout/ipc/VsyncParent.h b/layout/ipc/VsyncParent.h index de0cc3e9145f..2d0885d81a7a 100644 --- a/layout/ipc/VsyncParent.h +++ b/layout/ipc/VsyncParent.h @@ -36,10 +36,10 @@ class VsyncParent final : public PVsyncParent, public VsyncObserver { virtual ~VsyncParent(); virtual bool NotifyVsync(const VsyncEvent& aVsync) override; - virtual mozilla::ipc::IPCResult RecvRequestVsyncRate() override; + mozilla::ipc::IPCResult RecvRequestVsyncRate(); - virtual mozilla::ipc::IPCResult RecvObserve() override; - virtual mozilla::ipc::IPCResult RecvUnobserve() override; + mozilla::ipc::IPCResult RecvObserve(); + mozilla::ipc::IPCResult RecvUnobserve(); virtual void ActorDestroy(ActorDestroyReason aActorDestroyReason) override; void DispatchVsyncEvent(const VsyncEvent& aVsync); diff --git a/layout/printing/ipc/RemotePrintJobChild.h b/layout/printing/ipc/RemotePrintJobChild.h index 75639237071c..a65456c3b2b2 100644 --- a/layout/printing/ipc/RemotePrintJobChild.h +++ b/layout/printing/ipc/RemotePrintJobChild.h @@ -33,13 +33,13 @@ class RemotePrintJobChild final : public PRemotePrintJobChild, const int32_t& aStartPage, const int32_t& aEndPage); mozilla::ipc::IPCResult RecvPrintInitializationResult( - const nsresult& aRv, const FileDescriptor& aFd) final; + const nsresult& aRv, const FileDescriptor& aFd); void ProcessPage(); - mozilla::ipc::IPCResult RecvPageProcessed(const FileDescriptor& aFd) final; + mozilla::ipc::IPCResult RecvPageProcessed(const FileDescriptor& aFd); - mozilla::ipc::IPCResult RecvAbortPrint(const nsresult& aRv) final; + mozilla::ipc::IPCResult RecvAbortPrint(const nsresult& aRv); void SetPagePrintTimer(nsPagePrintTimer* aPagePrintTimer); diff --git a/layout/printing/ipc/RemotePrintJobParent.h b/layout/printing/ipc/RemotePrintJobParent.h index 08e847d93b83..ea264a33aa17 100644 --- a/layout/printing/ipc/RemotePrintJobParent.h +++ b/layout/printing/ipc/RemotePrintJobParent.h @@ -34,22 +34,23 @@ class RemotePrintJobParent final : public PRemotePrintJobParent { mozilla::ipc::IPCResult RecvInitializePrint(const nsString& aDocumentTitle, const nsString& aPrintToFile, const int32_t& aStartPage, - const int32_t& aEndPage) final; + const int32_t& aEndPage); - mozilla::ipc::IPCResult RecvProcessPage() final; + mozilla::ipc::IPCResult RecvProcessPage(); - mozilla::ipc::IPCResult RecvFinalizePrint() final; + mozilla::ipc::IPCResult RecvFinalizePrint(); - mozilla::ipc::IPCResult RecvAbortPrint(const nsresult& aRv) final; + mozilla::ipc::IPCResult RecvAbortPrint(const nsresult& aRv); mozilla::ipc::IPCResult RecvStateChange(const long& aStateFlags, - const nsresult& aStatus) final; + const nsresult& aStatus); - mozilla::ipc::IPCResult RecvProgressChange( - const long& aCurSelfProgress, const long& aMaxSelfProgress, - const long& aCurTotalProgress, const long& aMaxTotalProgress) final; + mozilla::ipc::IPCResult RecvProgressChange(const long& aCurSelfProgress, + const long& aMaxSelfProgress, + const long& aCurTotalProgress, + const long& aMaxTotalProgress); - mozilla::ipc::IPCResult RecvStatusChange(const nsresult& aStatus) final; + mozilla::ipc::IPCResult RecvStatusChange(const nsresult& aStatus); /** * Register a progress listener to receive print progress updates. diff --git a/netwerk/cookie/CookieServiceChild.h b/netwerk/cookie/CookieServiceChild.h index da3e53f648bd..98a782919f54 100644 --- a/netwerk/cookie/CookieServiceChild.h +++ b/netwerk/cookie/CookieServiceChild.h @@ -86,21 +86,20 @@ class CookieServiceChild : public PCookieServiceChild, bool RequireThirdPartyCheck(); - virtual mozilla::ipc::IPCResult RecvTrackCookiesLoad( + mozilla::ipc::IPCResult RecvTrackCookiesLoad( + nsTArray &&aCookiesList, const OriginAttributes &aAttrs); + + mozilla::ipc::IPCResult RecvRemoveAll(); + + mozilla::ipc::IPCResult RecvRemoveBatchDeletedCookies( nsTArray &&aCookiesList, - const OriginAttributes &aAttrs) override; + nsTArray &&aAttrsList); - virtual mozilla::ipc::IPCResult RecvRemoveAll() override; + mozilla::ipc::IPCResult RecvRemoveCookie(const CookieStruct &aCookie, + const OriginAttributes &aAttrs); - virtual mozilla::ipc::IPCResult RecvRemoveBatchDeletedCookies( - nsTArray &&aCookiesList, - nsTArray &&aAttrsList) override; - - virtual mozilla::ipc::IPCResult RecvRemoveCookie( - const CookieStruct &aCookie, const OriginAttributes &aAttrs) override; - - virtual mozilla::ipc::IPCResult RecvAddCookie( - const CookieStruct &aCookie, const OriginAttributes &aAttrs) override; + mozilla::ipc::IPCResult RecvAddCookie(const CookieStruct &aCookie, + const OriginAttributes &aAttrs); virtual void ActorDestroy(ActorDestroyReason aWhy) override; diff --git a/netwerk/cookie/CookieServiceParent.h b/netwerk/cookie/CookieServiceParent.h index d907703253b1..cbf2693b8e9e 100644 --- a/netwerk/cookie/CookieServiceParent.h +++ b/netwerk/cookie/CookieServiceParent.h @@ -44,18 +44,18 @@ class CookieServiceParent : public PCookieServiceParent { protected: virtual void ActorDestroy(ActorDestroyReason aWhy) override; - virtual mozilla::ipc::IPCResult RecvSetCookieString( + mozilla::ipc::IPCResult RecvSetCookieString( const URIParams &aHost, const OptionalURIParams &aChannelURI, const bool &aIsForeign, const bool &aIsTrackingResource, const bool &aFirstPartyStorageAccessGranted, const nsCString &aCookieString, const nsCString &aServerTime, - const OriginAttributes &aAttrs, const bool &aFromHttp) override; - virtual mozilla::ipc::IPCResult RecvPrepareCookieList( + const OriginAttributes &aAttrs, const bool &aFromHttp); + mozilla::ipc::IPCResult RecvPrepareCookieList( const URIParams &aHost, const bool &aIsForeign, const bool &aIsTackingResource, const bool &aFirstPartyStorageAccessGranted, const bool &aIsSafeTopLevelNav, const bool &aIsSameSiteForeign, - const OriginAttributes &aAttrs) override; + const OriginAttributes &aAttrs); void SerialializeCookieList(const nsTArray &aFoundCookieList, nsTArray &aCookiesList, diff --git a/netwerk/dns/DNSRequestChild.h b/netwerk/dns/DNSRequestChild.h index 574e4686dfc6..aa6b2c22e084 100644 --- a/netwerk/dns/DNSRequestChild.h +++ b/netwerk/dns/DNSRequestChild.h @@ -42,8 +42,7 @@ class DNSRequestChild final : public PDNSRequestChild, public nsICancelable { friend class ChildDNSService; virtual ~DNSRequestChild() {} - virtual mozilla::ipc::IPCResult RecvLookupCompleted( - const DNSRequestResponse& reply) override; + mozilla::ipc::IPCResult RecvLookupCompleted(const DNSRequestResponse& reply); virtual void ActorDestroy(ActorDestroyReason why) override; nsCOMPtr mListener; diff --git a/netwerk/dns/DNSRequestParent.h b/netwerk/dns/DNSRequestParent.h index c775dae591a2..6c19dbc2ebdb 100644 --- a/netwerk/dns/DNSRequestParent.h +++ b/netwerk/dns/DNSRequestParent.h @@ -29,7 +29,7 @@ class DNSRequestParent : public PDNSRequestParent, public nsIDNSListener { mozilla::ipc::IPCResult RecvCancelDNSRequest( const nsCString& hostName, const uint16_t& type, const OriginAttributes& originAttributes, const uint32_t& flags, - const nsresult& reason) override; + const nsresult& reason); mozilla::ipc::IPCResult Recv__delete__() override; protected: diff --git a/netwerk/ipc/NeckoChild.h b/netwerk/ipc/NeckoChild.h index 20edf103687d..8d2d5a9ef47b 100644 --- a/netwerk/ipc/NeckoChild.h +++ b/netwerk/ipc/NeckoChild.h @@ -79,24 +79,21 @@ class NeckoChild : public PNeckoChild { bool DeallocPChannelDiverterChild(PChannelDiverterChild* actor); PTransportProviderChild* AllocPTransportProviderChild(); bool DeallocPTransportProviderChild(PTransportProviderChild* aActor); - virtual mozilla::ipc::IPCResult RecvAsyncAuthPromptForNestedFrame( + mozilla::ipc::IPCResult RecvAsyncAuthPromptForNestedFrame( const TabId& aNestedFrameId, const nsCString& aUri, - const nsString& aRealm, const uint64_t& aCallbackId) override; + const nsString& aRealm, const uint64_t& aCallbackId); PWebSocketEventListenerChild* AllocPWebSocketEventListenerChild( const uint64_t& aInnerWindowID); bool DeallocPWebSocketEventListenerChild(PWebSocketEventListenerChild*); /* Predictor Messsages */ - virtual mozilla::ipc::IPCResult RecvPredOnPredictPrefetch( - const URIParams& aURI, const uint32_t& aHttpStatus) override; - virtual mozilla::ipc::IPCResult RecvPredOnPredictPreconnect( - const URIParams& aURI) override; - virtual mozilla::ipc::IPCResult RecvPredOnPredictDNS( - const URIParams& aURI) override; + mozilla::ipc::IPCResult RecvPredOnPredictPrefetch( + const URIParams& aURI, const uint32_t& aHttpStatus); + mozilla::ipc::IPCResult RecvPredOnPredictPreconnect(const URIParams& aURI); + mozilla::ipc::IPCResult RecvPredOnPredictDNS(const URIParams& aURI); - virtual mozilla::ipc::IPCResult RecvSpeculativeConnectRequest() override; - virtual mozilla::ipc::IPCResult RecvNetworkChangeNotification( - nsCString const& type) override; + mozilla::ipc::IPCResult RecvSpeculativeConnectRequest(); + mozilla::ipc::IPCResult RecvNetworkChangeNotification(nsCString const& type); PTrackingDummyChannelChild* AllocPTrackingDummyChannelChild( nsIURI* aURI, nsIURI* aTopWindowURI, const nsresult& aTopWindowURIResult, diff --git a/netwerk/ipc/NeckoParent.h b/netwerk/ipc/NeckoParent.h index 8edcb7e8cc5a..a78115011589 100644 --- a/netwerk/ipc/NeckoParent.h +++ b/netwerk/ipc/NeckoParent.h @@ -152,17 +152,16 @@ class NeckoParent : public PNeckoParent { const OriginAttributes& aOriginAttributes, const uint32_t& flags) override; bool DeallocPDNSRequestParent(PDNSRequestParent*); - virtual mozilla::ipc::IPCResult RecvSpeculativeConnect( - const URIParams& aURI, const Principal& aPrincipal, - const bool& aAnonymous) override; - virtual mozilla::ipc::IPCResult RecvHTMLDNSPrefetch( + mozilla::ipc::IPCResult RecvSpeculativeConnect(const URIParams& aURI, + const Principal& aPrincipal, + const bool& aAnonymous); + mozilla::ipc::IPCResult RecvHTMLDNSPrefetch( const nsString& hostname, const bool& isHttps, - const OriginAttributes& aOriginAttributes, - const uint16_t& flags) override; - virtual mozilla::ipc::IPCResult RecvCancelHTMLDNSPrefetch( + const OriginAttributes& aOriginAttributes, const uint16_t& flags); + mozilla::ipc::IPCResult RecvCancelHTMLDNSPrefetch( const nsString& hostname, const bool& isHttps, const OriginAttributes& aOriginAttributes, const uint16_t& flags, - const nsresult& reason) override; + const nsresult& reason); PWebSocketEventListenerParent* AllocPWebSocketEventListenerParent( const uint64_t& aInnerWindowID); bool DeallocPWebSocketEventListenerParent(PWebSocketEventListenerParent*); @@ -194,40 +193,38 @@ class NeckoParent : public PNeckoParent { PTransportProviderParent* AllocPTransportProviderParent(); bool DeallocPTransportProviderParent(PTransportProviderParent* aActor); - virtual mozilla::ipc::IPCResult RecvOnAuthAvailable( - const uint64_t& aCallbackId, const nsString& aUser, - const nsString& aPassword, const nsString& aDomain) override; - virtual mozilla::ipc::IPCResult RecvOnAuthCancelled( - const uint64_t& aCallbackId, const bool& aUserCancel) override; + mozilla::ipc::IPCResult RecvOnAuthAvailable(const uint64_t& aCallbackId, + const nsString& aUser, + const nsString& aPassword, + const nsString& aDomain); + mozilla::ipc::IPCResult RecvOnAuthCancelled(const uint64_t& aCallbackId, + const bool& aUserCancel); /* Predictor Messages */ - virtual mozilla::ipc::IPCResult RecvPredPredict( + mozilla::ipc::IPCResult RecvPredPredict( const ipc::OptionalURIParams& aTargetURI, const ipc::OptionalURIParams& aSourceURI, const PredictorPredictReason& aReason, - const OriginAttributes& aOriginAttributes, - const bool& hasVerifier) override; + const OriginAttributes& aOriginAttributes, const bool& hasVerifier); - virtual mozilla::ipc::IPCResult RecvPredLearn( + mozilla::ipc::IPCResult RecvPredLearn( const ipc::URIParams& aTargetURI, const ipc::OptionalURIParams& aSourceURI, const PredictorPredictReason& aReason, - const OriginAttributes& aOriginAttributes) override; - virtual mozilla::ipc::IPCResult RecvPredReset() override; + const OriginAttributes& aOriginAttributes); + mozilla::ipc::IPCResult RecvPredReset(); - virtual mozilla::ipc::IPCResult RecvRequestContextLoadBegin( - const uint64_t& rcid) override; - virtual mozilla::ipc::IPCResult RecvRequestContextAfterDOMContentLoaded( - const uint64_t& rcid) override; - virtual mozilla::ipc::IPCResult RecvRemoveRequestContext( - const uint64_t& rcid) override; + mozilla::ipc::IPCResult RecvRequestContextLoadBegin(const uint64_t& rcid); + mozilla::ipc::IPCResult RecvRequestContextAfterDOMContentLoaded( + const uint64_t& rcid); + mozilla::ipc::IPCResult RecvRemoveRequestContext(const uint64_t& rcid); /* WebExtensions */ - virtual mozilla::ipc::IPCResult RecvGetExtensionStream( - const URIParams& aURI, GetExtensionStreamResolver&& aResolve) override; + mozilla::ipc::IPCResult RecvGetExtensionStream( + const URIParams& aURI, GetExtensionStreamResolver&& aResolve); - virtual mozilla::ipc::IPCResult RecvGetExtensionFD( - const URIParams& aURI, GetExtensionFDResolver&& aResolve) override; + mozilla::ipc::IPCResult RecvGetExtensionFD(const URIParams& aURI, + GetExtensionFDResolver&& aResolve); PTrackingDummyChannelParent* AllocPTrackingDummyChannelParent( nsIURI* aURI, nsIURI* aTopWindowURI, const nsresult& aTopWindowURIResult, @@ -240,8 +237,8 @@ class NeckoParent : public PNeckoParent { const nsresult& aTopWindowURIResult, const OptionalLoadInfoArgs& aLoadInfo) override; - virtual mozilla::ipc::IPCResult RecvInitSocketProcessBridge( - InitSocketProcessBridgeResolver&& aResolver) override; + mozilla::ipc::IPCResult RecvInitSocketProcessBridge( + InitSocketProcessBridgeResolver&& aResolver); }; } // namespace net diff --git a/netwerk/ipc/SocketProcessBridgeChild.h b/netwerk/ipc/SocketProcessBridgeChild.h index 806e76bf2f5e..f899776d306a 100644 --- a/netwerk/ipc/SocketProcessBridgeChild.h +++ b/netwerk/ipc/SocketProcessBridgeChild.h @@ -27,7 +27,7 @@ class SocketProcessBridgeChild final : public PSocketProcessBridgeChild, static void EnsureSocketProcessBridge(std::function&& aOnSuccess, std::function&& aOnFailure); - mozilla::ipc::IPCResult RecvTest() override; + mozilla::ipc::IPCResult RecvTest(); void ActorDestroy(ActorDestroyReason aWhy) override; void DeferredDestroy(); bool IsShuttingDown() const { return mShuttingDown; }; diff --git a/netwerk/ipc/SocketProcessBridgeParent.h b/netwerk/ipc/SocketProcessBridgeParent.h index 72f5a3b7e428..4ad87058c16d 100644 --- a/netwerk/ipc/SocketProcessBridgeParent.h +++ b/netwerk/ipc/SocketProcessBridgeParent.h @@ -22,9 +22,9 @@ class SocketProcessBridgeParent final : public PSocketProcessBridgeParent { explicit SocketProcessBridgeParent( ProcessId aId, Endpoint&& aEndpoint); - mozilla::ipc::IPCResult RecvTest() override; + mozilla::ipc::IPCResult RecvTest(); mozilla::ipc::IPCResult RecvInitBackground( - Endpoint&& aEndpoint) override; + Endpoint&& aEndpoint); void ActorDestroy(ActorDestroyReason aWhy) override; void DeferredDestroy(); diff --git a/netwerk/ipc/SocketProcessChild.h b/netwerk/ipc/SocketProcessChild.h index da71dab830bd..0e8b88143f41 100644 --- a/netwerk/ipc/SocketProcessChild.h +++ b/netwerk/ipc/SocketProcessChild.h @@ -32,17 +32,17 @@ class SocketProcessChild final : public PSocketProcessChild { void ActorDestroy(ActorDestroyReason aWhy) override; - mozilla::ipc::IPCResult RecvPreferenceUpdate(const Pref& aPref) override; + mozilla::ipc::IPCResult RecvPreferenceUpdate(const Pref& aPref); mozilla::ipc::IPCResult RecvRequestMemoryReport( const uint32_t& generation, const bool& anonymize, - const bool& minimizeMemoryUsage, const MaybeFileDesc& DMDFile) override; - mozilla::ipc::IPCResult RecvSetOffline(const bool& aOffline) override; + const bool& minimizeMemoryUsage, const MaybeFileDesc& DMDFile); + mozilla::ipc::IPCResult RecvSetOffline(const bool& aOffline); mozilla::ipc::IPCResult RecvInitSocketProcessBridgeParent( const ProcessId& aContentProcessId, - Endpoint&& aEndpoint) override; + Endpoint&& aEndpoint); mozilla::ipc::IPCResult RecvInitProfiler( - Endpoint&& aEndpoint) override; - mozilla::ipc::IPCResult RecvSocketProcessTelemetryPing() override; + Endpoint&& aEndpoint); + mozilla::ipc::IPCResult RecvSocketProcessTelemetryPing(); void CleanUp(); void DestroySocketProcessBridgeParent(ProcessId aId); diff --git a/netwerk/ipc/SocketProcessParent.h b/netwerk/ipc/SocketProcessParent.h index e3cfaf8e967a..590d6d523174 100644 --- a/netwerk/ipc/SocketProcessParent.h +++ b/netwerk/ipc/SocketProcessParent.h @@ -36,23 +36,21 @@ class SocketProcessParent final : public PSocketProcessParent { static SocketProcessParent* GetSingleton(); mozilla::ipc::IPCResult RecvInitCrashReporter( - Shmem&& aShmem, const NativeThreadId& aThreadId) override; - mozilla::ipc::IPCResult RecvAddMemoryReport( - const MemoryReport& aReport) override; - mozilla::ipc::IPCResult RecvFinishMemoryReport( - const uint32_t& aGeneration) override; + Shmem&& aShmem, const NativeThreadId& aThreadId); + mozilla::ipc::IPCResult RecvAddMemoryReport(const MemoryReport& aReport); + mozilla::ipc::IPCResult RecvFinishMemoryReport(const uint32_t& aGeneration); mozilla::ipc::IPCResult RecvAccumulateChildHistograms( - InfallibleTArray&& aAccumulations) override; + InfallibleTArray&& aAccumulations); mozilla::ipc::IPCResult RecvAccumulateChildKeyedHistograms( - InfallibleTArray&& aAccumulations) override; + InfallibleTArray&& aAccumulations); mozilla::ipc::IPCResult RecvUpdateChildScalars( - InfallibleTArray&& aScalarActions) override; + InfallibleTArray&& aScalarActions); mozilla::ipc::IPCResult RecvUpdateChildKeyedScalars( - InfallibleTArray&& aScalarActions) override; + InfallibleTArray&& aScalarActions); mozilla::ipc::IPCResult RecvRecordChildEvents( - nsTArray&& events) override; + nsTArray&& events); mozilla::ipc::IPCResult RecvRecordDiscardedData( - const DiscardedData& aDiscardedData) override; + const DiscardedData& aDiscardedData); void ActorDestroy(ActorDestroyReason aWhy) override; bool SendRequestMemoryReport(const uint32_t& aGeneration, diff --git a/netwerk/protocol/http/AltDataOutputStreamChild.h b/netwerk/protocol/http/AltDataOutputStreamChild.h index a784a76b26d5..09cef420735f 100644 --- a/netwerk/protocol/http/AltDataOutputStreamChild.h +++ b/netwerk/protocol/http/AltDataOutputStreamChild.h @@ -24,8 +24,8 @@ class AltDataOutputStreamChild : public PAltDataOutputStreamChild, void AddIPDLReference(); void ReleaseIPDLReference(); // Saves an error code which will be reported to the writer on the next call. - virtual mozilla::ipc::IPCResult RecvError(const nsresult& err) override; - virtual mozilla::ipc::IPCResult RecvDeleteSelf() override; + virtual mozilla::ipc::IPCResult RecvError(const nsresult& err); + virtual mozilla::ipc::IPCResult RecvDeleteSelf(); private: virtual ~AltDataOutputStreamChild() = default; diff --git a/netwerk/protocol/http/AltDataOutputStreamParent.h b/netwerk/protocol/http/AltDataOutputStreamParent.h index d26c818ee58c..b58288336c33 100644 --- a/netwerk/protocol/http/AltDataOutputStreamParent.h +++ b/netwerk/protocol/http/AltDataOutputStreamParent.h @@ -27,15 +27,15 @@ class AltDataOutputStreamParent : public PAltDataOutputStreamParent, // Called when data is received from the content process. // We proceed to write that data to the output stream. - virtual mozilla::ipc::IPCResult RecvWriteData(const nsCString& data) override; + mozilla::ipc::IPCResult RecvWriteData(const nsCString& data); // Called when AltDataOutputStreamChild::Close() is // Closes and nulls the output stream. - virtual mozilla::ipc::IPCResult RecvClose() override; + mozilla::ipc::IPCResult RecvClose(); virtual void ActorDestroy(ActorDestroyReason aWhy) override; // Sets an error that will be reported to the content process. void SetError(nsresult status) { mStatus = status; } - virtual mozilla::ipc::IPCResult RecvDeleteSelf() override; + mozilla::ipc::IPCResult RecvDeleteSelf(); private: virtual ~AltDataOutputStreamParent(); diff --git a/netwerk/protocol/http/HttpBackgroundChannelChild.h b/netwerk/protocol/http/HttpBackgroundChannelChild.h index 562565fb703d..f103a2945791 100644 --- a/netwerk/protocol/http/HttpBackgroundChannelChild.h +++ b/netwerk/protocol/http/HttpBackgroundChannelChild.h @@ -46,37 +46,37 @@ class HttpBackgroundChannelChild final : public PHttpBackgroundChannelChild { const nsresult& aTransportStatus, const uint64_t& aOffset, const uint32_t& aCount, - const nsCString& aData) override; + const nsCString& aData); - IPCResult RecvOnStopRequest( - const nsresult& aChannelStatus, const ResourceTimingStruct& aTiming, - const TimeStamp& aLastActiveTabOptHit, - const nsHttpHeaderArray& aResponseTrailers) override; + IPCResult RecvOnStopRequest(const nsresult& aChannelStatus, + const ResourceTimingStruct& aTiming, + const TimeStamp& aLastActiveTabOptHit, + const nsHttpHeaderArray& aResponseTrailers); IPCResult RecvOnProgress(const int64_t& aProgress, - const int64_t& aProgressMax) override; + const int64_t& aProgressMax); - IPCResult RecvOnStatus(const nsresult& aStatus) override; + IPCResult RecvOnStatus(const nsresult& aStatus); - IPCResult RecvFlushedForDiversion() override; + IPCResult RecvFlushedForDiversion(); - IPCResult RecvDivertMessages() override; + IPCResult RecvDivertMessages(); - IPCResult RecvOnStartRequestSent() override; + IPCResult RecvOnStartRequestSent(); IPCResult RecvNotifyChannelClassifierProtectionDisabled( - const uint32_t& aAcceptedReason) override; + const uint32_t& aAcceptedReason); - IPCResult RecvNotifyCookieAllowed() override; + IPCResult RecvNotifyCookieAllowed(); - IPCResult RecvNotifyCookieBlocked(const uint32_t& aRejectedReason) override; + IPCResult RecvNotifyCookieBlocked(const uint32_t& aRejectedReason); - IPCResult RecvNotifyTrackingResource(const bool& aIsThirdParty) override; + IPCResult RecvNotifyTrackingResource(const bool& aIsThirdParty); IPCResult RecvNotifyFlashPluginStateChanged( - const nsIHttpChannel::FlashPluginState& aState) override; + const nsIHttpChannel::FlashPluginState& aState); - IPCResult RecvSetClassifierMatchedInfo(const ClassifierInfo& info) override; + IPCResult RecvSetClassifierMatchedInfo(const ClassifierInfo& info); void ActorDestroy(ActorDestroyReason aWhy) override; diff --git a/netwerk/protocol/websocket/WebSocketChannelChild.h b/netwerk/protocol/websocket/WebSocketChannelChild.h index 2bbe0b94af85..aa472990268c 100644 --- a/netwerk/protocol/websocket/WebSocketChannelChild.h +++ b/netwerk/protocol/websocket/WebSocketChannelChild.h @@ -54,15 +54,13 @@ class WebSocketChannelChild final : public BaseWebSocketChannel, mozilla::ipc::IPCResult RecvOnStart(const nsCString& aProtocol, const nsCString& aExtensions, const nsString& aEffectiveURL, - const bool& aSecure) override; - mozilla::ipc::IPCResult RecvOnStop(const nsresult& aStatusCode) override; - mozilla::ipc::IPCResult RecvOnMessageAvailable( - const nsCString& aMsg) override; - mozilla::ipc::IPCResult RecvOnBinaryMessageAvailable( - const nsCString& aMsg) override; - mozilla::ipc::IPCResult RecvOnAcknowledge(const uint32_t& aSize) override; + const bool& aSecure); + mozilla::ipc::IPCResult RecvOnStop(const nsresult& aStatusCode); + mozilla::ipc::IPCResult RecvOnMessageAvailable(const nsCString& aMsg); + mozilla::ipc::IPCResult RecvOnBinaryMessageAvailable(const nsCString& aMsg); + mozilla::ipc::IPCResult RecvOnAcknowledge(const uint32_t& aSize); mozilla::ipc::IPCResult RecvOnServerClose(const uint16_t& aCode, - const nsCString& aReason) override; + const nsCString& aReason); void OnStart(const nsCString& aProtocol, const nsCString& aExtensions, const nsString& aEffectiveURL, const bool& aSecure); diff --git a/netwerk/protocol/websocket/WebSocketChannelParent.h b/netwerk/protocol/websocket/WebSocketChannelParent.h index db59f32cfc9c..d755f4ef5cfc 100644 --- a/netwerk/protocol/websocket/WebSocketChannelParent.h +++ b/netwerk/protocol/websocket/WebSocketChannelParent.h @@ -46,14 +46,14 @@ class WebSocketChannelParent : public PWebSocketParent, const bool& aClientSetPingTimeout, const OptionalLoadInfoArgs& aLoadInfoArgs, const OptionalTransportProvider& aTransportProvider, - const nsCString& aNegotiatedExtensions) override; + const nsCString& aNegotiatedExtensions); mozilla::ipc::IPCResult RecvClose(const uint16_t& code, - const nsCString& reason) override; - mozilla::ipc::IPCResult RecvSendMsg(const nsCString& aMsg) override; - mozilla::ipc::IPCResult RecvSendBinaryMsg(const nsCString& aMsg) override; - mozilla::ipc::IPCResult RecvSendBinaryStream( - const IPCStream& aStream, const uint32_t& aLength) override; - mozilla::ipc::IPCResult RecvDeleteSelf() override; + const nsCString& reason); + mozilla::ipc::IPCResult RecvSendMsg(const nsCString& aMsg); + mozilla::ipc::IPCResult RecvSendBinaryMsg(const nsCString& aMsg); + mozilla::ipc::IPCResult RecvSendBinaryStream(const IPCStream& aStream, + const uint32_t& aLength); + mozilla::ipc::IPCResult RecvDeleteSelf(); void ActorDestroy(ActorDestroyReason why) override; diff --git a/netwerk/protocol/websocket/WebSocketEventListenerChild.h b/netwerk/protocol/websocket/WebSocketEventListenerChild.h index a78ec2a0a434..300a769763ee 100644 --- a/netwerk/protocol/websocket/WebSocketEventListenerChild.h +++ b/netwerk/protocol/websocket/WebSocketEventListenerChild.h @@ -25,27 +25,25 @@ class WebSocketEventListenerChild final : public PWebSocketEventListenerChild, mozilla::ipc::IPCResult RecvWebSocketCreated( const uint32_t& aWebSocketSerialID, const nsString& aURI, - const nsCString& aProtocols) override; + const nsCString& aProtocols); mozilla::ipc::IPCResult RecvWebSocketOpened( const uint32_t& aWebSocketSerialID, const nsString& aEffectiveURI, - const nsCString& aProtocols, const nsCString& aExtensions) override; + const nsCString& aProtocols, const nsCString& aExtensions); mozilla::ipc::IPCResult RecvWebSocketMessageAvailable( const uint32_t& aWebSocketSerialID, const nsCString& aData, - const uint16_t& aMessageType) override; + const uint16_t& aMessageType); mozilla::ipc::IPCResult RecvWebSocketClosed( const uint32_t& aWebSocketSerialID, const bool& aWasClean, - const uint16_t& aCode, const nsString& aReason) override; + const uint16_t& aCode, const nsString& aReason); mozilla::ipc::IPCResult RecvFrameReceived( - const uint32_t& aWebSocketSerialID, - const WebSocketFrameData& aFrameData) override; + const uint32_t& aWebSocketSerialID, const WebSocketFrameData& aFrameData); - mozilla::ipc::IPCResult RecvFrameSent( - const uint32_t& aWebSocketSerialID, - const WebSocketFrameData& aFrameData) override; + mozilla::ipc::IPCResult RecvFrameSent(const uint32_t& aWebSocketSerialID, + const WebSocketFrameData& aFrameData); void Close(); diff --git a/netwerk/protocol/websocket/WebSocketEventListenerParent.h b/netwerk/protocol/websocket/WebSocketEventListenerParent.h index e66dc7cc05d7..eb5e02679bcb 100644 --- a/netwerk/protocol/websocket/WebSocketEventListenerParent.h +++ b/netwerk/protocol/websocket/WebSocketEventListenerParent.h @@ -28,7 +28,7 @@ class WebSocketEventListenerParent final : public PWebSocketEventListenerParent, private: ~WebSocketEventListenerParent(); - virtual mozilla::ipc::IPCResult RecvClose() override; + mozilla::ipc::IPCResult RecvClose(); virtual void ActorDestroy(ActorDestroyReason aWhy) override; diff --git a/netwerk/protocol/wyciwyg/WyciwygChannelParent.h b/netwerk/protocol/wyciwyg/WyciwygChannelParent.h index 2bb7effc293b..6848f629d029 100644 --- a/netwerk/protocol/wyciwyg/WyciwygChannelParent.h +++ b/netwerk/protocol/wyciwyg/WyciwygChannelParent.h @@ -36,29 +36,25 @@ class WyciwygChannelParent : public PWyciwygChannelParent, protected: virtual ~WyciwygChannelParent() = default; - virtual mozilla::ipc::IPCResult RecvInit( + mozilla::ipc::IPCResult RecvInit( const URIParams& uri, const ipc::PrincipalInfo& aRequestingPrincipalInfo, const ipc::PrincipalInfo& aTriggeringPrincipalInfo, const ipc::PrincipalInfo& aPrincipalToInheritInfo, - const uint32_t& aSecurityFlags, - const uint32_t& aContentPolicyType) override; - virtual mozilla::ipc::IPCResult RecvAsyncOpen( + const uint32_t& aSecurityFlags, const uint32_t& aContentPolicyType); + mozilla::ipc::IPCResult RecvAsyncOpen( const URIParams& original, const uint32_t& loadFlags, const IPC::SerializedLoadContext& loadContext, - const PBrowserOrId& parent) override; - virtual mozilla::ipc::IPCResult RecvWriteToCacheEntry( - const nsDependentSubstring& data) override; - virtual mozilla::ipc::IPCResult RecvCloseCacheEntry( - const nsresult& reason) override; - virtual mozilla::ipc::IPCResult RecvSetCharsetAndSource( - const int32_t& source, const nsCString& charset) override; - virtual mozilla::ipc::IPCResult RecvSetSecurityInfo( - const nsCString& securityInfo) override; - virtual mozilla::ipc::IPCResult RecvCancel( - const nsresult& statusCode) override; - virtual mozilla::ipc::IPCResult RecvAppData( + const PBrowserOrId& parent); + mozilla::ipc::IPCResult RecvWriteToCacheEntry( + const nsDependentSubstring& data); + mozilla::ipc::IPCResult RecvCloseCacheEntry(const nsresult& reason); + mozilla::ipc::IPCResult RecvSetCharsetAndSource(const int32_t& source, + const nsCString& charset); + mozilla::ipc::IPCResult RecvSetSecurityInfo(const nsCString& securityInfo); + mozilla::ipc::IPCResult RecvCancel(const nsresult& statusCode); + mozilla::ipc::IPCResult RecvAppData( const IPC::SerializedLoadContext& loadContext, - const PBrowserOrId& parent) override; + const PBrowserOrId& parent); virtual void ActorDestroy(ActorDestroyReason why) override; diff --git a/security/manager/ssl/PSMContentListener.h b/security/manager/ssl/PSMContentListener.h index 986ce951f280..a9bd2981d9cc 100644 --- a/security/manager/ssl/PSMContentListener.h +++ b/security/manager/ssl/PSMContentListener.h @@ -56,13 +56,11 @@ class PSMContentDownloaderParent : public PPSMContentDownloaderParent, public: explicit PSMContentDownloaderParent(uint32_t type); - virtual mozilla::ipc::IPCResult RecvOnStartRequest( - const uint32_t &contentLength) override; - virtual mozilla::ipc::IPCResult RecvOnDataAvailable( - const nsCString &data, const uint64_t &offset, - const uint32_t &count) override; - virtual mozilla::ipc::IPCResult RecvOnStopRequest( - const nsresult &code) override; + mozilla::ipc::IPCResult RecvOnStartRequest(const uint32_t &contentLength); + mozilla::ipc::IPCResult RecvOnDataAvailable(const nsCString &data, + const uint64_t &offset, + const uint32_t &count); + mozilla::ipc::IPCResult RecvOnStopRequest(const nsresult &code); // We inherit most of nsIStreamListener from PSMContentStreamListener, but // we have to override OnStopRequest to know when we're done with our IPC @@ -70,8 +68,8 @@ class PSMContentDownloaderParent : public PPSMContentDownloaderParent, NS_IMETHOD OnStopRequest(nsIRequest *request, nsISupports *aContext, nsresult code) override; - virtual mozilla::ipc::IPCResult RecvDivertToParentUsing( - mozilla::net::PChannelDiverterParent *diverter) override; + mozilla::ipc::IPCResult RecvDivertToParentUsing( + mozilla::net::PChannelDiverterParent *diverter); protected: virtual ~PSMContentDownloaderParent(); diff --git a/toolkit/components/extensions/webrequest/StreamFilterChild.h b/toolkit/components/extensions/webrequest/StreamFilterChild.h index 87cf905e3ac0..c07c594a05e1 100644 --- a/toolkit/components/extensions/webrequest/StreamFilterChild.h +++ b/toolkit/components/extensions/webrequest/StreamFilterChild.h @@ -89,15 +89,15 @@ class StreamFilterChild final : public PStreamFilterChild, void RecvInitialized(bool aSuccess); protected: - virtual IPCResult RecvStartRequest() override; - virtual IPCResult RecvData(Data&& data) override; - virtual IPCResult RecvStopRequest(const nsresult& aStatus) override; - virtual IPCResult RecvError(const nsCString& aError) override; + IPCResult RecvStartRequest(); + IPCResult RecvData(Data&& data); + IPCResult RecvStopRequest(const nsresult& aStatus); + IPCResult RecvError(const nsCString& aError); - virtual IPCResult RecvClosed() override; - virtual IPCResult RecvSuspended() override; - virtual IPCResult RecvResumed() override; - virtual IPCResult RecvFlushData() override; + IPCResult RecvClosed(); + IPCResult RecvSuspended(); + IPCResult RecvResumed(); + IPCResult RecvFlushData(); virtual void DeallocPStreamFilterChild() override; diff --git a/toolkit/components/extensions/webrequest/StreamFilterParent.h b/toolkit/components/extensions/webrequest/StreamFilterParent.h index e4a48b890e21..a7f95f9122ea 100644 --- a/toolkit/components/extensions/webrequest/StreamFilterParent.h +++ b/toolkit/components/extensions/webrequest/StreamFilterParent.h @@ -88,13 +88,13 @@ class StreamFilterParent final : public PStreamFilterParent, protected: virtual ~StreamFilterParent(); - virtual IPCResult RecvWrite(Data&& aData) override; - virtual IPCResult RecvFlushedData() override; - virtual IPCResult RecvSuspend() override; - virtual IPCResult RecvResume() override; - virtual IPCResult RecvClose() override; - virtual IPCResult RecvDisconnect() override; - virtual IPCResult RecvDestroy() override; + IPCResult RecvWrite(Data&& aData); + IPCResult RecvFlushedData(); + IPCResult RecvSuspend(); + IPCResult RecvResume(); + IPCResult RecvClose(); + IPCResult RecvDisconnect(); + IPCResult RecvDestroy(); virtual void DeallocPStreamFilterParent() override; diff --git a/toolkit/components/printingui/ipc/PrintingParent.h b/toolkit/components/printingui/ipc/PrintingParent.h index ab5798ffba1a..78654199edf8 100644 --- a/toolkit/components/printingui/ipc/PrintingParent.h +++ b/toolkit/components/printingui/ipc/PrintingParent.h @@ -28,17 +28,16 @@ class PrintingParent final : public PPrintingParent { public: NS_INLINE_DECL_REFCOUNTING(PrintingParent) - virtual mozilla::ipc::IPCResult RecvShowProgress( + mozilla::ipc::IPCResult RecvShowProgress( PBrowserParent* parent, PPrintProgressDialogParent* printProgressDialog, - PRemotePrintJobParent* remotePrintJob, - const bool& isForPrinting) override; - virtual mozilla::ipc::IPCResult RecvShowPrintDialog( + PRemotePrintJobParent* remotePrintJob, const bool& isForPrinting); + mozilla::ipc::IPCResult RecvShowPrintDialog( PPrintSettingsDialogParent* aDialog, PBrowserParent* aParent, - const PrintData& aData) override; + const PrintData& aData); - virtual mozilla::ipc::IPCResult RecvSavePrintSettings( + mozilla::ipc::IPCResult RecvSavePrintSettings( const PrintData& data, const bool& usePrinterNamePrefix, - const uint32_t& flags, nsresult* rv) override; + const uint32_t& flags, nsresult* rv); PPrintProgressDialogParent* AllocPPrintProgressDialogParent(); diff --git a/uriloader/exthandler/ExternalHelperAppChild.h b/uriloader/exthandler/ExternalHelperAppChild.h index 48ae87bd9bf2..d6983f71f94a 100644 --- a/uriloader/exthandler/ExternalHelperAppChild.h +++ b/uriloader/exthandler/ExternalHelperAppChild.h @@ -31,7 +31,7 @@ class ExternalHelperAppChild : public PExternalHelperAppChild, // the child. void SetHandler(nsExternalAppHandler *handler) { mHandler = handler; } - virtual mozilla::ipc::IPCResult RecvCancel(const nsresult &aStatus) override; + mozilla::ipc::IPCResult RecvCancel(const nsresult &aStatus); private: virtual ~ExternalHelperAppChild(); diff --git a/uriloader/prefetch/OfflineCacheUpdateChild.h b/uriloader/prefetch/OfflineCacheUpdateChild.h index 9caa3f8add39..0eaeb1699470 100644 --- a/uriloader/prefetch/OfflineCacheUpdateChild.h +++ b/uriloader/prefetch/OfflineCacheUpdateChild.h @@ -29,14 +29,14 @@ class OfflineCacheUpdateChild : public nsIOfflineCacheUpdate, NS_DECL_ISUPPORTS NS_DECL_NSIOFFLINECACHEUPDATE - virtual mozilla::ipc::IPCResult RecvNotifyStateEvent( - const uint32_t& stateEvent, const uint64_t& byteProgress) override; + mozilla::ipc::IPCResult RecvNotifyStateEvent(const uint32_t& stateEvent, + const uint64_t& byteProgress); - virtual mozilla::ipc::IPCResult RecvAssociateDocuments( - const nsCString& cacheGroupId, const nsCString& cacheClientId) override; + mozilla::ipc::IPCResult RecvAssociateDocuments( + const nsCString& cacheGroupId, const nsCString& cacheClientId); - virtual mozilla::ipc::IPCResult RecvFinish(const bool& succeeded, - const bool& isUpgrade) override; + mozilla::ipc::IPCResult RecvFinish(const bool& succeeded, + const bool& isUpgrade); explicit OfflineCacheUpdateChild(nsPIDOMWindowInner* aWindow);