Roll third_party/skia/ 029100f6e..a5070bdfb (152 commits)
https://skia.googlesource.com/skia.git/+log/029100f6e6e5..a5070bdfb3d7
Created with:
roll-dep third_party/skia
CL [1] changed the rendering behavior for Skia. Updates the related
PDFium test expectations accordingly.
Since CL [2] moved ColorFilter subclasses to src/effects/colorfilters,
this CL updates skia/BUILD.gn to include the new source set.
[1] https://skia-review.googlesource.com/c/skia/+/708229
[2] https://skia-review.googlesource.com/c/skia/+/705224
Change-Id: I03e2e6d6619681a1ea96f8758555abc3d2327c0c
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/108971
Reviewed-by: K. Moon <kmoon@chromium.org>
Commit-Queue: Nigi <nigi@chromium.org>
diff --git a/DEPS b/DEPS
index ac73739..843f402 100644
--- a/DEPS
+++ b/DEPS
@@ -144,7 +144,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': '340ff012cc21c02fffc3f9c05be3f4d5d8e6bae4',
+ 'pdfium_tests_revision': 'd0b94db5d247d7d6b21f21be42b248d5b2f8f565',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling resultdb
# and whatever else without interference from each other.
@@ -152,7 +152,7 @@
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling skia
# and whatever else without interference from each other.
- 'skia_revision': '029100f6e6e5085ea25d719ba6be1855409f338f',
+ 'skia_revision': 'a5070bdfb3d7bdc7e1f001bdb3fc928fd35f0bb3',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling test_fonts
# and whatever else without interference from each other.
diff --git a/fpdfsdk/fpdf_edit_embeddertest.cpp b/fpdfsdk/fpdf_edit_embeddertest.cpp
index f5442e9..19097d8 100644
--- a/fpdfsdk/fpdf_edit_embeddertest.cpp
+++ b/fpdfsdk/fpdf_edit_embeddertest.cpp
@@ -4195,13 +4195,15 @@
ASSERT_EQ(kExpectedObjects, FPDFPage_CountObjects(page));
const char* smask_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
return "0653a18f3bf9b4d8413a2aa10bc11c38";
+ }
return "5a3ae4a660ce919e29c42ec2258142f1";
}();
const char* no_smask_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
- return "d568afc908d595224d804448d5d3672f";
+ if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ return "0da49e63e7d6337aca78b19938e3bf65";
+ }
return "67504e83f5d78214ea00efc19082c5c1";
}();
diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index 5f67b95..bcb7e07 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -410,6 +410,7 @@
sources = skia_core_sources
sources += skia_effects_sources
sources += skia_colorfilters_sources
+ sources += skia_colorfilters_sksl_sources
sources += skia_effects_imagefilter_sources
visibility = [ ":skia" ]
diff --git a/testing/resources/pixel/bug_1395648_expected_skia.pdf.0.png b/testing/resources/pixel/bug_1395648_expected_skia.pdf.0.png
index 80a944b..e62f06b 100644
--- a/testing/resources/pixel/bug_1395648_expected_skia.pdf.0.png
+++ b/testing/resources/pixel/bug_1395648_expected_skia.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_1396266_expected_skia.pdf.0.png b/testing/resources/pixel/bug_1396266_expected_skia.pdf.0.png
index e872c2c..4d483cb 100644
--- a/testing/resources/pixel/bug_1396266_expected_skia.pdf.0.png
+++ b/testing/resources/pixel/bug_1396266_expected_skia.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/matte_expected_skia.pdf.0.png b/testing/resources/pixel/matte_expected_skia.pdf.0.png
index bdab404..97fa17e 100644
--- a/testing/resources/pixel/matte_expected_skia.pdf.0.png
+++ b/testing/resources/pixel/matte_expected_skia.pdf.0.png
Binary files differ
