diff --git a/DEPS b/DEPS
index f59fdb2..db7c67e 100644
--- a/DEPS
+++ b/DEPS
@@ -167,7 +167,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': '98aaa4028b42592be115ebcf9d9c0b5dc4239ddc',
+  'pdfium_tests_revision': 'c640a037f1cf0172b1c7dc12024afab865d99522',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling resultdb
   # and whatever else without interference from each other.
@@ -179,7 +179,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': '6279c88b9e29a25bf7fc6731fe7a6c41d503ee10',
+  'skia_revision': '9832c77220614781f7bcc4ccf11ea3de4974d2f5',
   # 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/core/fpdfapi/render/fpdf_progressive_render_embeddertest.cpp b/core/fpdfapi/render/fpdf_progressive_render_embeddertest.cpp
index fded097..b3b0352 100644
--- a/core/fpdfapi/render/fpdf_progressive_render_embeddertest.cpp
+++ b/core/fpdfapi/render/fpdf_progressive_render_embeddertest.cpp
@@ -449,11 +449,11 @@
   const char* content_with_ink_checksum = []() {
     if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
 #if BUILDFLAG(IS_WIN)
-      return "f6dfec1a38800973e57bba5da4fe77fe";
+      return "2dcc85c7ed9bf2b47fc7f57af629666f";
 #elif BUILDFLAG(IS_APPLE)
-      return "5108aa537b6ecc37b3f0a35b76c1b379";
+      return "94429c53a1456b13c2dcc41068551d2b";
 #else
-      return "b39d9f68ff71963d82c43eb20caa8f4d";
+      return "51ed49f5382d6a5351122d314fe80aec";
 #endif
     }
     return "797bce7dc6c50ee86b095405df9fe5aa";
@@ -471,11 +471,11 @@
   const char* content_with_stamp_checksum = []() {
     if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
 #if BUILDFLAG(IS_WIN)
-      return "9365cd179a0109640bb2b7456f211524";
+      return "2f9d0870a640f1cf2174c77fce10754c";
 #elif BUILDFLAG(IS_APPLE)
-      return "42d4d73d939cb4a1b40d003985eaf11e";
+      return "b47fa7732129767adbc1401117da5936";
 #else
-      return "6e028012a4854ebfd9ee92da862bf679";
+      return "335d9edb12230b1ed24be0e6f96576dc";
 #endif
     }
 #if BUILDFLAG(IS_APPLE)
diff --git a/fpdfsdk/fpdf_annot_embeddertest.cpp b/fpdfsdk/fpdf_annot_embeddertest.cpp
index 17fde6a..4823411 100644
--- a/fpdfsdk/fpdf_annot_embeddertest.cpp
+++ b/fpdfsdk/fpdf_annot_embeddertest.cpp
@@ -551,11 +551,11 @@
     const char* expected_hash = []() {
       if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
 #if BUILDFLAG(IS_WIN)
-        return "d9411907a883f25ba51e71c8359c10fe";
+        return "0fe22dc3ba150abd42a47de6c9379aa7";
 #elif BUILDFLAG(IS_APPLE)
-        return "6e00cc75639c5314c8273072915d8f92";
+        return "d2efb19ab7c0d1b2d475323badfe395c";
 #else
-        return "1fb0dd8dd5f0b9bb8d076e48eb59296d";
+        return "f9597c25e438a30fb143385254039f5e";
 #endif
       }
       return "354002e1c4386d38fdde29ef8d61074a";
@@ -1142,11 +1142,11 @@
   const char* md5_modified_path = []() {
     if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
 #if BUILDFLAG(IS_WIN)
-      return "ab475e8230c6aab366073bdb70eb6953";
+      return "9445f64c47079ce107adf0e20fb6a119";
 #elif BUILDFLAG(IS_APPLE)
-      return "6d9247e3a0ecdf5627f365eded71307c";
+      return "1b21450aff5cba6b800e327a22a9d900";
 #else
-      return "fb4d5fac05f7eb5d84a4100898c11197";
+      return "777f77f363824cab5ac61ceea87cd2ce";
 #endif
     }
 #if BUILDFLAG(IS_APPLE)
