Bug 1293117 (part 2) - Remove unnecessary comments on some NS_IMETHODIMP instances. r=froydnj.
authorNicholas Nethercote <nnethercote@mozilla.com>
Mon, 08 Aug 2016 10:45:37 +1000
changeset 308995 2764e29be7dce8539f6194f11d479345577db2c5
parent 308994 581bf8b4f433e44150ae7d11fa033064608e443c
child 308996 4db4249540773fabd59acb0e3fe883c95d3213f4
push id80480
push usernnethercote@mozilla.com
push dateThu, 11 Aug 2016 02:09:01 +0000
treeherdermozilla-inbound@32e07e32891d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1293117
milestone51.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1293117 (part 2) - Remove unnecessary comments on some NS_IMETHODIMP instances. r=froydnj. This patch replaces numerous |/* virtual */ NS_IMETHODIMP| occurrences with |NS_IMETHODIMP|, because |NS_IMETHODIMP| always implies |virtual|.
dom/inputport/FakeInputPortService.cpp
dom/inputport/InputPortData.cpp
dom/inputport/InputPortListeners.cpp
dom/tv/TVListeners.cpp
dom/tv/TVServiceCallbacks.cpp
dom/tv/TVTypes.cpp
--- a/dom/inputport/FakeInputPortService.cpp
+++ b/dom/inputport/FakeInputPortService.cpp
@@ -133,37 +133,37 @@ FakeInputPortService::Init()
 void
 FakeInputPortService::Shutdown()
 {
   if (mPortConnectionChangedTimer) {
     mPortConnectionChangedTimer->Cancel();
   }
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 FakeInputPortService::GetInputPortListener(nsIInputPortListener** aInputPortListener)
 {
   if (!mInputPortListener) {
     *aInputPortListener = nullptr;
     return NS_OK;
   }
 
   *aInputPortListener = mInputPortListener;
   NS_ADDREF(*aInputPortListener);
   return NS_OK;
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 FakeInputPortService::SetInputPortListener(nsIInputPortListener* aInputPortListener)
 {
   mInputPortListener = aInputPortListener;
   return NS_OK;
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 FakeInputPortService::GetInputPorts(nsIInputPortServiceCallback* aCallback)
 {
   if (!aCallback) {
     return NS_ERROR_INVALID_ARG;
   }
 
   nsCOMPtr<nsIMutableArray> portDataList = do_CreateInstance(NS_ARRAY_CONTRACTID);
   if (!portDataList) {
--- a/dom/inputport/InputPortData.cpp
+++ b/dom/inputport/InputPortData.cpp
@@ -38,64 +38,64 @@ InputPortData::InputPortData()
   : mIsConnected(false)
 {
 }
 
 InputPortData::~InputPortData()
 {
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 InputPortData::GetId(nsAString& aId)
 {
   aId = mId;
   return NS_OK;
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 InputPortData::SetId(const nsAString& aId)
 {
   if (aId.IsEmpty()) {
     return NS_ERROR_INVALID_ARG;
   }
 
   mId = aId;
   return NS_OK;
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 InputPortData::GetType(nsAString& aType)
 {
   aType = mType;
   return NS_OK;
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 InputPortData::SetType(const nsAString& aType)
 {
   if (aType.IsEmpty()) {
     return NS_ERROR_INVALID_ARG;
   }
 
   if (InputPortType::EndGuard_ == ToInputPortType(aType)) {
     return NS_ERROR_INVALID_ARG;
   }
 
   mType = aType;
   return NS_OK;
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 InputPortData::GetConnected(bool* aIsConnected)
 {
   *aIsConnected = mIsConnected;
   return NS_OK;
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 InputPortData::SetConnected(const bool aIsConnected)
 {
   mIsConnected = aIsConnected;
   return NS_OK;
 }
 
 const nsString&
 InputPortData::GetId() const
--- a/dom/inputport/InputPortListeners.cpp
+++ b/dom/inputport/InputPortListeners.cpp
@@ -29,17 +29,17 @@ InputPortListener::RegisterInputPort(Inp
 
 void
 InputPortListener::UnregisterInputPort(InputPort* aPort)
 {
   MOZ_ASSERT(mInputPorts.Contains(aPort));
   mInputPorts.RemoveElement(aPort);
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 InputPortListener::NotifyConnectionChanged(const nsAString& aPortId,
                                            bool aIsConnected)
 {
   for (uint32_t i = 0; i < mInputPorts.Length(); ++i) {
     nsString id;
     mInputPorts[i]->GetId(id);
     if (aPortId.Equals(id)) {
       mInputPorts[i]->NotifyConnectionChanged(aIsConnected);
--- a/dom/tv/TVListeners.cpp
+++ b/dom/tv/TVListeners.cpp
@@ -33,45 +33,45 @@ TVSourceListener::UnregisterSource(TVSou
 {
   for (uint32_t i = 0; i < mSources.Length(); i++) {
     if (mSources[i] == aSource) {
       mSources.RemoveElementsAt(i, 1);
     }
   }
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVSourceListener::NotifyChannelScanned(const nsAString& aTunerId,
                                        const nsAString& aSourceType,
                                        nsITVChannelData* aChannelData)
 {
   RefPtr<TVSource> source = GetSource(aTunerId, aSourceType);
   source->NotifyChannelScanned(aChannelData);
   return NS_OK;
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVSourceListener::NotifyChannelScanComplete(const nsAString& aTunerId,
                                             const nsAString& aSourceType)
 {
   RefPtr<TVSource> source = GetSource(aTunerId, aSourceType);
   source->NotifyChannelScanComplete();
   return NS_OK;
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVSourceListener::NotifyChannelScanStopped(const nsAString& aTunerId,
                                            const nsAString& aSourceType)
 {
   RefPtr<TVSource> source = GetSource(aTunerId, aSourceType);
   source->NotifyChannelScanStopped();
   return NS_OK;
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVSourceListener::NotifyEITBroadcasted(const nsAString& aTunerId,
                                        const nsAString& aSourceType,
                                        nsITVChannelData* aChannelData,
                                        nsITVProgramData** aProgramDataList,
                                        const uint32_t aCount)
 {
   RefPtr<TVSource> source = GetSource(aTunerId, aSourceType);
   source->NotifyEITBroadcasted(aChannelData, aProgramDataList, aCount);
--- a/dom/tv/TVServiceCallbacks.cpp
+++ b/dom/tv/TVServiceCallbacks.cpp
@@ -39,17 +39,17 @@ TVServiceSourceSetterCallback::TVService
   MOZ_ASSERT(mTuner);
   MOZ_ASSERT(mPromise);
 }
 
 TVServiceSourceSetterCallback::~TVServiceSourceSetterCallback()
 {
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVServiceSourceSetterCallback::NotifySuccess(nsIArray* aDataList)
 {
   // |aDataList| is expected to be null for setter callbacks.
   if (aDataList) {
     mPromise->MaybeReject(NS_ERROR_DOM_ABORT_ERR);
     return NS_ERROR_INVALID_ARG;
   }
 
@@ -58,17 +58,17 @@ TVServiceSourceSetterCallback::NotifySuc
     mPromise->MaybeReject(rv);
     return rv;
   }
 
   mPromise->MaybeResolveWithUndefined();
   return NS_OK;
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVServiceSourceSetterCallback::NotifyError(uint16_t aErrorCode)
 {
   switch (aErrorCode) {
   case nsITVServiceCallback::TV_ERROR_FAILURE:
   case nsITVServiceCallback::TV_ERROR_INVALID_ARG:
     mPromise->MaybeReject(NS_ERROR_DOM_ABORT_ERR);
     return NS_OK;
   case nsITVServiceCallback::TV_ERROR_NO_SIGNAL:
@@ -108,32 +108,32 @@ TVServiceChannelScanCallback::TVServiceC
   MOZ_ASSERT(mSource);
   MOZ_ASSERT(mPromise);
 }
 
 TVServiceChannelScanCallback::~TVServiceChannelScanCallback()
 {
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVServiceChannelScanCallback::NotifySuccess(nsIArray* aDataList)
 {
   // |aDataList| is expected to be null for setter callbacks.
   if (aDataList) {
     mPromise->MaybeReject(NS_ERROR_DOM_ABORT_ERR);
     return NS_ERROR_INVALID_ARG;
   }
 
   mSource->SetIsScanning(mIsScanning);
 
   mPromise->MaybeResolveWithUndefined();
   return NS_OK;
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVServiceChannelScanCallback::NotifyError(uint16_t aErrorCode)
 {
   switch (aErrorCode) {
   case nsITVServiceCallback::TV_ERROR_FAILURE:
   case nsITVServiceCallback::TV_ERROR_INVALID_ARG:
     mPromise->MaybeReject(NS_ERROR_DOM_ABORT_ERR);
     return NS_OK;
   case nsITVServiceCallback::TV_ERROR_NO_SIGNAL:
@@ -174,17 +174,17 @@ TVServiceChannelSetterCallback::TVServic
   MOZ_ASSERT(mPromise);
   MOZ_ASSERT(!mChannelNumber.IsEmpty());
 }
 
 TVServiceChannelSetterCallback::~TVServiceChannelSetterCallback()
 {
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVServiceChannelSetterCallback::NotifySuccess(nsIArray* aDataList)
 {
   // |aDataList| is expected to be with only one element.
   if (!aDataList) {
     mPromise->MaybeReject(NS_ERROR_DOM_ABORT_ERR);
     return NS_ERROR_INVALID_ARG;
   }
 
@@ -210,17 +210,17 @@ TVServiceChannelSetterCallback::NotifySu
     mPromise->MaybeReject(NS_ERROR_DOM_ABORT_ERR);
     return rv;
   }
 
   mPromise->MaybeResolveWithUndefined();
   return NS_OK;
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVServiceChannelSetterCallback::NotifyError(uint16_t aErrorCode)
 {
   switch (aErrorCode) {
   case nsITVServiceCallback::TV_ERROR_FAILURE:
   case nsITVServiceCallback::TV_ERROR_INVALID_ARG:
     mPromise->MaybeReject(NS_ERROR_DOM_ABORT_ERR);
     return NS_OK;
   case nsITVServiceCallback::TV_ERROR_NO_SIGNAL:
@@ -255,17 +255,17 @@ TVServiceTunerGetterCallback::TVServiceT
 {
   MOZ_ASSERT(mManager);
 }
 
 TVServiceTunerGetterCallback::~TVServiceTunerGetterCallback()
 {
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVServiceTunerGetterCallback::NotifySuccess(nsIArray* aDataList)
 {
   if (!aDataList) {
     mManager->RejectPendingGetTunersPromises(NS_ERROR_DOM_ABORT_ERR);
     return NS_ERROR_INVALID_ARG;
   }
 
   uint32_t length;
@@ -284,17 +284,17 @@ TVServiceTunerGetterCallback::NotifySucc
 
     tuners.AppendElement(tuner);
   }
   mManager->SetTuners(tuners);
 
   return NS_OK;
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVServiceTunerGetterCallback::NotifyError(uint16_t aErrorCode)
 {
   switch (aErrorCode) {
   case nsITVServiceCallback::TV_ERROR_FAILURE:
   case nsITVServiceCallback::TV_ERROR_INVALID_ARG:
     mManager->RejectPendingGetTunersPromises(NS_ERROR_DOM_ABORT_ERR);
     return NS_OK;
   case nsITVServiceCallback::TV_ERROR_NO_SIGNAL:
@@ -332,17 +332,17 @@ TVServiceChannelGetterCallback::TVServic
   MOZ_ASSERT(mSource);
   MOZ_ASSERT(mPromise);
 }
 
 TVServiceChannelGetterCallback::~TVServiceChannelGetterCallback()
 {
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVServiceChannelGetterCallback::NotifySuccess(nsIArray* aDataList)
 {
   if (!aDataList) {
     mPromise->MaybeReject(NS_ERROR_DOM_ABORT_ERR);
     return NS_ERROR_INVALID_ARG;
   }
 
   uint32_t length;
@@ -365,17 +365,17 @@ TVServiceChannelGetterCallback::NotifySu
     channels.AppendElement(channel);
   }
 
   mPromise->MaybeResolve(channels);
 
   return NS_OK;
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVServiceChannelGetterCallback::NotifyError(uint16_t aErrorCode)
 {
   switch (aErrorCode) {
   case nsITVServiceCallback::TV_ERROR_FAILURE:
   case nsITVServiceCallback::TV_ERROR_INVALID_ARG:
     mPromise->MaybeReject(NS_ERROR_DOM_ABORT_ERR);
     return NS_OK;
   case nsITVServiceCallback::TV_ERROR_NO_SIGNAL:
@@ -414,17 +414,17 @@ TVServiceProgramGetterCallback::TVServic
   MOZ_ASSERT(mChannel);
   MOZ_ASSERT(mPromise);
 }
 
 TVServiceProgramGetterCallback::~TVServiceProgramGetterCallback()
 {
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVServiceProgramGetterCallback::NotifySuccess(nsIArray* aDataList)
 {
   if (!aDataList) {
     return NS_ERROR_INVALID_ARG;
   }
 
   uint32_t length;
   nsresult rv = aDataList->GetLength(&length);
@@ -463,17 +463,17 @@ TVServiceProgramGetterCallback::NotifySu
                                                 programData);
     programs.AppendElement(program);
   }
 
   mPromise->MaybeResolve(programs);
   return NS_OK;
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVServiceProgramGetterCallback::NotifyError(uint16_t aErrorCode)
 {
   switch (aErrorCode) {
   case nsITVServiceCallback::TV_ERROR_FAILURE:
   case nsITVServiceCallback::TV_ERROR_INVALID_ARG:
     mPromise->MaybeReject(NS_ERROR_DOM_ABORT_ERR);
     return NS_OK;
   case nsITVServiceCallback::TV_ERROR_NO_SIGNAL:
--- a/dom/tv/TVTypes.cpp
+++ b/dom/tv/TVTypes.cpp
@@ -26,66 +26,66 @@ TVTunerData::TVTunerData()
 
 TVTunerData::~TVTunerData()
 {
   if (mSupportedSourceTypes) {
     NS_FREE_XPCOM_ALLOCATED_POINTER_ARRAY(mCount, mSupportedSourceTypes);
   }
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVTunerData::GetId(nsAString& aId)
 {
   aId = mId;
   return NS_OK;
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVTunerData::SetId(const nsAString& aId)
 {
   if (aId.IsEmpty()) {
     return NS_ERROR_INVALID_ARG;
   }
 
   mId = aId;
   return NS_OK;
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVTunerData::GetStreamType(uint16_t* aStreamType)
 {
   *aStreamType = mStreamType;
   return NS_OK;
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVTunerData::SetStreamType(const uint16_t aStreamType)
 {
   mStreamType = aStreamType;
   return NS_OK;
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVTunerData::GetSupportedSourceTypes(uint32_t* aCount,
                                      char*** aSourceTypes)
 {
   *aCount = mCount;
 
   char** sourceTypes = (mCount > 0) ?
                        static_cast<char **>(moz_xmalloc(mCount * sizeof(char*))) :
                        nullptr;
   for (uint32_t i = 0; i < mCount; i++) {
     sourceTypes[i] = NS_strdup(mSupportedSourceTypes[i]);
   }
 
   *aSourceTypes = sourceTypes;
   return NS_OK;
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVTunerData::SetSupportedSourceTypes(uint32_t aCount,
                                      const char** aSourceTypes)
 {
   if (aCount == 0) {
     return NS_ERROR_INVALID_ARG;
   }
   NS_ENSURE_ARG_POINTER(aSourceTypes);
 
@@ -123,150 +123,150 @@ TVChannelData::TVChannelData()
   , mIsFree(false)
 {
 }
 
 TVChannelData::~TVChannelData()
 {
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVChannelData::GetNetworkId(nsAString& aNetworkId)
 {
   aNetworkId = mNetworkId;
   return NS_OK;
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVChannelData::SetNetworkId(const nsAString& aNetworkId)
 {
   if (aNetworkId.IsEmpty()) {
     return NS_ERROR_INVALID_ARG;
   }
 
   mNetworkId = aNetworkId;
   return NS_OK;
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVChannelData::GetTransportStreamId(nsAString& aTransportStreamId)
 {
   aTransportStreamId = mTransportStreamId;
   return NS_OK;
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVChannelData::SetTransportStreamId(const nsAString& aTransportStreamId)
 {
   if (aTransportStreamId.IsEmpty()) {
     return NS_ERROR_INVALID_ARG;
   }
 
   mTransportStreamId = aTransportStreamId;
   return NS_OK;
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVChannelData::GetServiceId(nsAString& aServiceId)
 {
   aServiceId = mServiceId;
   return NS_OK;
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVChannelData::SetServiceId(const nsAString& aServiceId)
 {
   if (aServiceId.IsEmpty()) {
     return NS_ERROR_INVALID_ARG;
   }
 
   mServiceId = aServiceId;
   return NS_OK;
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVChannelData::GetType(nsAString& aType)
 {
   aType = mType;
   return NS_OK;
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVChannelData::SetType(const nsAString& aType)
 {
   if (aType.IsEmpty()) {
     return NS_ERROR_INVALID_ARG;
   }
 
   if (TVChannelType::EndGuard_ == ToTVChannelType(aType)) {
     return NS_ERROR_INVALID_ARG;
   }
 
   mType = aType;
   return NS_OK;
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVChannelData::GetNumber(nsAString& aNumber)
 {
   aNumber = mNumber;
   return NS_OK;
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVChannelData::SetNumber(const nsAString& aNumber)
 {
   if (aNumber.IsEmpty()) {
     return NS_ERROR_INVALID_ARG;
   }
 
   mNumber = aNumber;
   return NS_OK;
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVChannelData::GetName(nsAString& aName)
 {
   aName = mName;
   return NS_OK;
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVChannelData::SetName(const nsAString& aName)
 {
   if (aName.IsEmpty()) {
     return NS_ERROR_INVALID_ARG;
   }
 
   mName = aName;
   return NS_OK;
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVChannelData::GetIsEmergency(bool *aIsEmergency)
 {
   *aIsEmergency = mIsEmergency;
   return NS_OK;
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVChannelData::SetIsEmergency(bool aIsEmergency)
 {
   mIsEmergency = aIsEmergency;
   return NS_OK;
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVChannelData::GetIsFree(bool *aIsFree)
 {
   *aIsFree = mIsFree;
   return NS_OK;
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVChannelData::SetIsFree(bool aIsFree)
 {
   mIsFree = aIsFree;
   return NS_OK;
 }
 
 
 /*
@@ -290,126 +290,126 @@ TVProgramData::~TVProgramData()
   if (mAudioLanguages) {
     NS_FREE_XPCOM_ALLOCATED_POINTER_ARRAY(mAudioLanguageCount, mAudioLanguages);
   }
   if (mSubtitleLanguages) {
     NS_FREE_XPCOM_ALLOCATED_POINTER_ARRAY(mSubtitleLanguageCount, mSubtitleLanguages);
   }
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVProgramData::GetEventId(nsAString& aEventId)
 {
   aEventId = mEventId;
   return NS_OK;
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVProgramData::SetEventId(const nsAString& aEventId)
 {
   if (aEventId.IsEmpty()) {
     return NS_ERROR_INVALID_ARG;
   }
 
   mEventId = aEventId;
   return NS_OK;
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVProgramData::GetTitle(nsAString& aTitle)
 {
   aTitle = mTitle;
   return NS_OK;
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVProgramData::SetTitle(const nsAString& aTitle)
 {
   if (aTitle.IsEmpty()) {
     return NS_ERROR_INVALID_ARG;
   }
 
   mTitle = aTitle;
   return NS_OK;
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVProgramData::GetStartTime(uint64_t *aStartTime)
 {
   *aStartTime = mStartTime;
   return NS_OK;
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVProgramData::SetStartTime(uint64_t aStartTime)
 {
   mStartTime = aStartTime;
   return NS_OK;
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVProgramData::GetDuration(uint64_t *aDuration)
 {
   *aDuration = mDuration;
   return NS_OK;
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVProgramData::SetDuration(uint64_t aDuration)
 {
   mDuration = aDuration;
   return NS_OK;
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVProgramData::GetDescription(nsAString& aDescription)
 {
   aDescription = mDescription;
   return NS_OK;
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVProgramData::SetDescription(const nsAString& aDescription)
 {
   mDescription = aDescription;
   return NS_OK;
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVProgramData::GetRating(nsAString& aRating)
 {
   aRating = mRating;
   return NS_OK;
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVProgramData::SetRating(const nsAString& aRating)
 {
   mRating = aRating;
   return NS_OK;
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVProgramData::GetAudioLanguages(uint32_t* aCount,
                                  char*** aLanguages)
 {
   *aCount = mAudioLanguageCount;
 
   char** languages = (mAudioLanguageCount > 0) ?
                      static_cast<char **>(moz_xmalloc(mAudioLanguageCount * sizeof(char*))) :
                      nullptr;
   for (uint32_t i = 0; i < mAudioLanguageCount; i++) {
     languages[i] = NS_strdup(mAudioLanguages[i]);
   }
 
   *aLanguages = languages;
   return NS_OK;
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVProgramData::SetAudioLanguages(uint32_t aCount,
                                  const char** aLanguages)
 {
   if (aCount > 0) {
     NS_ENSURE_ARG_POINTER(aLanguages);
   }
 
   if (mAudioLanguages) {
@@ -423,34 +423,34 @@ TVProgramData::SetAudioLanguages(uint32_
                     nullptr;
   for (uint32_t i = 0; i < mAudioLanguageCount; i++) {
     mAudioLanguages[i] = NS_strdup(aLanguages[i]);
   }
 
   return NS_OK;
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVProgramData::GetSubtitleLanguages(uint32_t* aCount,
                                     char*** aLanguages)
 {
   *aCount = mSubtitleLanguageCount;
 
   char** languages = (mSubtitleLanguageCount > 0) ?
                      static_cast<char **>(moz_xmalloc(mSubtitleLanguageCount * sizeof(char*))) :
                      nullptr;
   for (uint32_t i = 0; i < mSubtitleLanguageCount; i++) {
     languages[i] = NS_strdup(mSubtitleLanguages[i]);
   }
 
   *aLanguages = languages;
   return NS_OK;
 }
 
-/* virtual */ NS_IMETHODIMP
+NS_IMETHODIMP
 TVProgramData::SetSubtitleLanguages(uint32_t aCount,
                                     const char** aLanguages)
 {
   if (aCount > 0) {
     NS_ENSURE_ARG_POINTER(aLanguages);
   }
 
   if (mSubtitleLanguages) {