From 4dbefdf0a1e7c3f2e62a3139172bc57634b20bf7 Mon Sep 17 00:00:00 2001
From: Nicolas Silva <nsilva@mozilla.com>
Date: Sat, 21 Jun 2014 19:51:07 +0200
Subject: [PATCH] Bug 783043 - Backed out changeset 29bc4fa125d9 (commit
 message). r=me

---
 gfx/layers/ImageContainer.h          | 5 -----
 gfx/layers/basic/BasicImageLayer.cpp | 7 -------
 2 files changed, 12 deletions(-)

diff --git a/gfx/layers/ImageContainer.h b/gfx/layers/ImageContainer.h
index 0be6b5b0c2f..806d5ed2a9f 100644
--- a/gfx/layers/ImageContainer.h
+++ b/gfx/layers/ImageContainer.h
@@ -511,11 +511,6 @@ public:
     mImageFactory = aFactory ? aFactory : new ImageFactory();
   }
 
-  ImageFactory* GetImageFactory() const
-  {
-    return mImageFactory;
-  }
-
   /**
    * Returns the time at which the currently contained image was first
    * painted.  This is reset every time a new image is set as the current
diff --git a/gfx/layers/basic/BasicImageLayer.cpp b/gfx/layers/basic/BasicImageLayer.cpp
index 59e8458e50b..3e0bfb9b237 100644
--- a/gfx/layers/basic/BasicImageLayer.cpp
+++ b/gfx/layers/basic/BasicImageLayer.cpp
@@ -74,7 +74,6 @@ BasicImageLayer::Paint(DrawTarget* aDT,
     return;
   }
 
-  nsRefPtr<ImageFactory> originalIF = mContainer->GetImageFactory();
   mContainer->SetImageFactory(mManager->IsCompositingCheap() ? nullptr : BasicManager()->GetImageFactory());
 
   RefPtr<gfx::SourceSurface> surface;
@@ -83,7 +82,6 @@ BasicImageLayer::Paint(DrawTarget* aDT,
   gfx::IntSize size = mSize = autoLock.GetSize();
 
   if (!surface || !surface->IsValid()) {
-    mContainer->SetImageFactory(originalIF);
     return;
   }
 
@@ -92,7 +90,6 @@ BasicImageLayer::Paint(DrawTarget* aDT,
                    DrawOptions(GetEffectiveOpacity(), GetEffectiveOperator(this)),
                    aMaskLayer);
 
-  mContainer->SetImageFactory(originalIF);
   GetContainer()->NotifyPaintedImage(image);
 }
 
@@ -105,7 +102,6 @@ BasicImageLayer::GetAndPaintCurrentImage(DrawTarget* aTarget,
     return;
   }
 
-  nsRefPtr<ImageFactory> originalIF = mContainer->GetImageFactory();
   mContainer->SetImageFactory(mManager->IsCompositingCheap() ?
                               nullptr :
                               BasicManager()->GetImageFactory());
@@ -115,7 +111,6 @@ BasicImageLayer::GetAndPaintCurrentImage(DrawTarget* aTarget,
     mContainer->LockCurrentAsSourceSurface(&size, &image);
 
   if (!surf) {
-    mContainer->SetImageFactory(originalIF);
     return;
   }
 
@@ -131,8 +126,6 @@ BasicImageLayer::GetAndPaintCurrentImage(DrawTarget* aTarget,
     GetContainer()->NotifyPaintedImage(image);
   }
 
-  mContainer->SetImageFactory(originalIF);
-
   mContainer->UnlockCurrentImage();
 }