Bug 960648: Consistently mark IPDL methods as MOZ_OVERRIDE, NPAPI plugins. r=me/bent

2014-01-19 23:03:45 -06:00 · 2014-01-19 23:03:45 -06:00 · 4ee46cac40
--- a/dom/plugins/ipc/BrowserStreamChild.h
+++ b/dom/plugins/ipc/BrowserStreamChild.h
@ -39,10 +39,10 @@ public:

  virtual bool RecvWrite(const int32_t& offset,
                         const Buffer& data,
-                         const uint32_t& newsize);
-  virtual bool RecvNPP_StreamAsFile(const nsCString& fname);
-  virtual bool RecvNPP_DestroyStream(const NPReason& reason);
-  virtual bool Recv__delete__();
+                         const uint32_t& newsize) MOZ_OVERRIDE;
+  virtual bool RecvNPP_StreamAsFile(const nsCString& fname) MOZ_OVERRIDE;
+  virtual bool RecvNPP_DestroyStream(const NPReason& reason) MOZ_OVERRIDE;
+  virtual bool Recv__delete__() MOZ_OVERRIDE;

  void EnsureCorrectInstance(PluginInstanceChild* i)
  {
--- a/dom/plugins/ipc/BrowserStreamParent.h
+++ b/dom/plugins/ipc/BrowserStreamParent.h
@ -27,11 +27,11 @@ public:
  virtual bool IsBrowserStream() MOZ_OVERRIDE { return true; }

  virtual bool AnswerNPN_RequestRead(const IPCByteRanges& ranges,
-                                     NPError* result);
+                                     NPError* result) MOZ_OVERRIDE;

-  virtual bool RecvNPN_DestroyStream(const NPReason& reason);
+  virtual bool RecvNPN_DestroyStream(const NPReason& reason) MOZ_OVERRIDE;

-  virtual bool RecvStreamDestroyed();
+  virtual bool RecvStreamDestroyed() MOZ_OVERRIDE;

  int32_t WriteReady();
  int32_t Write(int32_t offset, int32_t len, void* buffer);
--- a/dom/plugins/ipc/PluginIdentifierParent.h
+++ b/dom/plugins/ipc/PluginIdentifierParent.h
@ -64,7 +64,7 @@ protected:
    MOZ_COUNT_DTOR(PluginIdentifierParent);
  }

-  virtual bool RecvRetain();
+  virtual bool RecvRetain() MOZ_OVERRIDE;

  void AddTemporaryRef() {
    mTemporaryRefs++;
--- a/dom/plugins/ipc/PluginInstanceChild.h
+++ b/dom/plugins/ipc/PluginInstanceChild.h
@ -69,44 +69,50 @@ class PluginInstanceChild : public PPluginInstanceChild
 #endif

 protected:
-    virtual bool AnswerNPP_SetWindow(const NPRemoteWindow& window);
+    virtual bool AnswerNPP_SetWindow(const NPRemoteWindow& window) MOZ_OVERRIDE;

    virtual bool
-    AnswerNPP_GetValue_NPPVpluginWantsAllNetworkStreams(bool* wantsAllStreams, NPError* rv);
+    AnswerNPP_GetValue_NPPVpluginWantsAllNetworkStreams(bool* wantsAllStreams, NPError* rv) MOZ_OVERRIDE;
    virtual bool
-    AnswerNPP_GetValue_NPPVpluginNeedsXEmbed(bool* needs, NPError* rv);
+    AnswerNPP_GetValue_NPPVpluginNeedsXEmbed(bool* needs, NPError* rv) MOZ_OVERRIDE;
    virtual bool
    AnswerNPP_GetValue_NPPVpluginScriptableNPObject(PPluginScriptableObjectChild** value,
-                                                    NPError* result);
+                                                    NPError* result) MOZ_OVERRIDE;
    virtual bool
    AnswerNPP_GetValue_NPPVpluginNativeAccessibleAtkPlugId(nsCString* aPlugId,
-                                                     NPError* aResult);
+                                                           NPError* aResult) MOZ_OVERRIDE;
    virtual bool
