corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out changeset 1bc7102718a9 (bug 1207830) for test failures in ImageDecoders.JPGDownscaleDuringDecode

Browse Source
This commit is contained in:
Carsten "Tomcat" Book
2016-05-27 09:05:25 +02:00
parent 6f0882c95b
commit 1a2dcc1022
6 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
image/DecoderFactory.cpp
View File

@@ -204,7 +204,6 @@ DecoderFactory::CreateMetadataDecoder(DecoderType aType,
/* static */ already_AddRefed<Decoder> /* static */ already_AddRefed<Decoder>
DecoderFactory::CreateAnonymousDecoder(DecoderType aType, DecoderFactory::CreateAnonymousDecoder(DecoderType aType,
SourceBuffer* aSourceBuffer, SourceBuffer* aSourceBuffer,
const Maybe<IntSize>& aTargetSize,
SurfaceFlags aSurfaceFlags) SurfaceFlags aSurfaceFlags)
{ {
if (aType == DecoderType::UNKNOWN) { if (aType == DecoderType::UNKNOWN) {
@@ -233,12 +232,6 @@ DecoderFactory::CreateAnonymousDecoder(DecoderType aType,
decoder->SetDecoderFlags(decoderFlags); decoder->SetDecoderFlags(decoderFlags);
decoder->SetSurfaceFlags(aSurfaceFlags); decoder->SetSurfaceFlags(aSurfaceFlags);
// Set a target size for downscale-during-decode if applicable.
if (aTargetSize) {
DebugOnly<nsresult> rv = decoder->SetTargetSize(*aTargetSize);
MOZ_ASSERT(NS_SUCCEEDED(rv), "Bad downscale-during-decode target size?");
}
decoder->Init(); decoder->Init();
if (NS_FAILED(decoder->GetDecoderError())) { if (NS_FAILED(decoder->GetDecoderError())) {
return nullptr; return nullptr;

5
image/DecoderFactory.h
View File

@@ -120,17 +120,12 @@ public:
* @param aType Which type of decoder to create - JPEG, PNG, etc. * @param aType Which type of decoder to create - JPEG, PNG, etc.
* @param aSourceBuffer The SourceBuffer which the decoder will read its data * @param aSourceBuffer The SourceBuffer which the decoder will read its data
* from. * from.
* @param aTargetSize If not Nothing(), the target size which the image should
* be scaled to during decoding. It's an error to specify
* a target size for a decoder type which doesn't support
* downscale-during-decode.
* @param aSurfaceFlags Flags specifying the type of output this decoder * @param aSurfaceFlags Flags specifying the type of output this decoder
* should produce. * should produce.
*/ */
static already_AddRefed<Decoder> static already_AddRefed<Decoder>
CreateAnonymousDecoder(DecoderType aType, CreateAnonymousDecoder(DecoderType aType,
SourceBuffer* aSourceBuffer, SourceBuffer* aSourceBuffer,
const Maybe<gfx::IntSize>& aTargetSize,
SurfaceFlags aSurfaceFlags); SurfaceFlags aSurfaceFlags);
/** /**

1
image/ImageOps.cpp
View File

@@ -120,7 +120,6 @@ ImageOps::DecodeToSurface(nsIInputStream* aInputStream,
RefPtr<Decoder> decoder = RefPtr<Decoder> decoder =
DecoderFactory::CreateAnonymousDecoder(decoderType, DecoderFactory::CreateAnonymousDecoder(decoderType,
sourceBuffer, sourceBuffer,
Nothing(),
ToSurfaceFlags(aFlags)); ToSurfaceFlags(aFlags));
if (!decoder) { if (!decoder) {
return nullptr; return nullptr;

2
image/test/gtest/Common.cpp
View File

@@ -161,7 +161,7 @@ CreateTrivialDecoder()
DecoderType decoderType = DecoderFactory::GetDecoderType("image/gif"); DecoderType decoderType = DecoderFactory::GetDecoderType("image/gif");
RefPtr<SourceBuffer> sourceBuffer = new SourceBuffer(); RefPtr<SourceBuffer> sourceBuffer = new SourceBuffer();
RefPtr<Decoder> decoder = RefPtr<Decoder> decoder =
DecoderFactory::CreateAnonymousDecoder(decoderType, sourceBuffer, Nothing(), DecoderFactory::CreateAnonymousDecoder(decoderType, sourceBuffer,
DefaultSurfaceFlags()); DefaultSurfaceFlags());
return decoder.forget(); return decoder.forget();
} }

4
image/test/gtest/TestDecoders.cpp
View File

@@ -104,7 +104,7 @@ CheckDecoderSingleChunk(const ImageTestCase& aTestCase)
DecoderType decoderType = DecoderType decoderType =
DecoderFactory::GetDecoderType(aTestCase.mMimeType); DecoderFactory::GetDecoderType(aTestCase.mMimeType);
RefPtr<Decoder> decoder = RefPtr<Decoder> decoder =
DecoderFactory::CreateAnonymousDecoder(decoderType, sourceBuffer, Nothing(), DecoderFactory::CreateAnonymousDecoder(decoderType, sourceBuffer,
DefaultSurfaceFlags()); DefaultSurfaceFlags());
ASSERT_TRUE(decoder != nullptr); ASSERT_TRUE(decoder != nullptr);
@@ -141,7 +141,7 @@ CheckDecoderMultiChunk(const ImageTestCase& aTestCase)
DecoderType decoderType = DecoderType decoderType =
DecoderFactory::GetDecoderType(aTestCase.mMimeType); DecoderFactory::GetDecoderType(aTestCase.mMimeType);
RefPtr<Decoder> decoder = RefPtr<Decoder> decoder =
DecoderFactory::CreateAnonymousDecoder(decoderType, sourceBuffer, Nothing(), DecoderFactory::CreateAnonymousDecoder(decoderType, sourceBuffer,
DefaultSurfaceFlags()); DefaultSurfaceFlags());
ASSERT_TRUE(decoder != nullptr); ASSERT_TRUE(decoder != nullptr);

2
image/test/gtest/TestMetadata.cpp
View File

@@ -110,7 +110,7 @@ CheckMetadata(const ImageTestCase& aTestCase,
// Create a full decoder, so we can compare the result. // Create a full decoder, so we can compare the result.
decoder = decoder =
DecoderFactory::CreateAnonymousDecoder(decoderType, sourceBuffer, Nothing(), DecoderFactory::CreateAnonymousDecoder(decoderType, sourceBuffer,
DefaultSurfaceFlags()); DefaultSurfaceFlags());
ASSERT_TRUE(decoder != nullptr); ASSERT_TRUE(decoder != nullptr);