@@ -1158,11 +1158,11 @@
   const char* md5_two_paths = []() {
     if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
 #if BUILDFLAG(IS_WIN)
-      return "ce7f5271ff51096a15861619fb789d5b";
+      return "1007f4eae1c0fd25a369e0d80d0ec859";
 #elif BUILDFLAG(IS_APPLE)
-      return "d8a7ac6a292fbf1403effb0788599ee2";
+      return "449d3626fd5883bd5795aa722cbcbcda";
 #else
-      return "fcf3e79b2a91d1294b9bbccff727d3c2";
+      return "c51e2e05981e1b89a7be066de638822a";
 #endif
     }
 #if BUILDFLAG(IS_APPLE)
@@ -1174,11 +1174,11 @@
   const char* md5_new_annot = []() {
     if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
 #if BUILDFLAG(IS_WIN)
-      return "b627d1be207a1f090db9cf122bc198ae";
+      return "ee341aa74baea8a8e2dacffc3c758caa";
 #elif BUILDFLAG(IS_APPLE)
-      return "8f537dae2460736988530430b904bb55";
+      return "77f3b04a1679d631eb31d92e207a9270";
 #else
-      return "7db6321c8ffe502f4e60622aa16d5417";
+      return "e42ca08e1dc790541d0ffff0001836a4";
 #endif
     }
 #if BUILDFLAG(IS_APPLE)
@@ -1384,11 +1384,11 @@
   const char* md5_new_image = []() {
     if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
 #if BUILDFLAG(IS_WIN)
-      return "5b7ce251f51f50c1c76d3b09c47a87f9";
+      return "76445ac9fa2ec579ceffcb010b8b09cf";
 #elif BUILDFLAG(IS_APPLE)
-      return "d1f632f3a8bf0917eeece36e23dc3708";
+      return "9df43e8e9c9b00d247d46bab2110e070";
 #else
-      return "476596330c0e7daa31f115005c1d36eb";
+      return "584e9a0e9b02a03025e08c81476522cb";
 #endif
     }
 #if BUILDFLAG(IS_APPLE)
@@ -1400,11 +1400,11 @@
   const char* md5_modified_image = []() {
     if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
 #if BUILDFLAG(IS_WIN)
-      return "f9af241702961e8ed59306a7084548bf";
+      return "12b5eb7fea4e8656253bbe0d257f2332";
 #elif BUILDFLAG(IS_APPLE)
-      return "1a86f152a7ef8ac6bf8d8e5aee09bd65";
+      return "dfa2a2c3e9135e4c83433532fc36ea8c";
 #else
-      return "0047c3e7ea7658e1a963fc339f1c587d";
+      return "5f16a909217f0a2efe8e2464bb854672";
 #endif
     }
 #if BUILDFLAG(IS_APPLE)
@@ -1489,11 +1489,11 @@
   const char* md5_new_text = []() {
     if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
 #if BUILDFLAG(IS_WIN)
-      return "2752b71ff3373a8a427fbc4145018ee8";
+      return "a7c7cb8f7c8e7a320b414c153bffa254";
 #elif BUILDFLAG(IS_APPLE)
-      return "660063559c20b80e66c2702d44400eb2";
+      return "4e8aa29188c3ae53201bbbc9670cf88e";
 #else
-      return "1e7f98c18775d6e0f4f454747b77cc1a";
+      return "9972f90afd472e62eef7cced1f5c75e2";
 #endif
     }
 #if BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_ARM64)
@@ -1507,11 +1507,11 @@
   const char* md5_modified_text = []() {
     if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
 #if BUILDFLAG(IS_WIN)
-      return "064468521e40694712422c9a1b5212c4";
+      return "196fb5c63e2f8e14cbcaae86040166da";
 #elif BUILDFLAG(IS_APPLE)
-      return "1e93d904e7a6f6d72062e014c58c8df2";
+      return "e53f99a8a266d45709c8bfe4c78065c1";
 #else
-      return "37e35705946806f8f98c51e4e25647a2";
+      return "04d03c51137439280a2563827798e357";
 #endif
     }
 #if BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_ARM64)