-    AnswerNPP_SetValue_NPNVprivateModeBool(const bool& value, NPError* result);
+    AnswerNPP_SetValue_NPNVprivateModeBool(const bool& value, NPError* result) MOZ_OVERRIDE;

    virtual bool
-    AnswerNPP_HandleEvent(const NPRemoteEvent& event, int16_t* handled);
+    AnswerNPP_HandleEvent(const NPRemoteEvent& event, int16_t* handled) MOZ_OVERRIDE;
    virtual bool
-    AnswerNPP_HandleEvent_Shmem(const NPRemoteEvent& event, Shmem& mem, int16_t* handled, Shmem* rtnmem);
+    AnswerNPP_HandleEvent_Shmem(const NPRemoteEvent& event,
+                                Shmem& mem,
+                                int16_t* handled,
+                                Shmem* rtnmem) MOZ_OVERRIDE;
    virtual bool
-    AnswerNPP_HandleEvent_IOSurface(const NPRemoteEvent& event, const uint32_t& surface, int16_t* handled);
+    AnswerNPP_HandleEvent_IOSurface(const NPRemoteEvent& event,
+                                    const uint32_t& surface,
+                                    int16_t* handled) MOZ_OVERRIDE;

    // Async rendering
    virtual bool
    RecvAsyncSetWindow(const gfxSurfaceType& aSurfaceType,
-                       const NPRemoteWindow& aWindow);
+                       const NPRemoteWindow& aWindow) MOZ_OVERRIDE;

    virtual void
    DoAsyncSetWindow(const gfxSurfaceType& aSurfaceType,
                     const NPRemoteWindow& aWindow,
                     bool aIsAsync);

-    virtual PPluginSurfaceChild* AllocPPluginSurfaceChild(const WindowsSharedMemoryHandle&,
-                                                          const gfxIntSize&, const bool&) {
+    virtual PPluginSurfaceChild*
+    AllocPPluginSurfaceChild(const WindowsSharedMemoryHandle&,
+                             const gfxIntSize&, const bool&) MOZ_OVERRIDE {
        return new PPluginSurfaceChild();
    }

-    virtual bool DeallocPPluginSurfaceChild(PPluginSurfaceChild* s) {
+    virtual bool DeallocPPluginSurfaceChild(PPluginSurfaceChild* s) MOZ_OVERRIDE {
        delete s;
        return true;
    }
@ -125,13 +131,13 @@ protected:
    RecvContentsScaleFactorChanged(const double& aContentsScaleFactor) MOZ_OVERRIDE;

    virtual bool
-    AnswerNPP_Destroy(NPError* result);
+    AnswerNPP_Destroy(NPError* result) MOZ_OVERRIDE;

    virtual PPluginScriptableObjectChild*
-    AllocPPluginScriptableObjectChild();
+    AllocPPluginScriptableObjectChild() MOZ_OVERRIDE;

    virtual bool
-    DeallocPPluginScriptableObjectChild(PPluginScriptableObjectChild* aObject);
+    DeallocPPluginScriptableObjectChild(PPluginScriptableObjectChild* aObject) MOZ_OVERRIDE;

    virtual bool
    RecvPPluginScriptableObjectConstructor(PPluginScriptableObjectChild* aActor) MOZ_OVERRIDE;
@ -145,7 +151,7 @@ protected:
                             const nsCString& mimeType,
                             const bool& seekable,
                             NPError* rv,
-                             uint16_t *stype);
+                             uint16_t *stype) MOZ_OVERRIDE;

    virtual bool
    AnswerPBrowserStreamConstructor(
@ -158,36 +164,36 @@ protected:
            const nsCString& mimeType,
            const bool& seekable,
            NPError* rv,
-            uint16_t* stype);
-        
+            uint16_t* stype) MOZ_OVERRIDE;
+
    virtual bool
