From 63da2501797eca72e1872233df42bb6fd85374b9 Mon Sep 17 00:00:00 2001 From: "Carsten \"Tomcat\" Book" Date: Tue, 25 Jul 2017 14:33:51 +0200 Subject: [PATCH] Backed out changeset b05327c3c55f (bug 1377158) --- image/ImageFactory.cpp | 10 ++++------ image/ImageFactory.h | 7 ++----- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/image/ImageFactory.cpp b/image/ImageFactory.cpp index 1702d37ce9d0..8c62a23ac8f9 100644 --- a/image/ImageFactory.cpp +++ b/image/ImageFactory.cpp @@ -84,8 +84,7 @@ ImageFactory::CreateImage(nsIRequest* aRequest, const nsCString& aMimeType, ImageURL* aURI, bool aIsMultiPart, - uint32_t aInnerWindowId, - StyleBackendType aStyleBackendType /* = StyleBackendType::None */) + uint32_t aInnerWindowId) { MOZ_ASSERT(gfxPrefs::SingletonExists(), "Pref observers should have been initialized already"); @@ -109,7 +108,7 @@ ImageFactory::CreateImage(nsIRequest* aRequest, // Select the type of image to create based on MIME type. if (aMimeType.EqualsLiteral(IMAGE_SVG_XML)) { return CreateVectorImage(aRequest, aProgressTracker, aMimeType, - aURI, imageFlags, aInnerWindowId, aStyleBackendType); + aURI, imageFlags, aInnerWindowId); } else { return CreateRasterImage(aRequest, aProgressTracker, aMimeType, aURI, imageFlags, aInnerWindowId); @@ -254,14 +253,13 @@ ImageFactory::CreateVectorImage(nsIRequest* aRequest, const nsCString& aMimeType, ImageURL* aURI, uint32_t aImageFlags, - uint32_t aInnerWindowId, - StyleBackendType aStyleBackendType) + uint32_t aInnerWindowId) { MOZ_ASSERT(aProgressTracker); nsresult rv; - RefPtr newImage = new VectorImage(aURI, aStyleBackendType); + RefPtr newImage = new VectorImage(aURI); aProgressTracker->SetImage(newImage); newImage->SetProgressTracker(aProgressTracker); diff --git a/image/ImageFactory.h b/image/ImageFactory.h index a6dca693cb49..6c2e0f50451a 100644 --- a/image/ImageFactory.h +++ b/image/ImageFactory.h @@ -7,7 +7,6 @@ #ifndef mozilla_image_ImageFactory_h #define mozilla_image_ImageFactory_h -#include "mozilla/StyleBackendType.h" #include "nsCOMPtr.h" #include "nsProxyRelease.h" @@ -46,8 +45,7 @@ public: const nsCString& aMimeType, ImageURL* aURI, bool aIsMultiPart, - uint32_t aInnerWindowId, - StyleBackendType aStyleBackendType = StyleBackendType::None); + uint32_t aInnerWindowId); /** * Creates a new image which isn't associated with a URI or loaded through * the usual image loading mechanism. @@ -85,8 +83,7 @@ private: const nsCString& aMimeType, ImageURL* aURI, uint32_t aImageFlags, - uint32_t aInnerWindowId, - StyleBackendType aStyleBackendType); + uint32_t aInnerWindowId); // This is a static factory class, so disallow instantiation. virtual ~ImageFactory() = 0;