@@ -1652,11 +1652,11 @@
   const char* md5 = []() {
     if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
 #if BUILDFLAG(IS_WIN)
-      return "5060b231fef2504446a5d44474869326";
+      return "fca5db70c84dc93d4175d0ec5c2a4551";
 #elif BUILDFLAG(IS_APPLE)
-      return "88528466e6e6da2915ae024b497e3d4a";
+      return "9393901838ba556e589df752f1222247";
 #else
-      return "a95a65d109eda5671c793ff5f7d2a2df";
+      return "7b7248803a26ce8916fc9828f4bdc2cb";
 #endif
     }
 #if BUILDFLAG(IS_APPLE)
@@ -3125,11 +3125,11 @@
     const char* md5_sum = []() {
       if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
 #if BUILDFLAG(IS_WIN)
-        return "911a6dbe2209b5e9e7e0a09b98c12d2e";
+        return "f8c17a0b11d5e152d9a90d6469c6be96";
 #elif BUILDFLAG(IS_APPLE)
-        return "be6dcf7a2129469020ec60e56c905a6e";
+        return "cd02e06aeb6555ca7d03136cb8f2e336";
 #else
-        return "c09b129c071ec1569deb003676b617b0";
+        return "a08901d205e54530e76f5fc81846eb6a";
 #endif
       }
 #if BUILDFLAG(IS_APPLE)
@@ -3160,11 +3160,11 @@
     const char* md5_sum = []() {
       if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
 #if BUILDFLAG(IS_WIN)
-        return "27777b11ea1498200b42d00a083a598f";
+        return "29886792e8942117a291dee7acdbf39f";
 #elif BUILDFLAG(IS_APPLE)
-        return "6b820388ace6004e83cd17392dddf32e";
+        return "7e85e4675adccb100fc2cf1037f65f4a";
 #else
-        return "277f1b9e70031539d034d22bc6064838";
+        return "de2186f2f36169d0002257a810435648";
 #endif
       }
 #if BUILDFLAG(IS_APPLE)
@@ -3186,11 +3186,11 @@
     const char* md5_sum = []() {
       if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
 #if BUILDFLAG(IS_WIN)
-        return "61594e370efd7cb9097d8036b168ff1f";
+        return "651517d1a58558c6eae18ebb3ff90784";
 #elif BUILDFLAG(IS_APPLE)
-        return "4d41eddb0aadc3db440cb83877bd52e4";
+        return "96f271ee3f1520d174f887f33989bbcb";
 #else
-        return "d980005939cd4ae0a199d8600a0abdf3";
+        return "27bb036f3a507fce66a74a00daf558ec";
 #endif
       }
 #if BUILDFLAG(IS_APPLE)
diff --git a/fpdfsdk/fpdf_view_embeddertest.cpp b/fpdfsdk/fpdf_view_embeddertest.cpp
index dc87b5f..4795c5a 100644
--- a/fpdfsdk/fpdf_view_embeddertest.cpp
+++ b/fpdfsdk/fpdf_view_embeddertest.cpp
@@ -1000,12 +1000,6 @@
     }
     return "f11a11137c8834389e31cf555a4a6979";
   }();
-  const char* hori_stretched_checksum = []() {
-    if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
-      return "6d3776d7bb21cbb7195126b8e95dfba2";
-    }
-    return "48ef9205941ed19691ccfa00d717187e";
-  }();
   const char* rotated_90_clockwise_checksum = []() {
     if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
       return "b4baa001d201baed576cd6d5d0d5a160";
@@ -1044,7 +1038,7 @@
   }();
   const char* larger_rotated_diagonal_checksum = []() {
     if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
-      return "85c41bb892c1a09882f432aa2f4a5ef6";
+      return "a7179bc24e329341a1a1f6d6be20a1e9";
     }
     return "3d62417468bdaff0eb14391a0c30a3b1";
   }();
@@ -1054,6 +1048,7 @@
     }
     return "0a190003c97220bf8877684c8d7e89cf";
   }();
