Backed out changeset 9a76090acf6e (bug 1377158)
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Tue, 25 Jul 2017 14:33:56 +0200
changeset 419538 941e995a4a30f7f4922a7fc2e664f750c210bba6
parent 419537 1bcb249ab4302e7aee3d4464c603eda9fa652627
child 419539 1f122ddfeedd498bbf4d3d452a68e0c17f35b789
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 out9a76090acf6e300a8e00b5fb2e0cb122837f271e
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 9a76090acf6e (bug 1377158)
image/SVGDocumentWrapper.cpp
image/SVGDocumentWrapper.h
--- a/image/SVGDocumentWrapper.cpp
+++ b/image/SVGDocumentWrapper.cpp
@@ -17,18 +17,16 @@
 #include "nsIObserverService.h"
 #include "nsIParser.h"
 #include "nsIPresShell.h"
 #include "nsIRequest.h"
 #include "nsIStreamListener.h"
 #include "nsIXMLContentSink.h"
 #include "nsNetCID.h"
 #include "nsComponentManagerUtils.h"
-#include "nsContentDLF.h"
-#include "nsContentCID.h"
 #include "nsSMILAnimationController.h"
 #include "nsServiceManagerUtils.h"
 #include "mozilla/dom/SVGSVGElement.h"
 #include "nsSVGEffects.h"
 #include "mozilla/dom/SVGAnimatedLength.h"
 #include "nsMimeTypes.h"
 #include "DOMSVGLength.h"
 #include "nsDocument.h"
@@ -45,19 +43,18 @@ using namespace gfx;
 namespace image {
 
 NS_IMPL_ISUPPORTS(SVGDocumentWrapper,
                   nsIStreamListener,
                   nsIRequestObserver,
                   nsIObserver,
                   nsISupportsWeakReference)
 
-SVGDocumentWrapper::SVGDocumentWrapper(StyleBackendType aStyleBackendType /* = StyleBackendType::None */)
-  : mStyleBackendType(aStyleBackendType),
-    mIgnoreInvalidation(false),
+SVGDocumentWrapper::SVGDocumentWrapper()
+  : mIgnoreInvalidation(false),
     mRegisteredForXPCOMShutdown(false)
 { }
 
 SVGDocumentWrapper::~SVGDocumentWrapper()
 {
   DestroyViewer();
   if (mRegisteredForXPCOMShutdown) {
     UnregisterForXPCOMShutdown();
@@ -343,17 +340,17 @@ SVGDocumentWrapper::SetupViewer(nsIReque
   NS_ENSURE_TRUE(docLoaderFactory, NS_ERROR_NOT_AVAILABLE);
 
   nsCOMPtr<nsIContentViewer> viewer;
   nsCOMPtr<nsIStreamListener> listener;
   rv = docLoaderFactory->CreateInstance("external-resource", chan,
                                         newLoadGroup,
                                         NS_LITERAL_CSTRING(IMAGE_SVG_XML),
                                         nullptr, nullptr,
-                                        (int16_t)mStyleBackendType,
+                                        nsIDocumentLoaderFactory::STYLE_BACKEND_TYPE_NONE,
                                         getter_AddRefs(listener),
                                         getter_AddRefs(viewer));
   NS_ENSURE_SUCCESS(rv, rv);
 
   NS_ENSURE_TRUE(viewer, NS_ERROR_UNEXPECTED);
 
   // Create a navigation time object and pass it to the SVG document through
   // the viewer.
--- a/image/SVGDocumentWrapper.h
+++ b/image/SVGDocumentWrapper.h
@@ -4,17 +4,16 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* This class wraps an SVG document, for use by VectorImage objects. */
 
 #ifndef mozilla_image_SVGDocumentWrapper_h
 #define mozilla_image_SVGDocumentWrapper_h
 
 #include "mozilla/Attributes.h"
-#include "mozilla/StyleBackendType.h"
 
 #include "nsCOMPtr.h"
 #include "nsIStreamListener.h"
 #include "nsIObserver.h"
 #include "nsIContentViewer.h"
 #include "nsWeakReference.h"
 #include "nsSize.h"
 
@@ -35,17 +34,17 @@ class SVGSVGElement;
 
 namespace image {
 
 class SVGDocumentWrapper final : public nsIStreamListener,
                                  public nsIObserver,
                                  nsSupportsWeakReference
 {
 public:
-  explicit SVGDocumentWrapper(StyleBackendType aStyleBackendType = StyleBackendType::None);
+  SVGDocumentWrapper();
 
   NS_DECL_ISUPPORTS
   NS_DECL_NSISTREAMLISTENER
   NS_DECL_NSIREQUESTOBSERVER
   NS_DECL_NSIOBSERVER
 
   enum Dimension {
     eWidth,
@@ -137,17 +136,16 @@ private:
                        nsILoadGroup** aLoadGroup);
   void     DestroyViewer();
   void     RegisterForXPCOMShutdown();
   void     UnregisterForXPCOMShutdown();
 
   nsCOMPtr<nsIContentViewer>  mViewer;
   nsCOMPtr<nsILoadGroup>      mLoadGroup;
   nsCOMPtr<nsIStreamListener> mListener;
-  StyleBackendType            mStyleBackendType;
   bool                        mIgnoreInvalidation;
   bool                        mRegisteredForXPCOMShutdown;
 };
 
 } // namespace image
 } // namespace mozilla
 
 #endif // mozilla_image_SVGDocumentWrapper_h