From 8d7c886eb9e1e0ddfaf178847fce335d7a23501a Mon Sep 17 00:00:00 2001
From: Scott Johnson <sjohnson@mozilla.com>
Date: Fri, 7 Oct 2011 00:26:13 -0700
Subject: [PATCH] Backout cset 1da3cfb954b1 from bug 666446 while we sort out
 regressions

---
 modules/libpr0n/public/imgIContainer.idl | 12 ------------
 modules/libpr0n/src/RasterImage.cpp      |  8 --------
 modules/libpr0n/src/RasterImage.h        |  1 -
 modules/libpr0n/src/VectorImage.cpp      |  9 +--------
 modules/libpr0n/src/VectorImage.h        |  2 --
 5 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/modules/libpr0n/public/imgIContainer.idl b/modules/libpr0n/public/imgIContainer.idl
index 364b692357e1..01ce8df91bf3 100644
--- a/modules/libpr0n/public/imgIContainer.idl
+++ b/modules/libpr0n/public/imgIContainer.idl
@@ -56,10 +56,6 @@ interface imgIDecoderObserver;
 #include "limits.h"
 
 class nsIFrame;
-
-namespace mozilla {
-class TimeStamp;
-}
 %}
 
 [ptr] native gfxImageSurface(gfxImageSurface);
@@ -72,7 +68,6 @@ native gfxGraphicsFilter(gfxPattern::GraphicsFilter);
 [ref] native nsIntRect(nsIntRect);
 [ref] native nsIntSize(nsIntSize);
 [ptr] native nsIFrame(nsIFrame);
-[ref] native TimeStamp(mozilla::TimeStamp);
 
 /**
  * imgIContainer is the interface that represents an image. It allows
@@ -266,13 +261,6 @@ interface imgIContainer : nsISupports
     */
   void unlockImage();
 
-  /**
-    * Indicates that this imgIContainer has been triggered to update
-    * its internal animation state. Likely this should only be called
-    * from within nsImageFrame or objects of similar type.
-    */
-  [notxpcom] void requestRefresh([const] in TimeStamp aTime);
-
   /**
    * Animation mode Constants
    *   0 = normal
diff --git a/modules/libpr0n/src/RasterImage.cpp b/modules/libpr0n/src/RasterImage.cpp
index 429685438901..ac78b16a07cc 100644
--- a/modules/libpr0n/src/RasterImage.cpp
+++ b/modules/libpr0n/src/RasterImage.cpp
@@ -313,14 +313,6 @@ RasterImage::Init(imgIDecoderObserver *aObserver,
   return NS_OK;
 }
 
-//******************************************************************************
-/* [notxpcom] void requestRefresh ([const] in TimeStamp aTime); */
-NS_IMETHODIMP_(void)
-RasterImage::RequestRefresh(const mozilla::TimeStamp& aTime)
-{
-  // TODO: Implement me as part of b666446
-}
-
 //******************************************************************************
 /* [noscript] imgIContainer extractFrame(PRUint32 aWhichFrame,
  *                                       [const] in nsIntRect aRegion,
diff --git a/modules/libpr0n/src/RasterImage.h b/modules/libpr0n/src/RasterImage.h
index b1aae1b6b569..7318f48e1fa8 100644
--- a/modules/libpr0n/src/RasterImage.h
+++ b/modules/libpr0n/src/RasterImage.h
@@ -183,7 +183,6 @@ public:
   NS_SCRIPTABLE NS_IMETHOD LockImage(void);
   NS_SCRIPTABLE NS_IMETHOD UnlockImage(void);
   NS_SCRIPTABLE NS_IMETHOD ResetAnimation(void);
-  NS_IMETHOD_(void) RequestRefresh(const mozilla::TimeStamp& aTime);
   // END NS_DECL_IMGICONTAINER
 
   RasterImage(imgStatusTracker* aStatusTracker = nsnull);
diff --git a/modules/libpr0n/src/VectorImage.cpp b/modules/libpr0n/src/VectorImage.cpp
index 2e028e0ba816..a3fa3c0c4780 100644
--- a/modules/libpr0n/src/VectorImage.cpp
+++ b/modules/libpr0n/src/VectorImage.cpp
@@ -171,6 +171,7 @@ SVGDrawingCallback::operator()(gfxContext* aContext,
   gfxContextMatrixAutoSaveRestore contextMatrixRestorer(aContext);
   aContext->Multiply(gfxMatrix(aTransform).Invert());
 
+
   nsPresContext* presContext = presShell->GetPresContext();
   NS_ABORT_IF_FALSE(presContext, "pres shell w/out pres context");
 
@@ -328,14 +329,6 @@ VectorImage::GetWidth(PRInt32* aWidth)
   return NS_OK;
 }
 
-//******************************************************************************
-/* [notxpcom] void requestRefresh ([const] in TimeStamp aTime); */
-NS_IMETHODIMP_(void)
-VectorImage::RequestRefresh(const mozilla::TimeStamp& aTime)
-{
-  // TODO: Implement for b666446.
-}
-
 //******************************************************************************
 /* readonly attribute PRInt32 height; */
 NS_IMETHODIMP
diff --git a/modules/libpr0n/src/VectorImage.h b/modules/libpr0n/src/VectorImage.h
index e3982a2e6b56..d12b9b89d117 100644
--- a/modules/libpr0n/src/VectorImage.h
+++ b/modules/libpr0n/src/VectorImage.h
@@ -42,7 +42,6 @@
 #include "Image.h"
 #include "nsIStreamListener.h"
 #include "nsWeakReference.h"
-#include "mozilla/TimeStamp.h"
 
 class imgIDecoderObserver;
 
@@ -77,7 +76,6 @@ public:
   NS_SCRIPTABLE NS_IMETHOD LockImage(void);
   NS_SCRIPTABLE NS_IMETHOD UnlockImage(void);
   NS_SCRIPTABLE NS_IMETHOD ResetAnimation(void);
-  NS_IMETHOD_(void) RequestRefresh(const mozilla::TimeStamp& aTime);
   // END NS_DECL_IMGICONTAINER
 
   VectorImage(imgStatusTracker* aStatusTracker = nsnull);