Bug 1139225 Followup - Replace MOZ_OVERRIDE with override and MOZ_FINAL with final in imgRequest.cpp on a CLOSED TREE.
authorSeth Fowler <seth@mozilla.com>
Mon, 23 Mar 2015 20:00:42 -0700
changeset 265543 f687743cc499b25eeca008639abc506640de3eaf
parent 265542 29219668983e3112203d32d913bd4ece318bf187
child 265544 1d410fe6bf992bc69daf3dac318ecf023ef3bacd
push id830
push userraliiev@mozilla.com
push dateFri, 19 Jun 2015 19:24:37 +0000
treeherdermozilla-release@932614382a68 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1139225
milestone39.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 1139225 Followup - Replace MOZ_OVERRIDE with override and MOZ_FINAL with final in imgRequest.cpp on a CLOSED TREE.
image/src/imgRequest.cpp
--- a/image/src/imgRequest.cpp
+++ b/image/src/imgRequest.cpp
@@ -826,17 +826,17 @@ imgRequest::CheckListenerChain()
 {
   // TODO Might need more checking here.
   NS_ASSERTION(NS_IsMainThread(), "Should be on the main thread!");
   return NS_OK;
 }
 
 /** nsIStreamListener methods **/
 
-struct NewPartResult MOZ_FINAL
+struct NewPartResult final
 {
   explicit NewPartResult(Image* aExistingImage)
     : mImage(aExistingImage)
     , mIsFirstPart(!aExistingImage)
     , mSucceeded(false)
   { }
 
   nsAutoCString mContentType;
@@ -919,28 +919,28 @@ PrepareForNewPart(nsIRequest* aRequest, 
     // indicates a bad content type) without cancelling the load, because
     // subsequent parts might be fine.
     result.mSucceeded = true;
   }
 
   return result;
 }
 
-class FinishPreparingForNewPartRunnable MOZ_FINAL : public nsRunnable
+class FinishPreparingForNewPartRunnable final : public nsRunnable
 {
 public:
   FinishPreparingForNewPartRunnable(imgRequest* aImgRequest,
                                     NewPartResult&& aResult)
     : mImgRequest(aImgRequest)
     , mResult(aResult)
   {
     MOZ_ASSERT(aImgRequest);
   }
 
-  NS_IMETHOD Run() MOZ_OVERRIDE
+  NS_IMETHOD Run() override
   {
     mImgRequest->FinishPreparingForNewPart(mResult);
     return NS_OK;
   }
 
 private:
   nsRefPtr<imgRequest> mImgRequest;
   NewPartResult mResult;