Bug 649440 followup: remove some obsolete MOZ_ENABLE_LIBXUL ifdefs in VectorImage. r=joe
authorDaniel Holbert <dholbert@cs.stanford.edu>
Thu, 28 Apr 2011 19:11:16 -0700
changeset 68740 cdbeb9df92d3f649531c0e9b15ab9fff6a7374bf
parent 68739 340131166fbc21ea28918ccade70e55b8b9ae4f6
child 68741 3b1fa83ffc99714e0cd8dc85c00ccc70f69b6d91
push id19730
push userdholbert@mozilla.com
push dateFri, 29 Apr 2011 02:13:41 +0000
treeherdermozilla-central@3b1fa83ffc99 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjoe
bugs649440
milestone6.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 649440 followup: remove some obsolete MOZ_ENABLE_LIBXUL ifdefs in VectorImage. r=joe
modules/libpr0n/src/VectorImage.cpp
modules/libpr0n/src/VectorImage.h
--- a/modules/libpr0n/src/VectorImage.cpp
+++ b/modules/libpr0n/src/VectorImage.cpp
@@ -55,17 +55,16 @@
 #include "gfxUtils.h"
 #include "nsSVGSVGElement.h"
 
 using namespace mozilla::dom;
 
 namespace mozilla {
 namespace imagelib {
 
-#ifdef MOZ_ENABLE_LIBXUL
 // Helper-class: SVGRootRenderingObserver
 class SVGRootRenderingObserver : public nsSVGRenderingObserver {
 public:
   SVGRootRenderingObserver(SVGDocumentWrapper* aDocWrapper,
                            VectorImage*        aVectorImage)
     : nsSVGRenderingObserver(),
       mDocWrapper(aDocWrapper),
       mVectorImage(aVectorImage)
@@ -119,17 +118,16 @@ protected:
       mInObserverList = PR_TRUE;
     }
   }
 
   // Private data
   nsRefPtr<SVGDocumentWrapper> mDocWrapper;
   VectorImage* mVectorImage;   // Raw pointer because it owns me.
 };
-#endif // MOZ_ENABLE_LIBXUL
 
 // Helper-class: SVGDrawingCallback
 class SVGDrawingCallback : public gfxDrawingCallback {
 public:
   SVGDrawingCallback(SVGDocumentWrapper* aSVGDocumentWrapper,
                      const nsIntRect& aViewport,
                      PRUint32 aImageFlags) :
     mSVGDocumentWrapper(aSVGDocumentWrapper),
@@ -664,20 +662,18 @@ VectorImage::OnStopRequest(nsIRequest* a
     // icon.  See bug 594505.
     mError = PR_TRUE;
     return rv;
   }
 
   mIsFullyLoaded = PR_TRUE;
   mHaveAnimations = mSVGDocumentWrapper->IsAnimated();
 
-#ifdef MOZ_ENABLE_LIBXUL
   // Start listening to our image for rendering updates
   mRenderingObserver = new SVGRootRenderingObserver(mSVGDocumentWrapper, this);
-#endif // MOZ_ENABLE_LIBXUL
 
   // Tell *our* observers that we're done loading
   nsCOMPtr<imgIDecoderObserver> observer = do_QueryReferent(mObserver);
   if (observer) {
     // NOTE: This signals that width/height are available.
     observer->OnStartContainer(nsnull, this);
 
     observer->FrameChanged(this, &nsIntRect::GetMaxSizedIntRect());
--- a/modules/libpr0n/src/VectorImage.h
+++ b/modules/libpr0n/src/VectorImage.h
@@ -96,19 +96,17 @@ public:
 protected:
   virtual nsresult StartAnimation();
   virtual nsresult StopAnimation();
   virtual PRBool   ShouldAnimate();
 
 private:
   nsWeakPtr                          mObserver;   //! imgIDecoderObserver
   nsRefPtr<SVGDocumentWrapper>       mSVGDocumentWrapper;
-#ifdef MOZ_ENABLE_LIBXUL
   nsRefPtr<SVGRootRenderingObserver> mRenderingObserver;
-#endif // MOZ_ENABLE_LIBXUL
 
   nsIntRect      mRestrictedRegion;       // If we were created by
                                           // ExtractFrame, this is the region
                                           // that we're restricted to using.
                                           // Otherwise, this is ignored.
 
   nsIntSize      mLastRenderedSize;       // The viewport-size that we've
                                           // most recently passed to