-    DeallocPBrowserStreamChild(PBrowserStreamChild* stream);
+    DeallocPBrowserStreamChild(PBrowserStreamChild* stream) MOZ_OVERRIDE;

    virtual PPluginStreamChild*
    AllocPPluginStreamChild(const nsCString& mimeType,
                            const nsCString& target,
-                            NPError* result);
+                            NPError* result) MOZ_OVERRIDE;

    virtual bool
-    DeallocPPluginStreamChild(PPluginStreamChild* stream);
+    DeallocPPluginStreamChild(PPluginStreamChild* stream) MOZ_OVERRIDE;

    virtual PStreamNotifyChild*
    AllocPStreamNotifyChild(const nsCString& url, const nsCString& target,
                            const bool& post, const nsCString& buffer,
                            const bool& file,
-                            NPError* result);
+                            NPError* result) MOZ_OVERRIDE;

    virtual bool
    DeallocPStreamNotifyChild(PStreamNotifyChild* notifyData) MOZ_OVERRIDE;

    virtual bool
-    AnswerSetPluginFocus();
+    AnswerSetPluginFocus() MOZ_OVERRIDE;

    virtual bool
-    AnswerUpdateWindow();
+    AnswerUpdateWindow() MOZ_OVERRIDE;

    virtual bool
-    RecvNPP_DidComposite();
+    RecvNPP_DidComposite() MOZ_OVERRIDE;

 #if defined(MOZ_X11) && defined(XP_UNIX) && !defined(XP_MACOSX)
    bool CreateWindow(const NPRemoteWindow& aWindow);
--- a/dom/plugins/ipc/PluginInstanceParent.h
+++ b/dom/plugins/ipc/PluginInstanceParent.h
@ -62,13 +62,13 @@ public:
    virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE;

    virtual PPluginScriptableObjectParent*
-    AllocPPluginScriptableObjectParent();
+    AllocPPluginScriptableObjectParent() MOZ_OVERRIDE;

    virtual bool
    RecvPPluginScriptableObjectConstructor(PPluginScriptableObjectParent* aActor) MOZ_OVERRIDE;

    virtual bool
-    DeallocPPluginScriptableObjectParent(PPluginScriptableObjectParent* aObject);
+    DeallocPPluginScriptableObjectParent(PPluginScriptableObjectParent* aObject) MOZ_OVERRIDE;
    virtual PBrowserStreamParent*
    AllocPBrowserStreamParent(const nsCString& url,
                              const uint32_t& length,
@ -78,68 +78,68 @@ public:
                              const nsCString& mimeType,
                              const bool& seekable,
                              NPError* rv,
-                              uint16_t *stype);
+                              uint16_t *stype) MOZ_OVERRIDE;
    virtual bool
-    DeallocPBrowserStreamParent(PBrowserStreamParent* stream);
+    DeallocPBrowserStreamParent(PBrowserStreamParent* stream) MOZ_OVERRIDE;

    virtual PPluginStreamParent*
    AllocPPluginStreamParent(const nsCString& mimeType,
                             const nsCString& target,
-                             NPError* result);
+                             NPError* result) MOZ_OVERRIDE;
    virtual bool
-    DeallocPPluginStreamParent(PPluginStreamParent* stream);
+    DeallocPPluginStreamParent(PPluginStreamParent* stream) MOZ_OVERRIDE;

    virtual bool
    AnswerNPN_GetValue_NPNVnetscapeWindow(NativeWindowHandle* value,
-                                          NPError* result);
+                                          NPError* result) MOZ_OVERRIDE;
    virtual bool
    AnswerNPN_GetValue_NPNVWindowNPObject(
                                       PPluginScriptableObjectParent** value,
-                                       NPError* result);
+                                       NPError* result) MOZ_OVERRIDE;
    virtual bool
    AnswerNPN_GetValue_NPNVPluginElementNPObject(
                                       PPluginScriptableObjectParent** value,
-                                       NPError* result);
+                                       NPError* result) MOZ_OVERRIDE;
    virtual bool
-    AnswerNPN_GetValue_NPNVprivateModeBool(bool* value, NPError* result);
+    AnswerNPN_GetValue_NPNVprivateModeBool(bool* value, NPError* result) MOZ_OVERRIDE;

    virtual bool
