Bug 1291071 (Part 1) - Pass ImageMetadata explicitly to FinalizeDecod…

…er. r=edwin
iaxat · Aug 6, 2016 · adee556 · adee556
1 parent 2fed3b7
commit adee556
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/image/Decoder.h b/image/Decoder.h
@@ -320,7 +320,8 @@ class Decoder
 
   virtual Telemetry::ID SpeedHistogram();
 
-  ImageMetadata& GetImageMetadata() { return mImageMetadata; }
+  /// @return the metadata we collected about this image while decoding.
+  const ImageMetadata& GetImageMetadata() { return mImageMetadata; }
 
   /**
    * @return a weak pointer to the image associated with this decoder. Illegal

diff --git a/image/IDecodingTask.cpp b/image/IDecodingTask.cpp
@@ -63,18 +63,21 @@ IDecodingTask::NotifyDecodeComplete(NotNull<RasterImage*> aImage,
   MOZ_ASSERT(aDecoder->HasError() || !aDecoder->InFrame(),
              "Decode complete in the middle of a frame?");
 
+  // Capture the decoder's state.
+  ImageMetadata metadata = aDecoder->GetImageMetadata();
+
   // Synchronously notify if we can.
   if (NS_IsMainThread() &&
       !(aDecoder->GetDecoderFlags() & DecoderFlags::ASYNC_NOTIFY)) {
-    aImage->FinalizeDecoder(aDecoder);
+    aImage->FinalizeDecoder(aDecoder, metadata);
     return;
   }
 
   // We're forced to notify asynchronously.
   NotNull<RefPtr<RasterImage>> image = aImage;
   NotNull<RefPtr<Decoder>> decoder = aDecoder;
   NS_DispatchToMainThread(NS_NewRunnableFunction([=]() -> void {
-    image->FinalizeDecoder(decoder.get());
+    image->FinalizeDecoder(decoder.get(), metadata);
   }));
 }
 

diff --git a/image/RasterImage.cpp b/image/RasterImage.cpp
@@ -1562,7 +1562,8 @@ RasterImage::NotifyProgress(Progress aProgress,
 }
 
 void
-RasterImage::FinalizeDecoder(Decoder* aDecoder)
+RasterImage::FinalizeDecoder(Decoder* aDecoder,
+                             const ImageMetadata& aMetadata)
 {
   MOZ_ASSERT(NS_IsMainThread());
   MOZ_ASSERT(aDecoder);
@@ -1576,7 +1577,7 @@ RasterImage::FinalizeDecoder(Decoder* aDecoder)
   }
 
   // Record all the metadata the decoder gathered about this image.
-  bool metadataOK = SetMetadata(aDecoder->GetImageMetadata(), wasMetadata);
+  bool metadataOK = SetMetadata(aMetadata, wasMetadata);
   if (!metadataOK) {
     // This indicates a serious error that requires us to discard all existing
     // surfaces and redecode to recover. We'll drop the results from this
@@ -1588,7 +1589,7 @@ RasterImage::FinalizeDecoder(Decoder* aDecoder)
     return;
   }
 
-  MOZ_ASSERT(mError || mHasSize || !aDecoder->HasSize(),
+  MOZ_ASSERT(mError || mHasSize || !aMetadata.HasSize(),
              "SetMetadata should've gotten a size");
 
   if (!wasMetadata && aDecoder->GetDecodeDone() && !aDecoder->WasAborted()) {

diff --git a/image/RasterImage.h b/image/RasterImage.h
@@ -28,6 +28,7 @@
 #include "DecodePool.h"
 #include "DecoderFactory.h"
 #include "FrameAnimator.h"
+#include "ImageMetadata.h"
 #include "Orientation.h"
 #include "nsIObserver.h"
 #include "mozilla/Attributes.h"
@@ -200,7 +201,8 @@ class RasterImage final : public ImageResource
    *
    * Main-thread only.
    */
-  void FinalizeDecoder(Decoder* aDecoder);
+  void FinalizeDecoder(Decoder* aDecoder,
+                       const ImageMetadata& aMetadata);
 
   // Helper method for FinalizeDecoder.
   void ReportDecoderError(Decoder* aDecoder);