Backed out changeset 85099e5d1e2a (bug 1374548) for being the likely cause of the spike in crashes from bug 1370089 a=backout

gfx/layers/ImageContainer.h

@@ -693,23 +693,6 @@ public:
     return mImages.IsEmpty() ? nullptr : mImages[0].mImage.get();
   }
 
-  Image* GetImage(TimeStamp aTimeStamp) const
-  {
-    if (mImages.IsEmpty()) {
-      return nullptr;
-    }
-
-    MOZ_ASSERT(!aTimeStamp.IsNull());
-    uint32_t chosenIndex = 0;
-
-    while (chosenIndex + 1 < mImages.Length() &&
-           mImages[chosenIndex + 1].mTimeStamp <= aTimeStamp) {
-      ++chosenIndex;
-    }
-
-    return mImages[chosenIndex].mImage.get();
-  }
-
 private:
   AutoTArray<ImageContainer::OwningImage,4> mImages;
 };

gfx/layers/basic/BasicImageLayer.cpp

@@ -72,7 +72,7 @@ BasicImageLayer::Paint(DrawTarget* aDT,
   mContainer->SetImageFactory(mManager->IsCompositingCheap() ? nullptr : BasicManager()->GetImageFactory());
 
   AutoLockImage autoLock(mContainer);
-  Image *image = autoLock.GetImage(BasicManager()->GetCompositionTime());
+  Image *image = autoLock.GetImage();
   if (!image) {
     mContainer->SetImageFactory(originalIF);
     return;

gfx/layers/basic/BasicLayerManager.cpp

@@ -572,8 +572,6 @@ BasicLayerManager::EndTransactionInternal(DrawPaintedLayerCallback aCallback,
   NS_ASSERTION(InConstruction(), "Should be in construction phase");
   mPhase = PHASE_DRAWING;
 
-  SetCompositionTime(TimeStamp::Now());
-
   RenderTraceLayers(mRoot, "FF00");
 
   mTransactionIncomplete = false;

gfx/layers/basic/BasicLayers.h

@@ -13,7 +13,6 @@
 #include "mozilla/Attributes.h"         // for override
 #include "mozilla/WidgetUtils.h"        // for ScreenRotation
 #include "mozilla/layers/LayersTypes.h"  // for BufferMode, LayersBackend, etc
-#include "mozilla/TimeStamp.h"
 #include "nsAString.h"
 #include "nsCOMPtr.h"                   // for already_AddRefed
 #include "nsISupportsImpl.h"            // for gfxContext::AddRef, etc
@@ -169,11 +168,6 @@ public:
   virtual int32_t GetMaxTextureSize() const override { return INT32_MAX; }
   bool CompositorMightResample() { return mCompositorMightResample; }
 
-  TimeStamp GetCompositionTime() const
-  {
-    return mCompositionTime;
-  }
-
 protected:
   enum TransactionPhase {
     PHASE_NONE, PHASE_CONSTRUCTION, PHASE_DRAWING, PHASE_FORWARD
@@ -204,11 +198,6 @@ protected:
 
   void FlashWidgetUpdateArea(gfxContext* aContext);
 
-  void SetCompositionTime(TimeStamp aTimeStamp)
-  {
-    mCompositionTime = aTimeStamp;
-  }
-
   // Widget whose surface should be used as the basis for PaintedLayer
   // buffers.
   nsIWidget* mWidget;
@@ -224,8 +213,6 @@ protected:
   bool mUsingDefaultTarget;
   bool mTransactionIncomplete;
   bool mCompositorMightResample;
-
-  TimeStamp mCompositionTime;
 };
 
 } // namespace layers