-    AnswerNPN_GetValue_DrawingModelSupport(const NPNVariable& model, bool* value);
+    AnswerNPN_GetValue_DrawingModelSupport(const NPNVariable& model, bool* value) MOZ_OVERRIDE;
  
    virtual bool
-    AnswerNPN_GetValue_NPNVdocumentOrigin(nsCString* value, NPError* result);
+    AnswerNPN_GetValue_NPNVdocumentOrigin(nsCString* value, NPError* result) MOZ_OVERRIDE;

    virtual bool
-    AnswerNPN_SetValue_NPPVpluginWindow(const bool& windowed, NPError* result);
+    AnswerNPN_SetValue_NPPVpluginWindow(const bool& windowed, NPError* result) MOZ_OVERRIDE;
    virtual bool
    AnswerNPN_SetValue_NPPVpluginTransparent(const bool& transparent,
-                                             NPError* result);
+                                             NPError* result) MOZ_OVERRIDE;
    virtual bool
    AnswerNPN_SetValue_NPPVpluginUsesDOMForCursor(const bool& useDOMForCursor,
-                                                  NPError* result);
+                                                  NPError* result) MOZ_OVERRIDE;
    virtual bool
    AnswerNPN_SetValue_NPPVpluginDrawingModel(const int& drawingModel,
                                              OptionalShmem *remoteImageData,
                                              CrossProcessMutexHandle *mutex,
-                                              NPError* result);
+                                              NPError* result) MOZ_OVERRIDE;
    virtual bool
    AnswerNPN_SetValue_NPPVpluginEventModel(const int& eventModel,
-                                             NPError* result);
+                                             NPError* result) MOZ_OVERRIDE;

    virtual bool
    AnswerNPN_GetURL(const nsCString& url, const nsCString& target,
-                     NPError *result);
+                     NPError *result) MOZ_OVERRIDE;

    virtual bool
    AnswerNPN_PostURL(const nsCString& url, const nsCString& target,
                      const nsCString& buffer, const bool& file,
-                      NPError* result);
+                      NPError* result) MOZ_OVERRIDE;

    virtual PStreamNotifyParent*
    AllocPStreamNotifyParent(const nsCString& url, const nsCString& target,
                             const bool& post, const nsCString& buffer,
                             const bool& file,
-                             NPError* result);
+                             NPError* result) MOZ_OVERRIDE;

    virtual bool
    AnswerPStreamNotifyConstructor(PStreamNotifyParent* actor,
@ -150,30 +150,30 @@ public:
                                   NPError* result) MOZ_OVERRIDE;

    virtual bool
-    DeallocPStreamNotifyParent(PStreamNotifyParent* notifyData);
+    DeallocPStreamNotifyParent(PStreamNotifyParent* notifyData) MOZ_OVERRIDE;

    virtual bool
-    RecvNPN_InvalidateRect(const NPRect& rect);
+    RecvNPN_InvalidateRect(const NPRect& rect) MOZ_OVERRIDE;

    // Async rendering
    virtual bool
    RecvShow(const NPRect& updatedRect,
             const SurfaceDescriptor& newSurface,
-             SurfaceDescriptor* prevSurface);
+             SurfaceDescriptor* prevSurface) MOZ_OVERRIDE;

    virtual PPluginSurfaceParent*
    AllocPPluginSurfaceParent(const WindowsSharedMemoryHandle& handle,
                              const gfxIntSize& size,
-                              const bool& transparent);
+                              const bool& transparent) MOZ_OVERRIDE;

    virtual bool
-    DeallocPPluginSurfaceParent(PPluginSurfaceParent* s);
+    DeallocPPluginSurfaceParent(PPluginSurfaceParent* s) MOZ_OVERRIDE;

    virtual bool
-    AnswerNPN_PushPopupsEnabledState(const bool& aState);
+    AnswerNPN_PushPopupsEnabledState(const bool& aState) MOZ_OVERRIDE;

    virtual bool
