Backed out changeset 29e2e6dd82d2 (bug 1343341)

image/DynamicImage.cpp

@@ -80,7 +80,7 @@ DynamicImage::OnImageDataComplete(nsIRequest* aRequest,
 }
 
 void
-DynamicImage::OnSurfaceDiscarded(SurfaceKey aSurfaceKey)
+DynamicImage::OnSurfaceDiscarded()
 { }
 
 void

image/DynamicImage.h

@@ -53,7 +53,7 @@ public:
                                        nsresult aStatus,
                                        bool aLastPart) override;
 
-  virtual void OnSurfaceDiscarded(SurfaceKey aSurfaceKey) override;
+  virtual void OnSurfaceDiscarded() override;
 
   virtual void SetInnerWindowID(uint64_t aInnerWindowId) override;
   virtual uint64_t InnerWindowID() const override;

image/Image.h

@@ -216,7 +216,7 @@ public:
   /**
    * Called when the SurfaceCache discards a surface belonging to this image.
    */
-  virtual void OnSurfaceDiscarded(SurfaceKey aSurfaceKey) = 0;
+  virtual void OnSurfaceDiscarded() = 0;
 
   virtual void SetInnerWindowID(uint64_t aInnerWindowId) = 0;
   virtual uint64_t InnerWindowID() const = 0;
@@ -256,7 +256,7 @@ public:
   }
 #endif
 
-  virtual void OnSurfaceDiscarded(SurfaceKey aSurfaceKey) override { }
+  virtual void OnSurfaceDiscarded() override { }
 
   virtual void SetInnerWindowID(uint64_t aInnerWindowId) override
   {

image/ImageWrapper.cpp

@@ -88,9 +88,9 @@ ImageWrapper::OnImageDataComplete(nsIRequest* aRequest,
 }
 
 void
-ImageWrapper::OnSurfaceDiscarded(SurfaceKey aSurfaceKey)
+ImageWrapper::OnSurfaceDiscarded()
 {
-  return mInnerImage->OnSurfaceDiscarded(aSurfaceKey);
+  return mInnerImage->OnSurfaceDiscarded();
 }
 
 void

image/ImageWrapper.h

@@ -45,7 +45,7 @@ public:
                                        nsresult aStatus,
                                        bool aLastPart) override;
 
-  virtual void OnSurfaceDiscarded(SurfaceKey aSurfaceKey) override;
+  virtual void OnSurfaceDiscarded() override;
 
   virtual void SetInnerWindowID(uint64_t aInnerWindowId) override;
   virtual uint64_t InnerWindowID() const override;

image/RasterImage.cpp

@@ -420,11 +420,11 @@ RasterImage::WillDrawOpaqueNow()
 }
 
 void
-RasterImage::OnSurfaceDiscarded(SurfaceKey aSurfaceKey)
+RasterImage::OnSurfaceDiscarded()
 {
   MOZ_ASSERT(mProgressTracker);
 
-  if (mAnimationState && aSurfaceKey.Playback() == PlaybackType::eAnimated) {
+  if (mAnimationState) {
     MOZ_ASSERT(gfxPrefs::ImageMemAnimatedDiscardable());
     mAnimationState->SetDiscarded(true);
   }

image/RasterImage.h

@@ -164,7 +164,7 @@ public:
   virtual nsresult StopAnimation() override;
 
   // Methods inherited from Image
-  virtual void OnSurfaceDiscarded(SurfaceKey aSurfaceKey) override;
+  virtual void OnSurfaceDiscarded() override;
 
   virtual size_t SizeOfSourceWithComputedFallback(MallocSizeOf aMallocSizeOf)
     const override;

image/SurfaceCache.cpp

@@ -502,7 +502,7 @@ public:
 
     // If the surface was not a placeholder, tell its image that we discarded it.
     if (!aSurface->IsPlaceholder()) {
-      static_cast<Image*>(imageKey)->OnSurfaceDiscarded(aSurface->GetSurfaceKey());
+      static_cast<Image*>(imageKey)->OnSurfaceDiscarded();
     }
 
     StopTracking(aSurface);

image/VectorImage.cpp

@@ -1123,7 +1123,7 @@ VectorImage::RequestDiscard()
 }
 
 void
-VectorImage::OnSurfaceDiscarded(SurfaceKey aSurfaceKey)
+VectorImage::OnSurfaceDiscarded()
 {
   MOZ_ASSERT(mProgressTracker);
 

image/VectorImage.h

@@ -49,7 +49,7 @@ public:
                                        nsresult aResult,
                                        bool aLastPart) override;
 
-  virtual void OnSurfaceDiscarded(SurfaceKey aSurfaceKey) override;
+  virtual void OnSurfaceDiscarded() override;
 
   /**
    * Callback for SVGRootRenderingObserver.