Fix the issue that a bitmap mask is not rendered.
When creating a `CFX_SkiaDeviceDriver` for rendering a bitmap mask, make
sure that alpha channel will be preserved, so that the mask layer's
opacity won't be reset to 0 and not be rendered.
Bug: pdfium:1744,pdfium:1745
Change-Id: I969eaa01fc973bdc3791d58e46bf055c2ddb9a48
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/90830
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Nigi <nigi@chromium.org>
diff --git a/core/fxge/skia/fx_skia_device.cpp b/core/fxge/skia/fx_skia_device.cpp
index 1f28b5d..742c260 100644
--- a/core/fxge/skia/fx_skia_device.cpp
+++ b/core/fxge/skia/fx_skia_device.cpp
@@ -1666,7 +1666,7 @@
SkColorType color_type;
const int bpp = pBitmap->GetBPP();
if (bpp == 8) {
- color_type = GetIsAlphaFromFormat(pBitmap->GetFormat())
+ color_type = pBitmap->IsAlphaFormat() || pBitmap->IsMaskFormat()
? kAlpha_8_SkColorType
: kGray_8_SkColorType;
} else {
diff --git a/testing/SUPPRESSIONS b/testing/SUPPRESSIONS
index 8df02fa..94eaedd 100644
--- a/testing/SUPPRESSIONS
+++ b/testing/SUPPRESSIONS
@@ -337,12 +337,6 @@
# TODO(pdfium:1748): Remove after associated bug is fixed
bug_1286.in * * * skia
-# TODO(pdfium:1744): Remove after associated bug is fixed
-bug_1288_1.in * * * skia,skiapaths
-
-# TODO(pdfium:1745): Remove after associated bug is fixed
-bug_1288_2.in * * * skia
-
# TODO(pdfium:1331): Remove after associated bug is fixed
bug_1331.in * * * *
diff --git a/testing/resources/pixel/bug_1288_1_expected_skia.pdf.0.png b/testing/resources/pixel/bug_1288_1_expected_skia.pdf.0.png
new file mode 100644
index 0000000..df6b87e
--- /dev/null
+++ b/testing/resources/pixel/bug_1288_1_expected_skia.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_1288_2_expected_skia.pdf.0.png b/testing/resources/pixel/bug_1288_2_expected_skia.pdf.0.png
index 3a8cbee..bac4bb1 100644
--- a/testing/resources/pixel/bug_1288_2_expected_skia.pdf.0.png
+++ b/testing/resources/pixel/bug_1288_2_expected_skia.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_1288_2_expected_skiapaths.pdf.0.png b/testing/resources/pixel/bug_1288_2_expected_skiapaths.pdf.0.png
new file mode 100644
index 0000000..3a8cbee
--- /dev/null
+++ b/testing/resources/pixel/bug_1288_2_expected_skiapaths.pdf.0.png
Binary files differ