-    AnswerNPN_PopPopupsEnabledState();
+    AnswerNPN_PopPopupsEnabledState() MOZ_OVERRIDE;

    virtual bool
    AnswerNPN_GetValueForURL(const NPNURLVariable& variable,
@ -210,15 +210,15 @@ public:
    AnswerNPN_InitAsyncSurface(const gfxIntSize& size,
                               const NPImageFormat& format,
                               NPRemoteAsyncSurface* surfData,
-                               bool* result);
+                               bool* result) MOZ_OVERRIDE;

    virtual bool
-    RecvRedrawPlugin();
+    RecvRedrawPlugin() MOZ_OVERRIDE;

    virtual bool
    RecvNegotiatedCarbon() MOZ_OVERRIDE;

-    virtual bool RecvReleaseDXGISharedSurface(const DXGISharedSurfaceHandle &aHandle);
+    virtual bool RecvReleaseDXGISharedSurface(const DXGISharedSurfaceHandle &aHandle) MOZ_OVERRIDE;

    NPError NPP_SetWindow(const NPWindow* aWindow);

@ -265,7 +265,7 @@ public:
    }

    virtual bool
-    AnswerPluginFocusChange(const bool& gotFocus);
+    AnswerPluginFocusChange(const bool& gotFocus) MOZ_OVERRIDE;

    nsresult AsyncSetWindow(NPWindow* window);
    nsresult GetImageContainer(mozilla::layers::ImageContainer** aContainer);
--- a/dom/plugins/ipc/PluginModuleChild.h
+++ b/dom/plugins/ipc/PluginModuleChild.h
@ -84,32 +84,32 @@ protected:
    virtual bool ShouldContinueFromReplyTimeout() MOZ_OVERRIDE;

    // Implement the PPluginModuleChild interface
-    virtual bool AnswerNP_GetEntryPoints(NPError* rv);
-    virtual bool AnswerNP_Initialize(const uint32_t& aFlags, NPError* rv);
+    virtual bool AnswerNP_GetEntryPoints(NPError* rv) MOZ_OVERRIDE;
+    virtual bool AnswerNP_Initialize(const uint32_t& aFlags, NPError* rv) MOZ_OVERRIDE;

    virtual PPluginIdentifierChild*
    AllocPPluginIdentifierChild(const nsCString& aString,
                                const int32_t& aInt,
-                                const bool& aTemporary);
+                                const bool& aTemporary) MOZ_OVERRIDE;

    virtual bool
    RecvPPluginIdentifierConstructor(PPluginIdentifierChild* actor,
                                     const nsCString& aString,
                                     const int32_t& aInt,
-                                     const bool& aTemporary);
+                                     const bool& aTemporary) MOZ_OVERRIDE;

    virtual bool
-    DeallocPPluginIdentifierChild(PPluginIdentifierChild* aActor);
+    DeallocPPluginIdentifierChild(PPluginIdentifierChild* aActor) MOZ_OVERRIDE;

    virtual PPluginInstanceChild*
    AllocPPluginInstanceChild(const nsCString& aMimeType,
                              const uint16_t& aMode,
                              const InfallibleTArray<nsCString>& aNames,
                              const InfallibleTArray<nsCString>& aValues,
-                              NPError* rv);
+                              NPError* rv) MOZ_OVERRIDE;

    virtual bool
-    DeallocPPluginInstanceChild(PPluginInstanceChild* aActor);
+    DeallocPPluginInstanceChild(PPluginInstanceChild* aActor) MOZ_OVERRIDE;

    virtual bool
    AnswerPPluginInstanceConstructor(PPluginInstanceChild* aActor,
@ -117,44 +117,44 @@ protected:
                                     const uint16_t& aMode,
                                     const InfallibleTArray<nsCString>& aNames,
                                     const InfallibleTArray<nsCString>& aValues,
-                                     NPError* rv);
+                                     NPError* rv) MOZ_OVERRIDE;
    virtual bool