+  const char kHoriStretchedChecksum[] = "48ef9205941ed19691ccfa00d717187e";
   const char kLargerChecksum[] = "c806145641c3e6fc4e022c7065343749";
   const char kLargerClippedChecksum[] = "091d3b1c7933c8f6945eb2cb41e588e9";
   const char kLargerRotatedChecksum[] = "115f13353ebfc82ddb392d1f0059eb12";
@@ -1097,7 +1092,7 @@
   FS_MATRIX stretch_x_matrix{2, 0, 0, 1, 0, 0};
   TestRenderPageBitmapWithMatrix(page, page_width, page_height,
                                  stretch_x_matrix, page_rect,
-                                 hori_stretched_checksum);
+                                 kHoriStretchedChecksum);
 
   // Try a 90 degree rotation clockwise but with the same bitmap size, so part
   // will be clipped.
diff --git a/testing/embedder_test_constants.cpp b/testing/embedder_test_constants.cpp
index 0aced5a..ce18a57 100644
--- a/testing/embedder_test_constants.cpp
+++ b/testing/embedder_test_constants.cpp
@@ -12,11 +12,11 @@
 const char* AnnotationStampWithApChecksum() {
   if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
 #if BUILDFLAG(IS_WIN)
-    return "f7f3a1029cea01cc993fa7770feebdc1";
+    return "d2f803f5cccfc87e955263a78deee246";
 #elif BUILDFLAG(IS_APPLE)
-    return "f0867738d59a682b8d57baa88b35afc3";
+    return "8c52190e02e9af7dfec52a3c664c200d";
 #else
-    return "c7ff65a3ad1b01c3a0e94d635f10670e";
+    return "3b14f454c33025157621411a301faa07";
 #endif
   }
 #if BUILDFLAG(IS_APPLE)
