зеркало из https://github.com/mozilla/gecko-dev.git
Backed out changeset b05327c3c55f (bug 1377158)
This commit is contained in:
Родитель
f46d484437
Коммит
63da250179
|
@ -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<VectorImage> newImage = new VectorImage(aURI, aStyleBackendType);
|
||||
RefPtr<VectorImage> newImage = new VectorImage(aURI);
|
||||
aProgressTracker->SetImage(newImage);
|
||||
newImage->SetProgressTracker(aProgressTracker);
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
Загрузка…
Ссылка в новой задаче