-    AnswerNP_Shutdown(NPError *rv);
+    AnswerNP_Shutdown(NPError *rv) MOZ_OVERRIDE;

    virtual bool
    AnswerOptionalFunctionsSupported(bool *aURLRedirectNotify,
                                     bool *aClearSiteData,
-                                     bool *aGetSitesWithData);
+                                     bool *aGetSitesWithData) MOZ_OVERRIDE;

    virtual bool
    AnswerNPP_ClearSiteData(const nsCString& aSite,
                            const uint64_t& aFlags,
                            const uint64_t& aMaxAge,
-                            NPError* aResult);
+                            NPError* aResult) MOZ_OVERRIDE;

    virtual bool
-    AnswerNPP_GetSitesWithData(InfallibleTArray<nsCString>* aResult);
+    AnswerNPP_GetSitesWithData(InfallibleTArray<nsCString>* aResult) MOZ_OVERRIDE;

    virtual bool
    RecvSetAudioSessionData(const nsID& aId,
                            const nsString& aDisplayName,
-                            const nsString& aIconPath);
+                            const nsString& aIconPath) MOZ_OVERRIDE;

    virtual bool
-    RecvSetParentHangTimeout(const uint32_t& aSeconds);
+    RecvSetParentHangTimeout(const uint32_t& aSeconds) MOZ_OVERRIDE;

    virtual PCrashReporterChild*
    AllocPCrashReporterChild(mozilla::dom::NativeThreadId* id,
-                             uint32_t* processType);
+                             uint32_t* processType) MOZ_OVERRIDE;
    virtual bool
-    DeallocPCrashReporterChild(PCrashReporterChild* actor);
+    DeallocPCrashReporterChild(PCrashReporterChild* actor) MOZ_OVERRIDE;
    virtual bool
    AnswerPCrashReporterConstructor(PCrashReporterChild* actor,
                                    mozilla::dom::NativeThreadId* id,
-                                    uint32_t* processType);
+                                    uint32_t* processType) MOZ_OVERRIDE;

    virtual void
-    ActorDestroy(ActorDestroyReason why);
+    ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE;

    MOZ_NORETURN void QuickExit();

@ -162,7 +162,7 @@ protected:
    RecvProcessNativeEventsInInterruptCall() MOZ_OVERRIDE;

    virtual bool
-    AnswerGeckoGetProfile(nsCString* aProfile);
+    AnswerGeckoGetProfile(nsCString* aProfile) MOZ_OVERRIDE;

 public:
    PluginModuleChild();
--- a/dom/plugins/ipc/PluginModuleParent.h
+++ b/dom/plugins/ipc/PluginModuleParent.h
@ -70,20 +70,20 @@ protected:
    virtual PPluginIdentifierParent*
    AllocPPluginIdentifierParent(const nsCString& aString,
                                 const int32_t& aInt,
-                                 const bool& aTemporary);
+                                 const bool& aTemporary) MOZ_OVERRIDE;

    virtual bool
-    DeallocPPluginIdentifierParent(PPluginIdentifierParent* aActor);
+    DeallocPPluginIdentifierParent(PPluginIdentifierParent* aActor) MOZ_OVERRIDE;

    PPluginInstanceParent*
    AllocPPluginInstanceParent(const nsCString& aMimeType,
                               const uint16_t& aMode,
                               const InfallibleTArray<nsCString>& aNames,
                               const InfallibleTArray<nsCString>& aValues,
-                               NPError* rv);
+                               NPError* rv) MOZ_OVERRIDE;

    virtual bool
-    DeallocPPluginInstanceParent(PPluginInstanceParent* aActor);
+    DeallocPPluginInstanceParent(PPluginInstanceParent* aActor) MOZ_OVERRIDE;

 public:
    // aFilePath is UTF8, not native!
@ -141,7 +141,8 @@ protected:
        return MediateRace(parent, child);
    }

-    virtual bool RecvXXX_HACK_FIXME_cjones(Shmem& mem) { NS_RUNTIMEABORT("not reached"); return false; }
+    virtual bool RecvXXX_HACK_FIXME_cjones(Shmem& mem)
+      { NS_RUNTIMEABORT("not reached"); return false; }

    virtual bool ShouldContinueFromReplyTimeout() MOZ_OVERRIDE;

