Roll third_party/skia/ ee68f3edf..5935b0dc4 (33 commits)
https://skia.googlesource.com/skia.git/+log/ee68f3edfa96..5935b0dc422b
Created with:
roll-dep third_party/skia
Fixed: chromium:1396266
Change-Id: I7861e2753a37b0408f1b058a29b685249d026371
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/103670
Commit-Queue: K. Moon <kmoon@chromium.org>
Reviewed-by: Nigi <nigi@chromium.org>
diff --git a/DEPS b/DEPS
index c521da6..531079a 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': '61311caef141c90d3e5c7a86d9eed1a919c9d131',
+ 'pdfium_tests_revision': '72e448f4afd2d6aef12dd4f0507033249b0097f6',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling resultdb
# and whatever else without interference from each other.
@@ -148,7 +148,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': 'ee68f3edfa96935274ad3e7703a09b808d79011e',
+ 'skia_revision': '5935b0dc422b930b490944c5874c90e33560a633',
# 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 faec604..2cbbd29 100644
--- a/fpdfsdk/fpdf_edit_embeddertest.cpp
+++ b/fpdfsdk/fpdf_edit_embeddertest.cpp
@@ -3907,7 +3907,7 @@
EXPECT_EQ(FPDFBitmap_BGRA, FPDFBitmap_GetFormat(bitmap.get()));
const char* checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
- return "74081c2a48c2fd4f1fde544f056e956b";
+ return "1003585870ad0fe37baf1c5bb3f5fd76";
return "0824c16dcf2dfcef44b45d88db1fddce";
}();
CompareBitmap(bitmap.get(), 120, 43, checksum);
diff --git a/testing/SUPPRESSIONS b/testing/SUPPRESSIONS
index 6ab2b64..b25f574 100644
--- a/testing/SUPPRESSIONS
+++ b/testing/SUPPRESSIONS
@@ -425,9 +425,6 @@
# TODO(chromium:1028991): Remove after associated bug is fixed
reset_button.in * * * *
-# TODO(chromium:1396266, skia:14070): Remove after associated bug is fixed
-bug_1396266.in * * * skia
-
# xfa_specific
# TODO(pdfium:1095): Remove after associated bug is fixed
diff --git a/testing/resources/pixel/bug_1383708_expected_skia.pdf.0.png b/testing/resources/pixel/bug_1383708_expected_skia.pdf.0.png
index 36119e0..5487865 100644
--- a/testing/resources/pixel/bug_1383708_expected_skia.pdf.0.png
+++ b/testing/resources/pixel/bug_1383708_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
new file mode 100644
index 0000000..e872c2c
--- /dev/null
+++ b/testing/resources/pixel/bug_1396266_expected_skia.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/xfa_specific/resolve_nodes_0_expected_skia.pdf.0.png b/testing/resources/pixel/xfa_specific/resolve_nodes_0_expected_skia.pdf.0.png
index e454dfd..01e966f 100644
--- a/testing/resources/pixel/xfa_specific/resolve_nodes_0_expected_skia.pdf.0.png
+++ b/testing/resources/pixel/xfa_specific/resolve_nodes_0_expected_skia.pdf.0.png
Binary files differ
diff --git a/xfa/fwl/cfwl_edit_embeddertest.cpp b/xfa/fwl/cfwl_edit_embeddertest.cpp
index 3e5bb83..6904b8d 100644
--- a/xfa/fwl/cfwl_edit_embeddertest.cpp
+++ b/xfa/fwl/cfwl_edit_embeddertest.cpp
@@ -255,7 +255,7 @@
FORM_OnLButtonDown(form_handle(), page(), 0, 115, 58);
const char* filled_checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
- return "062ad65614888e4f114b99f3396be3e8";
+ return "23658ed124114f05518372d41c80e41b";
return "101cf6223fa2403fba4c413a8310ab02";
}();
ScopedFPDFBitmap page_bitmap = RenderLoadedPageWithFlags(page(), FPDF_ANNOT);
