Fix issue that colored patterns are rendered with dark borders
The return value of DrawPatternBitmap() is later used for scanline
composition, which needs to be an unpremultiplied bitmap or else it
will cause unwanted dark borders around the pattern. This CL fixes the
issue and remove the affected test from the suppression list.
Bug: pdfium:1867
Change-Id: I764905c3913a5d3161b27c795b2b1feac8fb012a
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/103214
Commit-Queue: Nigi <nigi@chromium.org>
Reviewed-by: K. Moon <kmoon@chromium.org>
diff --git a/DEPS b/DEPS
index 214b82c..6b507bd 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': 'cf6eb559ea47323458bc2c7ef61a6df2c843ab72',
+ 'pdfium_tests_revision': 'a0177472fa9b0075191f6decaee6be92ab27b0bb',
# 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_rendertiling.cpp b/core/fpdfapi/render/cpdf_rendertiling.cpp
index 24dbabb..6f4df51 100644
--- a/core/fpdfapi/render/cpdf_rendertiling.cpp
+++ b/core/fpdfapi/render/cpdf_rendertiling.cpp
@@ -58,6 +58,11 @@
CPDF_RenderContext context(pDoc, nullptr, pCache);
context.AppendLayer(pPatternForm, mtPattern2Bitmap);
context.Render(&bitmap_device, nullptr, &options, nullptr);
+
+#ifdef _SKIA_SUPPORT_
+ if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ pBitmap->UnPreMultiply();
+#endif // _SKIA_SUPPORT_
return pBitmap;
}
diff --git a/testing/SUPPRESSIONS b/testing/SUPPRESSIONS
index 73e26ec..25f9042 100644
--- a/testing/SUPPRESSIONS
+++ b/testing/SUPPRESSIONS
@@ -41,9 +41,6 @@
2_color_calrgb.pdf mac * * *
2_color_indexed.pdf mac * * *
-# TODO(pdfium:1867): Remove after associated bug is fixed
-2_color_tiling.pdf * * * skia
-
# TODO(pdfium:1860): Remove after associated bug is fixed
2_halftone.pdf * * * skia