@ -149,12 +150,12 @@ protected:
    RecvBackUpXResources(const FileDescriptor& aXSocketFd) MOZ_OVERRIDE;

    virtual bool
-    AnswerNPN_UserAgent(nsCString* userAgent);
+    AnswerNPN_UserAgent(nsCString* userAgent) MOZ_OVERRIDE;

    virtual bool
    AnswerNPN_GetValue_WithBoolReturn(const NPNVariable& aVariable,
                                      NPError* aError,
-                                      bool* aBoolVal);
+                                      bool* aBoolVal) MOZ_OVERRIDE;

    virtual bool AnswerProcessSomeEvents() MOZ_OVERRIDE;

--- a/dom/plugins/ipc/PluginScriptableObjectChild.h
+++ b/dom/plugins/ipc/PluginScriptableObjectChild.h
@ -54,57 +54,57 @@ public:


  virtual bool
-  AnswerInvalidate();
+  AnswerInvalidate() MOZ_OVERRIDE;

  virtual bool
  AnswerHasMethod(PPluginIdentifierChild* aId,
-                  bool* aHasMethod);
+                  bool* aHasMethod) MOZ_OVERRIDE;

  virtual bool
  AnswerInvoke(PPluginIdentifierChild* aId,
               const InfallibleTArray<Variant>& aArgs,
               Variant* aResult,
-               bool* aSuccess);
+               bool* aSuccess) MOZ_OVERRIDE;

  virtual bool
  AnswerInvokeDefault(const InfallibleTArray<Variant>& aArgs,
                      Variant* aResult,
-                      bool* aSuccess);
+                      bool* aSuccess) MOZ_OVERRIDE;

  virtual bool
  AnswerHasProperty(PPluginIdentifierChild* aId,
-                    bool* aHasProperty);
+                    bool* aHasProperty) MOZ_OVERRIDE;

  virtual bool
  AnswerGetChildProperty(PPluginIdentifierChild* aId,
                         bool* aHasProperty,
                         bool* aHasMethod,
                         Variant* aResult,
-                         bool* aSuccess);
+                         bool* aSuccess) MOZ_OVERRIDE;

  virtual bool
  AnswerSetProperty(PPluginIdentifierChild* aId,
                    const Variant& aValue,
-                    bool* aSuccess);
+                    bool* aSuccess) MOZ_OVERRIDE;

  virtual bool
  AnswerRemoveProperty(PPluginIdentifierChild* aId,
-                       bool* aSuccess);
+                       bool* aSuccess) MOZ_OVERRIDE;

  virtual bool
  AnswerEnumerate(InfallibleTArray<PPluginIdentifierChild*>* aProperties,
-                  bool* aSuccess);
+                  bool* aSuccess) MOZ_OVERRIDE;

  virtual bool
  AnswerConstruct(const InfallibleTArray<Variant>& aArgs,
                  Variant* aResult,
-                  bool* aSuccess);
+                  bool* aSuccess) MOZ_OVERRIDE;

  virtual bool
-  RecvProtect();
+  RecvProtect() MOZ_OVERRIDE;

  virtual bool
-  RecvUnprotect();
+  RecvUnprotect() MOZ_OVERRIDE;

  NPObject*
  GetObject(bool aCanResurrect);
