Skip to content

Commit 7896b72

Browse files
Abbondanzofacebook-github-bot
authored andcommitted
Inject XML drawable decoder and factory
Reviewed By: oprisnik Differential Revision: D67878073 fbshipit-source-id: d9a7dcc82bae33f270654991efd63dec8a5fc957
1 parent 43b2160 commit 7896b72

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
lines changed

imagepipeline/src/main/java/com/facebook/imagepipeline/core/ImagePipelineFactory.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,9 @@ public ImagePipelineFactory(ImagePipelineConfigInterface config) {
159159
FrescoSystrace.endSection();
160160
}
161161
mDiskCachesStoreSupplier = mConfig.getDiskCachesStoreSupplier();
162+
if (mConfig.getExperiments().isBinaryXmlEnabled()) {
163+
ImageFormatChecker.getInstance().setBinaryXmlEnabled(true);
164+
}
162165
}
163166

164167
@Nullable
@@ -249,8 +252,6 @@ private ImageDecoder getImageDecoder() {
249252
}
250253

251254
ImageDecoder xmlDecoder = getXmlImageDecoder();
252-
ImageFormatChecker imageFormatChecker = ImageFormatChecker.getInstance();
253-
imageFormatChecker.setBinaryXmlEnabled(mConfig.getExperiments().isBinaryXmlEnabled());
254255

255256
if (mConfig.getImageDecoderConfig() == null) {
256257
mImageDecoder =
@@ -264,8 +265,9 @@ private ImageDecoder getImageDecoder() {
264265
getPlatformDecoder(),
265266
mConfig.getImageDecoderConfig().getCustomImageDecoders());
266267
// Add custom image formats if needed
267-
imageFormatChecker.setCustomImageFormatCheckers(
268-
mConfig.getImageDecoderConfig().getCustomImageFormats());
268+
ImageFormatChecker.getInstance()
269+
.setCustomImageFormatCheckers(
270+
mConfig.getImageDecoderConfig().getCustomImageFormats());
269271
}
270272
}
271273
}

imagepipeline/src/main/java/com/facebook/imagepipeline/decoder/DefaultImageDecoder.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,12 +102,13 @@ public DefaultImageDecoder(
102102
@Nullable final ImageDecoder xmlDecoder,
103103
final PlatformDecoder platformDecoder,
104104
@Nullable Map<ImageFormat, ImageDecoder> customDecoders) {
105-
mAnimatedGifDecoder = animatedGifDecoder;
106-
mAnimatedWebPDecoder = animatedWebPDecoder;
107-
mXmlDecoder = xmlDecoder;
108-
mPlatformDecoder = platformDecoder;
109-
mCustomDecoders = customDecoders;
110-
mEnableEncodedImageColorSpaceUsage = Suppliers.BOOLEAN_FALSE;
105+
this(
106+
animatedGifDecoder,
107+
animatedWebPDecoder,
108+
xmlDecoder,
109+
platformDecoder,
110+
customDecoders,
111+
Suppliers.BOOLEAN_FALSE);
111112
}
112113

113114
public DefaultImageDecoder(

0 commit comments

Comments
 (0)