Backed out changeset 61637891db5f (bug 1377158)
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Tue, 25 Jul 2017 14:33:53 +0200
changeset 419537 1bcb249ab4302e7aee3d4464c603eda9fa652627
parent 419536 a013e95212fcdc459484be58815e309bca684e83
child 419538 941e995a4a30f7f4922a7fc2e664f750c210bba6
push id7566
push usermtabara@mozilla.com
push dateWed, 02 Aug 2017 08:25:16 +0000
treeherdermozilla-beta@86913f512c3c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1377158
milestone56.0a1
backs out61637891db5f8aca01881440c83ee7a4d24306b3
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
Backed out changeset 61637891db5f (bug 1377158)
image/VectorImage.cpp
image/VectorImage.h
--- a/image/VectorImage.cpp
+++ b/image/VectorImage.cpp
@@ -330,26 +330,24 @@ SVGDrawingCallback::operator()(gfxContex
 NS_IMPL_ISUPPORTS(VectorImage,
                   imgIContainer,
                   nsIStreamListener,
                   nsIRequestObserver)
 
 //------------------------------------------------------------------------------
 // Constructor / Destructor
 
-VectorImage::VectorImage(ImageURL* aURI /* = nullptr */,
-                         StyleBackendType aStyleBackendType /* = StyleBackendType::None */) :
+VectorImage::VectorImage(ImageURL* aURI /* = nullptr */) :
   ImageResource(aURI), // invoke superclass's constructor
   mLockCount(0),
   mIsInitialized(false),
   mIsFullyLoaded(false),
   mIsDrawing(false),
   mHaveAnimations(false),
-  mHasPendingInvalidation(false),
-  mStyleBackendType(aStyleBackendType)
+  mHasPendingInvalidation(false)
 { }
 
 VectorImage::~VectorImage()
 {
   CancelAllListeners();
   SurfaceCache::RemoveImage(ImageKey(this));
 }
 
@@ -1179,17 +1177,17 @@ VectorImage::GetFrameIndex(uint32_t aWhi
 
 //******************************************************************************
 NS_IMETHODIMP
 VectorImage::OnStartRequest(nsIRequest* aRequest, nsISupports* aCtxt)
 {
   MOZ_ASSERT(!mSVGDocumentWrapper,
              "Repeated call to OnStartRequest -- can this happen?");
 
-  mSVGDocumentWrapper = new SVGDocumentWrapper(mStyleBackendType);
+  mSVGDocumentWrapper = new SVGDocumentWrapper();
   nsresult rv = mSVGDocumentWrapper->OnStartRequest(aRequest, aCtxt);
   if (NS_FAILED(rv)) {
     mSVGDocumentWrapper = nullptr;
     mError = true;
     return rv;
   }
 
   // ProgressTracker::SyncNotifyProgress may release us, so ensure we
--- a/image/VectorImage.h
+++ b/image/VectorImage.h
@@ -67,18 +67,17 @@ public:
 
   // Callbacks for SVGLoadEventListener.
   void OnSVGDocumentLoaded();
   void OnSVGDocumentError();
 
   virtual void ReportUseCounters() override;
 
 protected:
-  explicit VectorImage(ImageURL* aURI = nullptr,
-                       StyleBackendType aStyleBackendType = StyleBackendType::None);
+  explicit VectorImage(ImageURL* aURI = nullptr);
   virtual ~VectorImage();
 
   virtual nsresult StartAnimation() override;
   virtual nsresult StopAnimation() override;
   virtual bool     ShouldAnimate() override;
 
 private:
   /// Attempt to find a cached surface matching @aParams in the SurfaceCache.
@@ -119,17 +118,17 @@ private:
   bool           mDiscardable;            // Are we discardable?
   bool           mIsFullyLoaded;          // Has the SVG document finished
                                           // loading?
   bool           mIsDrawing;              // Are we currently drawing?
   bool           mHaveAnimations;         // Is our SVG content SMIL-animated?
                                           // (Only set after mIsFullyLoaded.)
   bool           mHasPendingInvalidation; // Invalidate observers next refresh
                                           // driver tick.
-  StyleBackendType mStyleBackendType;     // The style backend used for this image document.
+
   friend class ImageFactory;
 };
 
 inline NS_IMETHODIMP VectorImage::GetAnimationMode(uint16_t* aAnimationMode) {
   return GetAnimationModeInternal(aAnimationMode);
 }
 
 inline NS_IMETHODIMP VectorImage::SetAnimationMode(uint16_t aAnimationMode) {