summaryrefslogtreecommitdiff
path: root/image
diff options
context:
space:
mode:
authorJob Bautista <jobbautista9@protonmail.com>2022-12-02 14:17:10 +0800
committerJob Bautista <jobbautista9@protonmail.com>2022-12-02 14:17:10 +0800
commit925b33158b0c48a59393c3be1ec6f456d81b0df4 (patch)
tree9b8b55de6be2690e3462eafbd0b76cab222ec07d /image
parentdaf859d84c27e715caec0e2fa4462a5d9faf5634 (diff)
downloaduxp-925b33158b0c48a59393c3be1ec6f456d81b0df4.tar.gz
Issue #2041 Follow-up - Remove opacity check from original patch.
Per Issue #2033 we don't support expanding RGB to RGBA yet, so this opacity check will always return RGBX, which makes images with transparent backgrounds show up with a black background instead. Feel free to readd once we backport Mozilla bug 1551088.
Diffstat (limited to 'image')
-rw-r--r--image/decoders/nsJXLDecoder.cpp6
-rw-r--r--image/decoders/nsJXLDecoder.h1
2 files changed, 1 insertions, 6 deletions
diff --git a/image/decoders/nsJXLDecoder.cpp b/image/decoders/nsJXLDecoder.cpp
index 85276f409a..24c94802ad 100644
--- a/image/decoders/nsJXLDecoder.cpp
+++ b/image/decoders/nsJXLDecoder.cpp
@@ -63,7 +63,6 @@ nsJXLDecoder::nsJXLDecoder(RasterImage* aImage)
JxlThreadParallelRunnerMake(nullptr, PreferredThreadCount())),
mNumFrames(0),
mTimeout(FrameTimeout::Forever()),
- mSurfaceFormat(SurfaceFormat::B8G8R8X8),
mContinue(false) {
JxlDecoderSubscribeEvents(mDecoder.get(),
JXL_DEC_BASIC_INFO | JXL_DEC_FRAME |
@@ -250,10 +249,7 @@ nsJXLDecoder::ReadJXLData(const char* aData, size_t aLength)
Some(invalidRect->mOutputSpaceRect));
}
- Opacity opacity = mSurfaceFormat == SurfaceFormat::B8G8R8A8
- ? Opacity::SOME_TRANSPARENCY
- : Opacity::FULLY_OPAQUE;
- PostFrameStop(opacity);
+ PostFrameStop();
if (!IsFirstFrameDecode() && mInfo.have_animation &&
!mFrameHeader.is_last) {
diff --git a/image/decoders/nsJXLDecoder.h b/image/decoders/nsJXLDecoder.h
index 3cabcfb9b0..878ca044c8 100644
--- a/image/decoders/nsJXLDecoder.h
+++ b/image/decoders/nsJXLDecoder.h
@@ -48,7 +48,6 @@ class nsJXLDecoder final : public Decoder {
uint32_t mNumFrames;
FrameTimeout mTimeout;
- gfx::SurfaceFormat mSurfaceFormat;
SurfacePipe mPipe;
bool mContinue;
};