[Skia] Fix coons patch mesh rendering
When Skia renderer processes coons patch mesh, `paint` has black as the
default color and it does not have a shader type.
According to SkCanvas::drawPatch() documentation [1], when the
interpolated patch `colors` are provided and `paint` does not contain
a shader as the source, `colors` should be used as the destination.
This CL changes the blend mode to SkBlendMode::kDst to match the
documentation.
[1] https://api.skia.org/classSkCanvas.html#a29b048324b32bfc785c0c256d65aa885
Bug: pdfium:1809
Change-Id: I73221c54c9adcb5b77ac276241c9d41341bc39bb
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/98971
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Nigi <nigi@chromium.org>
diff --git a/DEPS b/DEPS
index 464812d..3a9cf97 100644
--- a/DEPS
+++ b/DEPS
@@ -130,7 +130,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': '9377290e2bcb35fd6443d77e04972e0e3b2a6f0c',
+ 'pdfium_tests_revision': 'e39d191c01449a0d9cdca9733a5a5cd21df8942d',
# 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/fxge/skia/fx_skia_device.cpp b/core/fxge/skia/fx_skia_device.cpp
index 00ace67..47bb6e1 100644
--- a/core/fxge/skia/fx_skia_device.cpp
+++ b/core/fxge/skia/fx_skia_device.cpp
@@ -2390,8 +2390,8 @@
colors[i] = SkColorSetARGB(0xFF, (U8CPU)(r * 255), (U8CPU)(g * 255),
(U8CPU)(b * 255));
}
- m_pCanvas->drawPatch(cubics, colors, nullptr, SkBlendMode::kModulate,
- paint);
+ m_pCanvas->drawPatch(cubics, colors, /*textCoords=*/nullptr,
+ SkBlendMode::kDst, paint);
}
return true;
}
diff --git a/testing/SUPPRESSIONS b/testing/SUPPRESSIONS
index 311cbc2..2f5e8ee 100644
--- a/testing/SUPPRESSIONS
+++ b/testing/SUPPRESSIONS
@@ -249,10 +249,6 @@
example_028.pdf mac * * *
example_029.pdf mac * * *
example_030.pdf mac * * *
-
-# TODO(pdfium:1809): Remove after associated bug is fixed
-example_030.pdf * * * skia,skiapaths
-
example_031.pdf mac * * *
example_032.pdf mac * * *
example_033.pdf mac * * *
