Roll third_party/skia/ 215b0bcad..7e2c9f54c (1 commit)
https://skia.googlesource.com/skia.git/+log/215b0bcad285..7e2c9f54c0fd
Created with:
roll-dep third_party/skia
CL [1] in this roll has caused minor discrepancies in path rendering.
This CL updates the tests which are affected by this roll.
[1] https://skia.googlesource.com/skia.git/+/7e2c9f54c0fd5d777f96e94b958c2ebff5fa246b
Change-Id: I87dc0eeb234480065678b5369e2b48b74bb1b310
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/104276
Commit-Queue: Nigi <nigi@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
diff --git a/DEPS b/DEPS
index 2baddd3..4327c82 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': '1e191c1d4d8df11ebd0ecc2b6f7603b920c9a362',
+ 'pdfium_tests_revision': '897769bc058701ae38eb12285703e6c8d3ba1aee',
# 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': '215b0bcad2858cfc13edabaee4068c410f2b0808',
+ 'skia_revision': '7e2c9f54c0fd5d777f96e94b958c2ebff5fa246b',
# 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_annot_embeddertest.cpp b/fpdfsdk/fpdf_annot_embeddertest.cpp
index 0fc27bc..06da6a8 100644
--- a/fpdfsdk/fpdf_annot_embeddertest.cpp
+++ b/fpdfsdk/fpdf_annot_embeddertest.cpp
@@ -905,7 +905,7 @@
}();
const char* md5_modified_square = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
- return "eb16eae7904705fa24f4ec9c1acf90c7";
+ return "fac81632e33fd5c06f39082a26d06ba8";
#if BUILDFLAG(IS_APPLE)
return "a66591662c8e7ad3c6059952e234bebf";
#else
@@ -1115,7 +1115,7 @@
}();
const char* md5_two_paths = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
- return "7d2db46e1ae6bcf88d18d334af309551";
+ return "491ce8fb274cc83b55b6099f15457b5d";
#if BUILDFLAG(IS_APPLE)
return "6cdaf6b3e5145f435d8ccae6db5cf9af";
#else
@@ -3031,7 +3031,7 @@
{
const char* md5_sum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
- return "7b08d6e8c0423302755c110e17abf7de";
+ return "08b693ba461a24ee6b9c7f86b5dbe191";
#if BUILDFLAG(IS_APPLE)
return "108a46c517c4eaace9982ee83e8e3296";
#else
@@ -3059,7 +3059,7 @@
{
const char* md5_sum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
- return "371171ea3f000db6354b24a702b0312b";
+ return "3e6ae77a45e49bfd909f3ee0351a4176";
#if BUILDFLAG(IS_APPLE)
return "eb3869335e7a219e1b5f25c1c6037b97";
#else
@@ -3078,7 +3078,7 @@
{
const char* md5_sum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
- return "4aba010a83b9d91722921fde6bf30cdc";
+ return "12bb575d925923ad6672f427c574eef4";
#if BUILDFLAG(IS_APPLE)
return "d20b1978da2362d3942ea0fc6d230997";
#else
diff --git a/fpdfsdk/fpdf_edit_embeddertest.cpp b/fpdfsdk/fpdf_edit_embeddertest.cpp
index 09c96bb..6ce984d 100644
--- a/fpdfsdk/fpdf_edit_embeddertest.cpp
+++ b/fpdfsdk/fpdf_edit_embeddertest.cpp
@@ -4243,7 +4243,7 @@
ASSERT_TRUE(x10_bitmap);
const char* x10_checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
- return "bfabf04699139d05c3924526beeb4b95";
+ return "f5e86739b9603838cbfb0c7f8e54e4ae";
return "149f63de758ab01d3b75605cdfd4c176";
}();
CompareBitmap(x10_bitmap.get(), 631, 103, x10_checksum);
@@ -4270,7 +4270,7 @@
ASSERT_TRUE(x10_bitmap);
const char* x10_checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
- return "c7eef7859332c75ab793ebae1c6e7221";
+ return "59d0b5f1fc2a1cc0c392e213909bbbb6";
return "f5f93bf64de579b59e775d7076ca0a5a";
}();
CompareBitmap(x10_bitmap.get(), 1143, 150, x10_checksum);
@@ -4304,7 +4304,7 @@
ASSERT_TRUE(x10_bitmap);
const char* x10_checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
- return "4816dd6782e9a977c58fb1ca0ced74d3";
+ return "839dc0eed66eab6d545833f25b37031e";
return "bbd3842a4b50dbfcbce4eee2b067a297";
}();
CompareBitmap(x10_bitmap.get(), 275, 275, x10_checksum);
@@ -4325,7 +4325,7 @@
ASSERT_TRUE(bitmap);
const char* checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
- return "bb3778ba739c921525de44e9ab412868";
+ return "1d74731d23a056c0e3fb88f2f85b2581";
return "e8154fa8ededf4d9b8b35b5260897b6c";
}();
CompareBitmap(bitmap.get(), 120, 186, checksum);
diff --git a/fpdfsdk/fpdf_ppo_embeddertest.cpp b/fpdfsdk/fpdf_ppo_embeddertest.cpp
index 6f0a2b1..5750947 100644
--- a/fpdfsdk/fpdf_ppo_embeddertest.cpp
+++ b/fpdfsdk/fpdf_ppo_embeddertest.cpp
@@ -39,7 +39,7 @@
const char* RectanglesMultiPagesExpectedChecksum(int page_index) {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
static constexpr const char* kChecksums[kRectanglesMultiPagesPageCount] = {
- "7a4cddd5a17a60ce50acb53e318d94f8", "4fa6a7507e9f3ef4f28719a7d656c3a5"};
+ "07606a12487bd0c28a88f23fa00fc313", "94ea6e1eef220833a3ec14d6a1c612b0"};
return kChecksums[page_index];
}
static constexpr const char* kChecksums[kRectanglesMultiPagesPageCount] = {
diff --git a/fpdfsdk/fpdf_view_embeddertest.cpp b/fpdfsdk/fpdf_view_embeddertest.cpp
index c8bd7f0..d492da8 100644
--- a/fpdfsdk/fpdf_view_embeddertest.cpp
+++ b/fpdfsdk/fpdf_view_embeddertest.cpp
@@ -1003,7 +1003,7 @@
}();
const char* hori_stretched_checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
- return "af6eaa0d3388261693df5390138e4da1";
+ return "6d3776d7bb21cbb7195126b8e95dfba2";
return "48ef9205941ed19691ccfa00d717187e";
}();
const char* rotated_90_clockwise_checksum = []() {
@@ -1038,7 +1038,7 @@
}();
const char* larger_rotated_diagonal_checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
- return "1dbf599403c235926d3ddcbc0ea10ee8";
+ return "85c41bb892c1a09882f432aa2f4a5ef6";
return "3d62417468bdaff0eb14391a0c30a3b1";
}();
const char* tile_checksum = []() {
diff --git a/testing/resources/pixel/bug_1372651_expected_skia.pdf.0.png b/testing/resources/pixel/bug_1372651_expected_skia.pdf.0.png
index 00cc13c..f1823f3 100644
--- a/testing/resources/pixel/bug_1372651_expected_skia.pdf.0.png
+++ b/testing/resources/pixel/bug_1372651_expected_skia.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_1388_expected_skia.pdf.0.png b/testing/resources/pixel/bug_1388_expected_skia.pdf.0.png
index c9ab2e7..eb348c8 100644
--- a/testing/resources/pixel/bug_1388_expected_skia.pdf.0.png
+++ b/testing/resources/pixel/bug_1388_expected_skia.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_1752_expected_skia.pdf.0.png b/testing/resources/pixel/bug_1752_expected_skia.pdf.0.png
index d5aadb9..9cb41b8 100644
--- a/testing/resources/pixel/bug_1752_expected_skia.pdf.0.png
+++ b/testing/resources/pixel/bug_1752_expected_skia.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_1883_expected_skia.pdf.0.png b/testing/resources/pixel/bug_1883_expected_skia.pdf.0.png
index 0478fa8..8560bfe 100644
--- a/testing/resources/pixel/bug_1883_expected_skia.pdf.0.png
+++ b/testing/resources/pixel/bug_1883_expected_skia.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_1883_expected_skia.pdf.1.png b/testing/resources/pixel/bug_1883_expected_skia.pdf.1.png
index 84f2696..ea6b2d8 100644
--- a/testing/resources/pixel/bug_1883_expected_skia.pdf.1.png
+++ b/testing/resources/pixel/bug_1883_expected_skia.pdf.1.png
Binary files differ
diff --git a/testing/resources/pixel/bug_1883_expected_skia.pdf.2.png b/testing/resources/pixel/bug_1883_expected_skia.pdf.2.png
index e991b81..fce6fac 100644
--- a/testing/resources/pixel/bug_1883_expected_skia.pdf.2.png
+++ b/testing/resources/pixel/bug_1883_expected_skia.pdf.2.png
Binary files differ
diff --git a/testing/resources/pixel/bug_1883_expected_skia.pdf.3.png b/testing/resources/pixel/bug_1883_expected_skia.pdf.3.png
index 8e1ecc7..87b49d2 100644
--- a/testing/resources/pixel/bug_1883_expected_skia.pdf.3.png
+++ b/testing/resources/pixel/bug_1883_expected_skia.pdf.3.png
Binary files differ
diff --git a/testing/resources/pixel/bug_1995_expected_skia.pdf.0.png b/testing/resources/pixel/bug_1995_expected_skia.pdf.0.png
index 5e23e82..97ac01f 100644
--- a/testing/resources/pixel/bug_1995_expected_skia.pdf.0.png
+++ b/testing/resources/pixel/bug_1995_expected_skia.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_714187_expected_skia.pdf.0.png b/testing/resources/pixel/bug_714187_expected_skia.pdf.0.png
index 65f8d33..80cac57 100644
--- a/testing/resources/pixel/bug_714187_expected_skia.pdf.0.png
+++ b/testing/resources/pixel/bug_714187_expected_skia.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_736695_1_expected_skia.pdf.0.png b/testing/resources/pixel/bug_736695_1_expected_skia.pdf.0.png
index 112bcbc..ecb7d2b 100644
--- a/testing/resources/pixel/bug_736695_1_expected_skia.pdf.0.png
+++ b/testing/resources/pixel/bug_736695_1_expected_skia.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_736695_2_expected_skia.pdf.0.png b/testing/resources/pixel/bug_736695_2_expected_skia.pdf.0.png
index 8e01ded..801b157 100644
--- a/testing/resources/pixel/bug_736695_2_expected_skia.pdf.0.png
+++ b/testing/resources/pixel/bug_736695_2_expected_skia.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_736695_3_expected_skia.pdf.0.png b/testing/resources/pixel/bug_736695_3_expected_skia.pdf.0.png
index 591ddc0..1b02f1b 100644
--- a/testing/resources/pixel/bug_736695_3_expected_skia.pdf.0.png
+++ b/testing/resources/pixel/bug_736695_3_expected_skia.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_736695_4_expected_skia.pdf.0.png b/testing/resources/pixel/bug_736695_4_expected_skia.pdf.0.png
index 112bcbc..ecb7d2b 100644
--- a/testing/resources/pixel/bug_736695_4_expected_skia.pdf.0.png
+++ b/testing/resources/pixel/bug_736695_4_expected_skia.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_843_expected_skia.pdf.0.png b/testing/resources/pixel/bug_843_expected_skia.pdf.0.png
index fa2b955..f0c8193 100644
--- a/testing/resources/pixel/bug_843_expected_skia.pdf.0.png
+++ b/testing/resources/pixel/bug_843_expected_skia.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/combobox_form_expected_skia.pdf.0.png b/testing/resources/pixel/combobox_form_expected_skia.pdf.0.png
index 04adcf0..4686e96 100644
--- a/testing/resources/pixel/combobox_form_expected_skia.pdf.0.png
+++ b/testing/resources/pixel/combobox_form_expected_skia.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/xfa_specific/barcode_test_expected_skia.pdf.0.png b/testing/resources/pixel/xfa_specific/barcode_test_expected_skia.pdf.0.png
index e4ad159..3716b9c 100644
--- a/testing/resources/pixel/xfa_specific/barcode_test_expected_skia.pdf.0.png
+++ b/testing/resources/pixel/xfa_specific/barcode_test_expected_skia.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/xfa_specific/dynamic_list_box_allow_multiple_selection_expected_skia.pdf.0.png b/testing/resources/pixel/xfa_specific/dynamic_list_box_allow_multiple_selection_expected_skia.pdf.0.png
index 24eccc7..3ccc1a2 100644
--- a/testing/resources/pixel/xfa_specific/dynamic_list_box_allow_multiple_selection_expected_skia.pdf.0.png
+++ b/testing/resources/pixel/xfa_specific/dynamic_list_box_allow_multiple_selection_expected_skia.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/xfa_specific/dynamic_list_box_allow_multiple_selection_expected_skia_mac.pdf.0.png b/testing/resources/pixel/xfa_specific/dynamic_list_box_allow_multiple_selection_expected_skia_mac.pdf.0.png
index 54be066..eb303b2 100644
--- a/testing/resources/pixel/xfa_specific/dynamic_list_box_allow_multiple_selection_expected_skia_mac.pdf.0.png
+++ b/testing/resources/pixel/xfa_specific/dynamic_list_box_allow_multiple_selection_expected_skia_mac.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/xfa_specific/dynamic_password_field_background_fill_expected_skia.pdf.0.png b/testing/resources/pixel/xfa_specific/dynamic_password_field_background_fill_expected_skia.pdf.0.png
index 2c7c93a..072a537 100644
--- a/testing/resources/pixel/xfa_specific/dynamic_password_field_background_fill_expected_skia.pdf.0.png
+++ b/testing/resources/pixel/xfa_specific/dynamic_password_field_background_fill_expected_skia.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/xfa_specific/dynamic_table_color_and_width_expected_skia.pdf.0.png b/testing/resources/pixel/xfa_specific/dynamic_table_color_and_width_expected_skia.pdf.0.png
index fab2d41..d443a35 100644
--- a/testing/resources/pixel/xfa_specific/dynamic_table_color_and_width_expected_skia.pdf.0.png
+++ b/testing/resources/pixel/xfa_specific/dynamic_table_color_and_width_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 01e966f..884a23f 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/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected_skia.pdf.0.png b/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected_skia.pdf.0.png
index 2585092..4b35140 100644
--- a/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected_skia.pdf.0.png
+++ b/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected_skia.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected_skia.pdf.1.png b/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected_skia.pdf.1.png
index 30d0e01..fd88db2 100644
--- a/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected_skia.pdf.1.png
+++ b/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected_skia.pdf.1.png
Binary files differ
diff --git a/testing/resources/pixel/xfa_specific/xfa_node_caption_expected_skia.pdf.0.png b/testing/resources/pixel/xfa_specific/xfa_node_caption_expected_skia.pdf.0.png
index 8c32771..fe509a8 100644
--- a/testing/resources/pixel/xfa_specific/xfa_node_caption_expected_skia.pdf.0.png
+++ b/testing/resources/pixel/xfa_specific/xfa_node_caption_expected_skia.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/xfa_specific/xfa_node_caption_expected_skia.pdf.1.png b/testing/resources/pixel/xfa_specific/xfa_node_caption_expected_skia.pdf.1.png
index 2641c70..e720b9b 100644
--- a/testing/resources/pixel/xfa_specific/xfa_node_caption_expected_skia.pdf.1.png
+++ b/testing/resources/pixel/xfa_specific/xfa_node_caption_expected_skia.pdf.1.png
Binary files differ
diff --git a/testing/resources/pixel/xfa_specific/xfa_node_caption_expected_skia_mac.pdf.0.png b/testing/resources/pixel/xfa_specific/xfa_node_caption_expected_skia_mac.pdf.0.png
index 3d26771a..384294c 100644
--- a/testing/resources/pixel/xfa_specific/xfa_node_caption_expected_skia_mac.pdf.0.png
+++ b/testing/resources/pixel/xfa_specific/xfa_node_caption_expected_skia_mac.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/xfa_specific/xfa_node_caption_expected_skia_mac.pdf.1.png b/testing/resources/pixel/xfa_specific/xfa_node_caption_expected_skia_mac.pdf.1.png
index ff8f6b9..3366bc0 100644
--- a/testing/resources/pixel/xfa_specific/xfa_node_caption_expected_skia_mac.pdf.1.png
+++ b/testing/resources/pixel/xfa_specific/xfa_node_caption_expected_skia_mac.pdf.1.png
Binary files differ
diff --git a/testing/resources/pixel/xfa_specific/xfa_node_caption_expected_skia_win.pdf.0.png b/testing/resources/pixel/xfa_specific/xfa_node_caption_expected_skia_win.pdf.0.png
index f95433f..54f04d8 100644
--- a/testing/resources/pixel/xfa_specific/xfa_node_caption_expected_skia_win.pdf.0.png
+++ b/testing/resources/pixel/xfa_specific/xfa_node_caption_expected_skia_win.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/xfa_specific/xfa_node_caption_expected_skia_win.pdf.1.png b/testing/resources/pixel/xfa_specific/xfa_node_caption_expected_skia_win.pdf.1.png
index 4ef1290..7691fb1 100644
--- a/testing/resources/pixel/xfa_specific/xfa_node_caption_expected_skia_win.pdf.1.png
+++ b/testing/resources/pixel/xfa_specific/xfa_node_caption_expected_skia_win.pdf.1.png
Binary files differ