--- a/dom/plugins/ipc/PluginScriptableObjectParent.h
+++ b/dom/plugins/ipc/PluginScriptableObjectParent.h
@ -47,56 +47,56 @@ public:

  virtual bool
  AnswerHasMethod(PPluginIdentifierParent* aId,
-                  bool* aHasMethod);
+                  bool* aHasMethod) MOZ_OVERRIDE;

  virtual bool
  AnswerInvoke(PPluginIdentifierParent* aId,
               const InfallibleTArray<Variant>& aArgs,
               Variant* aResult,
-               bool* aSuccess);
+               bool* aSuccess) MOZ_OVERRIDE;

  virtual bool
  AnswerInvokeDefault(const InfallibleTArray<Variant>& aArgs,
                      Variant* aResult,
-                      bool* aSuccess);
+                      bool* aSuccess) MOZ_OVERRIDE;

  virtual bool
  AnswerHasProperty(PPluginIdentifierParent* aId,
-                    bool* aHasProperty);
+                    bool* aHasProperty) MOZ_OVERRIDE;

  virtual bool
  AnswerGetParentProperty(PPluginIdentifierParent* aId,
                          Variant* aResult,
-                          bool* aSuccess);
+                          bool* aSuccess) MOZ_OVERRIDE;

  virtual bool
  AnswerSetProperty(PPluginIdentifierParent* aId,
                    const Variant& aValue,
-                    bool* aSuccess);
+                    bool* aSuccess) MOZ_OVERRIDE;

  virtual bool
  AnswerRemoveProperty(PPluginIdentifierParent* aId,
-                       bool* aSuccess);
+                       bool* aSuccess) MOZ_OVERRIDE;

  virtual bool
  AnswerEnumerate(InfallibleTArray<PPluginIdentifierParent*>* aProperties,
-                  bool* aSuccess);
+                  bool* aSuccess) MOZ_OVERRIDE;

  virtual bool
  AnswerConstruct(const InfallibleTArray<Variant>& aArgs,
                  Variant* aResult,
-                  bool* aSuccess);
+                  bool* aSuccess) MOZ_OVERRIDE;

  virtual bool
  AnswerNPN_Evaluate(const nsCString& aScript,
                     Variant* aResult,
-                     bool* aSuccess);
+                     bool* aSuccess) MOZ_OVERRIDE;

  virtual bool
-  RecvProtect();
+  RecvProtect() MOZ_OVERRIDE;

  virtual bool
-  RecvUnprotect();
+  RecvUnprotect() MOZ_OVERRIDE;

  static const NPClass*
  GetClass()
--- a/dom/plugins/ipc/PluginStreamChild.h
+++ b/dom/plugins/ipc/PluginStreamChild.h
@ -25,7 +25,7 @@ public:
  virtual bool IsBrowserStream() MOZ_OVERRIDE { return false; }

  virtual bool Answer__delete__(const NPReason& reason,
-                                const bool& artificial);
+                                const bool& artificial) MOZ_OVERRIDE;

  int32_t NPN_Write(int32_t length, void* buffer);
  void NPP_DestroyStream(NPError reason);
--- a/dom/plugins/ipc/PluginStreamParent.h
+++ b/dom/plugins/ipc/PluginStreamParent.h
@ -26,9 +26,9 @@ public:

  virtual bool IsBrowserStream() MOZ_OVERRIDE { return false; }

-  virtual bool AnswerNPN_Write(const Buffer& data, int32_t* written);
+  virtual bool AnswerNPN_Write(const Buffer& data, int32_t* written) MOZ_OVERRIDE;

-  virtual bool Answer__delete__(const NPError& reason, const bool& artificial);
+  virtual bool Answer__delete__(const NPError& reason, const bool& artificial) MOZ_OVERRIDE;

 private:
  void NPN_DestroyStream(NPReason reason);
--- a/dom/plugins/ipc/StreamNotifyChild.h
+++ b/dom/plugins/ipc/StreamNotifyChild.h
@ -37,7 +37,7 @@ public:
 private:
  virtual bool Recv__delete__(const NPReason& reason) MOZ_OVERRIDE;

-  bool RecvRedirectNotify(const nsCString& url, const int32_t& status);
+  bool RecvRedirectNotify(const nsCString& url, const int32_t& status) MOZ_OVERRIDE;

  /**
   * If a stream is created for this this URLNotify, we associate the objects
--- a/dom/plugins/ipc/StreamNotifyParent.h
+++ b/dom/plugins/ipc/StreamNotifyParent.h
@ -35,7 +35,7 @@ public:
  }

 private:
-  bool RecvRedirectNotifyResponse(const bool& allow);
+  bool RecvRedirectNotifyResponse(const bool& allow) MOZ_OVERRIDE;

  bool* mDestructionFlag;
 };