[Skia] Fix an assertion error
CFX_SkiaDeviceDriver::SetBitsWithMask() passes 2 bitmap inputs to
Upsample() and Upsample() requires the input bitmaps to be
premultiplied. This requires the CalculateDrawImage() to guarantee
that `bitmap_device1` is qualified to be a premultiplied bitmap
despite its format `FXDIB_Format::kRgb32` doesn't have an alpha
channel.
This CL fills the `bitmap_device1`'s alpha channel with 0xFF so that
after calling CalculateDrawImage(), `bitmap_device1` can be considered
"premultiplied".
Bug: chromium:1395648
Change-Id: I81f32f131be752787d3a1bfde883bf48cd59ac2d
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/102950
Reviewed-by: K. Moon <kmoon@chromium.org>
Commit-Queue: Nigi <nigi@chromium.org>
diff --git a/DEPS b/DEPS
index 538645d..7e8d98a 100644
--- a/DEPS
+++ b/DEPS
@@ -140,7 +140,7 @@
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling pdfium_tests
# and whatever else without interference from each other.
- 'pdfium_tests_revision': '23370cd9710389f721b88db0fb1451d44dd4f20f',
+ 'pdfium_tests_revision': 'cfeb9b2e0386a0aa23ba961b99e0ea651ccc1a45',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling resultdb
# and whatever else without interference from each other.
diff --git a/core/fpdfapi/render/cpdf_imagerenderer.cpp b/core/fpdfapi/render/cpdf_imagerenderer.cpp
index f45c811..c436155 100644
--- a/core/fpdfapi/render/cpdf_imagerenderer.cpp
+++ b/core/fpdfapi/render/cpdf_imagerenderer.cpp
@@ -366,7 +366,7 @@
nullptr)) {
return true;
}
- ClearBitmap(bitmap_device1, 0xffffff);
+ ClearBitmap(bitmap_device1, 0xffffffff);
CPDF_RenderStatus bitmap_render(m_pRenderStatus->GetContext(),
&bitmap_device1);
bitmap_render.SetDropObjects(m_pRenderStatus->GetDropObjects());
diff --git a/testing/SUPPRESSIONS b/testing/SUPPRESSIONS
index 0564009..f022c38 100644
--- a/testing/SUPPRESSIONS
+++ b/testing/SUPPRESSIONS
@@ -491,9 +491,6 @@
# TODO(chromium:1356149): Remove after associated bug is fixed
bug_1356149.in mac * * agg
-# TODO(chromium:1395648): Remove after associated bug is fixed
-bug_1395648.in * * * skia
-
# TODO(pdfium:1457): Remove after associated bug is fixed
bug_1457.in * * * *
diff --git a/testing/resources/pixel/bug_1395648_expected_skia.pdf.0.png b/testing/resources/pixel/bug_1395648_expected_skia.pdf.0.png
new file mode 100644
index 0000000..436cb2f
--- /dev/null
+++ b/testing/resources/pixel/bug_1395648_expected_skia.pdf.0.png
Binary files differ
