Backed out changeset a5d2e586777c (bug 1220082) for bustage. r=bustage on CLOSED TREE

gfx/layers/ImageContainer.cpp

@@ -289,19 +289,13 @@ ImageContainer::ClearAllImages()
 
 void
 ImageContainer::SetCurrentImageInTransaction(Image *aImage)
-{
-  nsAutoTArray<NonOwningImage,1> images;
-  images.AppendElement(NonOwningImage(aImage));
-  SetCurrentImagesInTransaction(images);
-}
-
-void
-ImageContainer::SetCurrentImagesInTransaction(const nsTArray<NonOwningImage>& aImages)
 {
   NS_ASSERTION(NS_IsMainThread(), "Should be on main thread.");
   NS_ASSERTION(!mImageClient, "Should use async image transfer with ImageBridge.");
 
-  SetCurrentImageInternal(aImages);
+  AutoTArray<NonOwningImage,1> images;
+  images.AppendElement(NonOwningImage(aImage));
+  SetCurrentImageInternal(images);
 }
 
 bool ImageContainer::IsAsync() const

gfx/layers/ImageContainer.h

@@ -434,7 +434,6 @@ public:
    * You won't get meaningful painted/dropped counts when using this method.
    */
   void SetCurrentImageInTransaction(Image* aImage);
-  void SetCurrentImagesInTransaction(const nsTArray<NonOwningImage>& aImages);
 
   /**
    * Returns true if this ImageContainer uses the ImageBridge IPDL protocol.

image/RasterImage.cpp

@@ -78,8 +78,6 @@ RasterImage::RasterImage(ImageURL* aURI /* = nullptr */) :
   mLockCount(0),
   mDecodeCount(0),
   mRequestedSampleSize(0),
-  mImageProducerID(ImageContainer::AllocateProducerID()),
-  mLastFrameID(0),
   mLastImageContainerDrawResult(DrawResult::NOT_READY),
 #ifdef DEBUG
   mFramesNotified(0),
@@ -693,11 +691,7 @@ RasterImage::GetImageContainer(LayerManager* aManager, uint32_t aFlags)
   // |image| holds a reference to a SourceSurface which in turn holds a lock on
   // the current frame's VolatileBuffer, ensuring that it doesn't get freed as
   // long as the layer system keeps this ImageContainer alive.
-  nsAutoTArray<ImageContainer::NonOwningImage, 1> imageList;
-  imageList.AppendElement(ImageContainer::NonOwningImage(image, TimeStamp(),
-                                                         mLastFrameID++,
-                                                         mImageProducerID));
-  container->SetCurrentImagesInTransaction(imageList);
+  container->SetCurrentImageInTransaction(image);
 
   mLastImageContainerDrawResult = drawResult;
   mImageContainer = container;
@@ -724,9 +718,7 @@ RasterImage::UpdateImageContainer()
 
   mLastImageContainerDrawResult = drawResult;
   AutoTArray<ImageContainer::NonOwningImage, 1> imageList;
-  imageList.AppendElement(ImageContainer::NonOwningImage(image, TimeStamp(),
-                                                         mLastFrameID++,
-                                                         mImageProducerID));
+  imageList.AppendElement(ImageContainer::NonOwningImage(image));
   container->SetCurrentImages(imageList);
 }
 

image/RasterImage.h

@@ -36,7 +36,6 @@
 #include "mozilla/TimeStamp.h"
 #include "mozilla/WeakPtr.h"
 #include "mozilla/UniquePtr.h"
-#include "ImageContainer.h"
 #ifdef DEBUG
   #include "imgIContainerDebug.h"
 #endif
@@ -368,9 +367,6 @@ private: // data
   // the layer system needs it.
   WeakPtr<layers::ImageContainer> mImageContainer;
 
-  layers::ImageContainer::ProducerID mImageProducerID;
-  layers::ImageContainer::FrameID mLastFrameID
-
   // If mImageContainer is non-null, this contains the DrawResult we obtained
   // the last time we updated it.
   DrawResult mLastImageContainerDrawResult;