diff --git a/testing/resources/pixel/bug_1161_expected_skia.pdf.0.png b/testing/resources/pixel/bug_1161_expected_skia.pdf.0.png
index f6a4fee..4197dcb 100644
--- a/testing/resources/pixel/bug_1161_expected_skia.pdf.0.png
+++ b/testing/resources/pixel/bug_1161_expected_skia.pdf.0.png
Binary files differ
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 e7c07b7..80aaf35 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_1372651_expected_skia_mac.pdf.0.png b/testing/resources/pixel/bug_1372651_expected_skia_mac.pdf.0.png
index 94dce03..e21e25f 100644
--- a/testing/resources/pixel/bug_1372651_expected_skia_mac.pdf.0.png
+++ b/testing/resources/pixel/bug_1372651_expected_skia_mac.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_1372651_expected_skia_win.pdf.0.png b/testing/resources/pixel/bug_1372651_expected_skia_win.pdf.0.png
index a5b0abe..f756b17 100644
--- a/testing/resources/pixel/bug_1372651_expected_skia_win.pdf.0.png
+++ b/testing/resources/pixel/bug_1372651_expected_skia_win.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_1772_expected_skia.pdf.0.png b/testing/resources/pixel/bug_1772_expected_skia.pdf.0.png
index 477b2a2..bff3b45 100644
--- a/testing/resources/pixel/bug_1772_expected_skia.pdf.0.png
+++ b/testing/resources/pixel/bug_1772_expected_skia.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_1983_expected_skia.pdf.0.png b/testing/resources/pixel/bug_1983_expected_skia.pdf.0.png
index 1e341ac..01a9ed2 100644
--- a/testing/resources/pixel/bug_1983_expected_skia.pdf.0.png
+++ b/testing/resources/pixel/bug_1983_expected_skia.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_632_expected_skia.pdf.1.png b/testing/resources/pixel/bug_632_expected_skia.pdf.1.png
index 3e66da2..60b51c1 100644
--- a/testing/resources/pixel/bug_632_expected_skia.pdf.1.png
+++ b/testing/resources/pixel/bug_632_expected_skia.pdf.1.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 80cac57..65f8d33 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 ecb7d2b..aa030a1 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 3cddbc0..fa0daef 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_2_expected_skia_mac.pdf.0.png b/testing/resources/pixel/bug_736695_2_expected_skia_mac.pdf.0.png
index b517713..9770a7c 100644
--- a/testing/resources/pixel/bug_736695_2_expected_skia_mac.pdf.0.png
+++ b/testing/resources/pixel/bug_736695_2_expected_skia_mac.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_736695_2_expected_skia_win.pdf.0.png b/testing/resources/pixel/bug_736695_2_expected_skia_win.pdf.0.png
index 75e3b03..3cab34d 100644
--- a/testing/resources/pixel/bug_736695_2_expected_skia_win.pdf.0.png
+++ b/testing/resources/pixel/bug_736695_2_expected_skia_win.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 8f668d0..9c6a60b 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_3_expected_skia_mac.pdf.0.png b/testing/resources/pixel/bug_736695_3_expected_skia_mac.pdf.0.png
index 73d314c..f1258e5 100644
--- a/testing/resources/pixel/bug_736695_3_expected_skia_mac.pdf.0.png
+++ b/testing/resources/pixel/bug_736695_3_expected_skia_mac.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_736695_3_expected_skia_win.pdf.0.png b/testing/resources/pixel/bug_736695_3_expected_skia_win.pdf.0.png
index 3bbd5fc..78dc0fb 100644
--- a/testing/resources/pixel/bug_736695_3_expected_skia_win.pdf.0.png
+++ b/testing/resources/pixel/bug_736695_3_expected_skia_win.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 ecb7d2b..aa030a1 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 f0c8193..fa2b955 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/bug_846_expected_skia_mac.pdf.0.png b/testing/resources/pixel/bug_846_expected_skia_mac.pdf.0.png
index 04d8093..584112e 100644
--- a/testing/resources/pixel/bug_846_expected_skia_mac.pdf.0.png
+++ b/testing/resources/pixel/bug_846_expected_skia_mac.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_846_expected_skia_win.pdf.0.png b/testing/resources/pixel/bug_846_expected_skia_win.pdf.0.png
index 3991278..be0078e 100644
--- a/testing/resources/pixel/bug_846_expected_skia_win.pdf.0.png
+++ b/testing/resources/pixel/bug_846_expected_skia_win.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/checkbox_radiobutton_expected_skia.pdf.0.png b/testing/resources/pixel/checkbox_radiobutton_expected_skia.pdf.0.png
index fe713a6..76d7a10 100644
--- a/testing/resources/pixel/checkbox_radiobutton_expected_skia.pdf.0.png
+++ b/testing/resources/pixel/checkbox_radiobutton_expected_skia.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/checkbox_radiobutton_hide_expected_skia.pdf.0.png b/testing/resources/pixel/checkbox_radiobutton_hide_expected_skia.pdf.0.png
index bdb2d6e..dd6aad4 100644
--- a/testing/resources/pixel/checkbox_radiobutton_hide_expected_skia.pdf.0.png
+++ b/testing/resources/pixel/checkbox_radiobutton_hide_expected_skia.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/checkbox_radiobutton_reset_expected_skia.pdf.0.png b/testing/resources/pixel/checkbox_radiobutton_reset_expected_skia.pdf.0.png
index 057ecda..2d8e95b 100644
--- a/testing/resources/pixel/checkbox_radiobutton_reset_expected_skia.pdf.0.png
+++ b/testing/resources/pixel/checkbox_radiobutton_reset_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 4686e96..46c98bf 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/scrollable_widgets1_expected_skia.pdf.0.png b/testing/resources/pixel/scrollable_widgets1_expected_skia.pdf.0.png
index 348c1a5..62dea35 100644
--- a/testing/resources/pixel/scrollable_widgets1_expected_skia.pdf.0.png
+++ b/testing/resources/pixel/scrollable_widgets1_expected_skia.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/scrollable_widgets1_expected_skia_mac.pdf.0.png b/testing/resources/pixel/scrollable_widgets1_expected_skia_mac.pdf.0.png
index d4bd076..91f9526 100644
--- a/testing/resources/pixel/scrollable_widgets1_expected_skia_mac.pdf.0.png
+++ b/testing/resources/pixel/scrollable_widgets1_expected_skia_mac.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/scrollable_widgets1_expected_skia_win.pdf.0.png b/testing/resources/pixel/scrollable_widgets1_expected_skia_win.pdf.0.png
index b506317..43d8acf 100644
--- a/testing/resources/pixel/scrollable_widgets1_expected_skia_win.pdf.0.png
+++ b/testing/resources/pixel/scrollable_widgets1_expected_skia_win.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/scrollable_widgets2_expected_skia.pdf.0.png b/testing/resources/pixel/scrollable_widgets2_expected_skia.pdf.0.png
index 79ca0f5..c0e8472 100644
--- a/testing/resources/pixel/scrollable_widgets2_expected_skia.pdf.0.png
+++ b/testing/resources/pixel/scrollable_widgets2_expected_skia.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/scrollable_widgets2_expected_skia_mac.pdf.0.png b/testing/resources/pixel/scrollable_widgets2_expected_skia_mac.pdf.0.png
index ad05779..00829b5 100644
--- a/testing/resources/pixel/scrollable_widgets2_expected_skia_mac.pdf.0.png
+++ b/testing/resources/pixel/scrollable_widgets2_expected_skia_mac.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/scrollable_widgets2_expected_skia_win.pdf.0.png b/testing/resources/pixel/scrollable_widgets2_expected_skia_win.pdf.0.png
index 6994adb..4f42bf6 100644
--- a/testing/resources/pixel/scrollable_widgets2_expected_skia_win.pdf.0.png
+++ b/testing/resources/pixel/scrollable_widgets2_expected_skia_win.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 da9e4b3..4743952 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 06ebcae..86cea27 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_list_box_allow_multiple_selection_expected_skia_win.pdf.0.png b/testing/resources/pixel/xfa_specific/dynamic_list_box_allow_multiple_selection_expected_skia_win.pdf.0.png
index 644da71..3bc55f9 100644
--- a/testing/resources/pixel/xfa_specific/dynamic_list_box_allow_multiple_selection_expected_skia_win.pdf.0.png
+++ b/testing/resources/pixel/xfa_specific/dynamic_list_box_allow_multiple_selection_expected_skia_win.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 d90125f..c2f5e48 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/resolve_nodes_0_expected_skia_mac.pdf.0.png b/testing/resources/pixel/xfa_specific/resolve_nodes_0_expected_skia_mac.pdf.0.png
index 2a166d0..71597b8 100644
--- a/testing/resources/pixel/xfa_specific/resolve_nodes_0_expected_skia_mac.pdf.0.png
+++ b/testing/resources/pixel/xfa_specific/resolve_nodes_0_expected_skia_mac.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/xfa_specific/resolve_nodes_0_expected_skia_win.pdf.0.png b/testing/resources/pixel/xfa_specific/resolve_nodes_0_expected_skia_win.pdf.0.png
index 8c23dc9..21ad45e 100644
--- a/testing/resources/pixel/xfa_specific/resolve_nodes_0_expected_skia_win.pdf.0.png
+++ b/testing/resources/pixel/xfa_specific/resolve_nodes_0_expected_skia_win.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 0a9ff37..15ae4ba 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 fa7e97e..0d4737d 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/static_password_field_rotate_expected_skia_mac.pdf.0.png b/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected_skia_mac.pdf.0.png
index a969e2f..f365448 100644
--- a/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected_skia_mac.pdf.0.png
+++ b/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected_skia_mac.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected_skia_mac.pdf.1.png b/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected_skia_mac.pdf.1.png
index 6792e44..c72f468 100644
--- a/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected_skia_mac.pdf.1.png
+++ b/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected_skia_mac.pdf.1.png
Binary files differ
diff --git a/xfa/fwl/cfwl_edit_embeddertest.cpp b/xfa/fwl/cfwl_edit_embeddertest.cpp
index aa58317..eae4000 100644
--- a/xfa/fwl/cfwl_edit_embeddertest.cpp
+++ b/xfa/fwl/cfwl_edit_embeddertest.cpp
@@ -277,7 +277,7 @@
   {
     const char* filled_checksum = []() {
       if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
-        return "8c555487e09ee4acf3ace77db5929bdc";
+        return "5a246f785310fe71544dfe2c85669915";
       }
       return "dad642ae8a5afce2591ffbcabbfc58dd";
     }();