Sync Skia build config with Chromium's for Windows builds
Except PDFium needs to add SkFontMgr_win_dw_factory.cpp to the build,
whereas Chromium separately implements a factory that does mostly the
same thing.
Bug: pdfium:1830
Change-Id: Id89997ea62621af4c08dd305563a69b61aa04f34
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/112891
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Nigi <nigi@chromium.org>
diff --git a/DEPS b/DEPS
index d7d0e43..1088cae 100644
--- a/DEPS
+++ b/DEPS
@@ -166,7 +166,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': 'ea96d0e742a4202dc6331b818b8d65ea3c81e43b',
+ 'pdfium_tests_revision': 'dd9f115e29abcaba175e157f2afab8473fea0048',
# 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/fpdfapi/parser/cpdf_security_handler_embeddertest.cpp b/core/fpdfapi/parser/cpdf_security_handler_embeddertest.cpp
index 6b5e09d..db573c0 100644
--- a/core/fpdfapi/parser/cpdf_security_handler_embeddertest.cpp
+++ b/core/fpdfapi/parser/cpdf_security_handler_embeddertest.cpp
@@ -143,7 +143,9 @@
TEST_F(CPDFSecurityHandlerEmbedderTest, PasswordAfterGenerateSave) {
const char* checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "caa4bfda016a9c48a540ff7c6716468c";
+#elif BUILDFLAG(IS_APPLE)
return "6c1a242ce886df5cf578401eeeaa1929";
#else
return "ad97491cab71c02f1f4ef5ba0a7b5593";
diff --git a/core/fpdfapi/render/fpdf_progressive_render_embeddertest.cpp b/core/fpdfapi/render/fpdf_progressive_render_embeddertest.cpp
index 3b9edc7..da11587 100644
--- a/core/fpdfapi/render/fpdf_progressive_render_embeddertest.cpp
+++ b/core/fpdfapi/render/fpdf_progressive_render_embeddertest.cpp
@@ -25,7 +25,9 @@
const char* AnnotationStampWithApBaseContentChecksum() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "7f8437212ef1cd33ff505ece5a7e99f8";
+#elif BUILDFLAG(IS_APPLE)
return "346c4463cf822e39e29a602a504b9153";
#else
return "4fedc838daa6762cf7eee180986a0f1b";
@@ -320,7 +322,9 @@
// Test rendering of text with forced color scheme on.
const char* content_with_text_checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "e970b97a719ce4d8efdfcbc316255aac";
+#elif BUILDFLAG(IS_APPLE)
return "9eba0a0147f1d9685514d274e03d574e";
#else
return "edd919ec8b59fab1f16b5f2adb1175f3";
@@ -381,7 +385,9 @@
// Normal blend mode.
const char* content_with_highlight_fill_checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "8ed2cbc6a362752fabdf9b50d3358c96";
+#elif BUILDFLAG(IS_APPLE)
return "fcd4dd021656f692f346780acaa24895";
#else
return "49dcfcfdc38d200bb3d57a2ca3086034";
@@ -413,7 +419,9 @@
const char* md5_content_with_highlight = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "9389330c006d3e6054057992624684a8";
+#elif BUILDFLAG(IS_APPLE)
return "b7039f73f2d8a3ac3e1ef1492e425b99";
#else
return "c609e8810fba2f12db8f8a2b043d97bd";
@@ -438,7 +446,9 @@
// Test rendering of multiple ink with forced color scheme on.
const char* content_with_ink_checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "f6dfec1a38800973e57bba5da4fe77fe";
+#elif BUILDFLAG(IS_APPLE)
return "5108aa537b6ecc37b3f0a35b76c1b379";
#else
return "b39d9f68ff71963d82c43eb20caa8f4d";
@@ -458,7 +468,9 @@
// Test rendering of static annotation with forced color scheme on.
const char* content_with_stamp_checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "9365cd179a0109640bb2b7456f211524";
+#elif BUILDFLAG(IS_APPLE)
return "42d4d73d939cb4a1b40d003985eaf11e";
#else
return "6e028012a4854ebfd9ee92da862bf679";
diff --git a/fpdfsdk/fpdf_annot_embeddertest.cpp b/fpdfsdk/fpdf_annot_embeddertest.cpp
index 963e787..6897efe 100644
--- a/fpdfsdk/fpdf_annot_embeddertest.cpp
+++ b/fpdfsdk/fpdf_annot_embeddertest.cpp
@@ -548,7 +548,9 @@
{
const char* expected_hash = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "d9411907a883f25ba51e71c8359c10fe";
+#elif BUILDFLAG(IS_APPLE)
return "6e00cc75639c5314c8273072915d8f92";
#else
return "1fb0dd8dd5f0b9bb8d076e48eb59296d";
@@ -774,7 +776,9 @@
// Open the saved document.
const char* checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "c50012ab122cd3706d39f371ca7462ee";
+#elif BUILDFLAG(IS_APPLE)
return "24994ad69aa612a66d183eaf9a92aa06";
#else
return "798fa41303381c9ba6d99092f5cd4d2b";
@@ -897,7 +901,9 @@
TEST_F(FPDFAnnotEmbedderTest, ModifyRectQuadpointsWithAP) {
const char* md5_original = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "3867f6e34e801abad4e98811f6d7b887";
+#elif BUILDFLAG(IS_APPLE)
return "32cd26430a31752e612475bf881cc597";
#else
return "2a9d1df839d5ec81a49f982347d9656c";
@@ -911,7 +917,9 @@
}();
const char* md5_modified_highlight = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "a6f6df562dcf96b3670d40fa2999a582";
+#elif BUILDFLAG(IS_APPLE)
return "9a969b7089f49c029b10cf8c208b40dd";
#else
return "0fb1653db0e8e8f7ce5d726bb0074bb5";
@@ -925,7 +933,9 @@
}();
const char* md5_modified_square = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "cebb3bd3209f63f6dfd15b8425229e90";
+#elif BUILDFLAG(IS_APPLE)
return "613102f8b6d74d6d9f95c8eacd17b756";
#else
return "879c77a2cb9f79ba65ffe0bbdd720ce3";
@@ -1129,7 +1139,9 @@
TEST_F(FPDFAnnotEmbedderTest, AddAndModifyPath) {
const char* md5_modified_path = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "ab475e8230c6aab366073bdb70eb6953";
+#elif BUILDFLAG(IS_APPLE)
return "6d9247e3a0ecdf5627f365eded71307c";
#else
return "fb4d5fac05f7eb5d84a4100898c11197";
@@ -1143,7 +1155,9 @@
}();
const char* md5_two_paths = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "ce7f5271ff51096a15861619fb789d5b";
+#elif BUILDFLAG(IS_APPLE)
return "d8a7ac6a292fbf1403effb0788599ee2";
#else
return "fcf3e79b2a91d1294b9bbccff727d3c2";
@@ -1157,7 +1171,9 @@
}();
const char* md5_new_annot = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "b627d1be207a1f090db9cf122bc198ae";
+#elif BUILDFLAG(IS_APPLE)
return "8f537dae2460736988530430b904bb55";
#else
return "7db6321c8ffe502f4e60622aa16d5417";
@@ -1365,7 +1381,9 @@
TEST_F(FPDFAnnotEmbedderTest, AddAndModifyImage) {
const char* md5_new_image = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "5b7ce251f51f50c1c76d3b09c47a87f9";
+#elif BUILDFLAG(IS_APPLE)
return "d1f632f3a8bf0917eeece36e23dc3708";
#else
return "476596330c0e7daa31f115005c1d36eb";
@@ -1379,7 +1397,9 @@
}();
const char* md5_modified_image = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "f9af241702961e8ed59306a7084548bf";
+#elif BUILDFLAG(IS_APPLE)
return "1a86f152a7ef8ac6bf8d8e5aee09bd65";
#else
return "0047c3e7ea7658e1a963fc339f1c587d";
@@ -1466,7 +1486,9 @@
TEST_F(FPDFAnnotEmbedderTest, AddAndModifyText) {
const char* md5_new_text = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "2752b71ff3373a8a427fbc4145018ee8";
+#elif BUILDFLAG(IS_APPLE)
return "660063559c20b80e66c2702d44400eb2";
#else
return "1e7f98c18775d6e0f4f454747b77cc1a";
@@ -1482,7 +1504,9 @@
}();
const char* md5_modified_text = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "064468521e40694712422c9a1b5212c4";
+#elif BUILDFLAG(IS_APPLE)
return "1e93d904e7a6f6d72062e014c58c8df2";
#else
return "37e35705946806f8f98c51e4e25647a2";
@@ -1625,7 +1649,9 @@
const char* md5 = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "5060b231fef2504446a5d44474869326";
+#elif BUILDFLAG(IS_APPLE)
return "88528466e6e6da2915ae024b497e3d4a";
#else
return "a95a65d109eda5671c793ff5f7d2a2df";
@@ -3095,7 +3121,9 @@
{
const char* md5_sum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "911a6dbe2209b5e9e7e0a09b98c12d2e";
+#elif BUILDFLAG(IS_APPLE)
return "be6dcf7a2129469020ec60e56c905a6e";
#else
return "c09b129c071ec1569deb003676b617b0";
@@ -3128,7 +3156,9 @@
{
const char* md5_sum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "27777b11ea1498200b42d00a083a598f";
+#elif BUILDFLAG(IS_APPLE)
return "6b820388ace6004e83cd17392dddf32e";
#else
return "277f1b9e70031539d034d22bc6064838";
@@ -3152,7 +3182,9 @@
{
const char* md5_sum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "61594e370efd7cb9097d8036b168ff1f";
+#elif BUILDFLAG(IS_APPLE)
return "4d41eddb0aadc3db440cb83877bd52e4";
#else
return "d980005939cd4ae0a199d8600a0abdf3";
@@ -3733,7 +3765,9 @@
const char* original_checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "36ab186e78c0b88eeb8f7aceea93b72c";
+#elif BUILDFLAG(IS_APPLE)
return "953b14259560aeca886ea44c9529892b";
#else
return "238dccc7df0ac61ac580c28e1109da3c";
@@ -3747,7 +3781,9 @@
}();
const char* modified_checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "ece1ab24a0d9425ef3b06747c95d75ce";
+#elif BUILDFLAG(IS_APPLE)
return "bfc344e98798298bf7bb0953db75c686";
#else
return "0f326acb3eb583125ca584d703ccb13b";
diff --git a/fpdfsdk/fpdf_edit_embeddertest.cpp b/fpdfsdk/fpdf_edit_embeddertest.cpp
index b6251cf..eda0576 100644
--- a/fpdfsdk/fpdf_edit_embeddertest.cpp
+++ b/fpdfsdk/fpdf_edit_embeddertest.cpp
@@ -50,7 +50,9 @@
const char* BottomTextChecksum() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "5d8f2b613a2f9591a52373c72d6b88ee";
+#elif BUILDFLAG(IS_APPLE)
return "8ca7dc6269ee68507389aa40eebcb9f8";
#else
return "c62d315856a558d2666b80d474831efe";
@@ -65,7 +67,9 @@
const char* FirstRemovedChecksum() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "251007e902e512d0359240ad957ee2dc";
+#elif BUILDFLAG(IS_APPLE)
return "dcb929fae86d5b935888ce7f9f1ab71b";
#else
return "3006ab2b12d27246eae4faad509ac575";
@@ -82,7 +86,9 @@
const char* LoadedFontTextChecksum() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "b0efd562e84958f06bb006ba27d5f4bd";
+#elif BUILDFLAG(IS_APPLE)
return "23e7874d160692b0ef3e0c8780f73dab";
#else
return "fc2334c350cbd0d2ae6076689da09741";
@@ -307,7 +313,9 @@
const char* checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "a1bc9e4007dc2155e9f56bf16234573e";
+#elif BUILDFLAG(IS_APPLE)
return "9a31fb87d1c6d2346bba22d1196041cd";
#else
return "5bb65e15fc0a685934cd5006dec08a76";
@@ -353,7 +361,9 @@
const char* checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "a1bc9e4007dc2155e9f56bf16234573e";
+#elif BUILDFLAG(IS_APPLE)
return "9a31fb87d1c6d2346bba22d1196041cd";
#else
return "5bb65e15fc0a685934cd5006dec08a76";
@@ -781,7 +791,9 @@
const char* changed_checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "e1c530ca0705424f19a1b7ff0bffdbaa";
+#elif BUILDFLAG(IS_APPLE)
return "c65881cb16125c23e5513a16dc68f3a2";
#else
return "4a8345a139507932729e07d4831cbe2b";
@@ -845,7 +857,9 @@
const char* original_checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "0822ec5d476e8371544ef4bb7a0596e1";
+#elif BUILDFLAG(IS_APPLE)
return "721dae4e2258a52a000af88d09ec75ca";
#else
return "3c04e3acc732faaf39fb0c19efd056ac";
@@ -917,7 +931,9 @@
const char* original_checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "6f22adb3ba2a2c60a940bfb52e14dd58";
+#elif BUILDFLAG(IS_APPLE)
return "afa2260cbe84be78867940d72420d0b4";
#else
return "d76a31d931a350f0809226a41029a9a4";
@@ -979,7 +995,9 @@
{
const char* original_checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "10c8257bb54b4431196d963d68d45f12";
+#elif BUILDFLAG(IS_APPLE)
return "c42eef2028cb86a0a8601d61707b126f";
#else
return "d8be4379e729242785945458924318a3";
@@ -1000,7 +1018,9 @@
const char* removed_checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "95484d03b9da898617f297b1429f7f84";
+#elif BUILDFLAG(IS_APPLE)
return "7222709eca0e8f72a66ce06283f7c10f";
#else
return "4a02191e033dddeb2110d55af3f14544";
@@ -1033,7 +1053,9 @@
// issue.
const char* wrong_checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "441cada6218d4fd79dbe0ba95093524e";
+#elif BUILDFLAG(IS_APPLE)
return "627290533339e0ae493dc9385fac53e2";
#else
return "57da26dcb24503403cadb27ed8bb46c6";
@@ -1408,7 +1430,9 @@
{
const char* original_checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "cefa45d13f92fb761251661a2c889157";
+#elif BUILDFLAG(IS_APPLE)
return "b2044dc5b49fdca723d74bd6277df689";
#else
return "efc2206b313fff03be8e701907322b06";
@@ -1463,7 +1487,9 @@
EXPECT_EQ(11, FPDFPage_CountObjects(page));
const char* non_primes_checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "690c7d4c7850fbe726c2299208425f4f";
+#elif BUILDFLAG(IS_APPLE)
return "427228e73125ede1050a641cd9b9c8ec";
#else
return "10a6558c9e40ea837922e6f2882a2d57";
@@ -1481,7 +1507,9 @@
}();
const char* non_primes_after_save_checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "690c7d4c7850fbe726c2299208425f4f";
+#elif BUILDFLAG(IS_APPLE)
return "427228e73125ede1050a641cd9b9c8ec";
#else
return "10a6558c9e40ea837922e6f2882a2d57";
@@ -1772,7 +1800,9 @@
ASSERT_EQ(2, FPDFPage_CountObjects(page));
const char* hello_removed_checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "48b5524e20e942d2a8f7e15611968cc7";
+#elif BUILDFLAG(IS_APPLE)
return "5b9d1dee233eb9d51e23a36c6c631443";
#else
return "204c11472f5b93719487de7b9c1b1c93";
@@ -1937,7 +1967,9 @@
const char* stream1_removed_checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "d7e6debf2dc02de449860ee8012a18d2";
+#elif BUILDFLAG(IS_APPLE)
return "b26ac6d9bef9c756a19a9aafc60709bd";
#else
return "0b3ef335b8d86a3f9d609368b9d075e0";
@@ -2460,7 +2492,9 @@
ScopedFPDFBitmap bitmap = RenderLoadedPage(page);
const char* checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "52c133b5b6bf76760c59cffc12c1131a";
+#elif BUILDFLAG(IS_APPLE)
return "9eba2a1a6599c2abcf002012217a6505";
#else
return "72523cfac069f8a81057164682998961";
@@ -2651,7 +2685,9 @@
ScopedFPDFBitmap page_bitmap = RenderPage(page.get());
const char* checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "667f74c7cbf72c75bce303ca2de975a3";
+#elif BUILDFLAG(IS_APPLE)
return "86d51a764615b843465695786e92fec5";
#else
return "3fa05f8935a43a38a8923e9d5fb94365";
@@ -2682,7 +2718,9 @@
ScopedFPDFBitmap page_bitmap = RenderPage(page.get());
const char* checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "4695b3de213d6795a591f27cd8d86e26";
+#elif BUILDFLAG(IS_APPLE)
return "422f1384c13e95c218498a8f18b9e5a7";
#else
return "63385a217934d9ee9e17ef4d7f7b2128";
@@ -2769,7 +2807,9 @@
TEST_F(FPDFEditEmbedderTest, SetTextRenderMode) {
const char* original_checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "e17a6453cb48a600f180c5907c4ea02e";
+#elif BUILDFLAG(IS_APPLE)
return "e2d5c32499173c0ff939ad2e7fc01fd6";
#else
return "48c7f21b2a1a1bbeab24cccccc131e47";
@@ -3108,7 +3148,9 @@
TEST_F(FPDFEditEmbedderTest, ModifyFormObject) {
const char* orig_checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "9d0ca0d471efc12950f337a867ab1694";
+#elif BUILDFLAG(IS_APPLE)
return "4cfff1919007a7faf099be5cc2cea00a";
#else
return "1c6dae4b04fea7430a791135721eaba5";
@@ -3122,7 +3164,9 @@
}();
const char* new_checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "dbebf244eb706dfebfd0594c23e993a9";
+#elif BUILDFLAG(IS_APPLE)
return "eb88a6842f5e12f5180385261db1f81d";
#else
return "7282fe98693c0a7ad2c1b3f3f9563977";
@@ -3556,7 +3600,9 @@
ScopedFPDFBitmap page_bitmap2 = RenderPage(page);
const char* insert_true_type_checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "7e44d135666d8bfcef5cdb4c8161fd4b";
+#elif BUILDFLAG(IS_APPLE)
return "6bab7f663daca1aab63d787a0f5cb33b";
#else
return "4f9a6c7752ac7d4e4c731260fdb5af15";
@@ -4728,7 +4774,9 @@
ASSERT_TRUE(bitmap);
const char* checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "5cef5b3e56e91e1a66b6780fb26bb5e3";
+#elif BUILDFLAG(IS_APPLE)
return "9e7774173acee966fcaa72e599eb9a93";
#else
return "b17801afe8a36d6aad6c2239b88f2a73";
@@ -4743,7 +4791,9 @@
ASSERT_TRUE(x2_bitmap);
const char* x2_checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "3cea4255285df04659e3c7477287bdb1";
+#elif BUILDFLAG(IS_APPLE)
return "2b34bddd2a1471e245cf72603c6799b4";
#else
return "33af8b151ab26ebce5a71b39eedea6b1";
@@ -4758,7 +4808,9 @@
ASSERT_TRUE(x10_bitmap);
const char* x10_checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "1cc617da9ed5922eeac2414108509ef5";
+#elif BUILDFLAG(IS_APPLE)
return "0450d576560274a7df31cb93d040e721";
#else
return "93dd7ad07bdaaba9ecd268350cb91596";
@@ -4778,7 +4830,9 @@
ASSERT_TRUE(bitmap);
const char* checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "336be21110c795cefcab9bbdbc3afcdd";
+#elif BUILDFLAG(IS_APPLE)
return "0b9efedcb8f5aa9246c52e90811cb046";
#else
return "63fd059d984a5bea10f27ba026420202";
@@ -4793,7 +4847,9 @@
ASSERT_TRUE(x2_bitmap);
const char* x2_checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "c5cecc5553843a4dd4fff3ceb4855a82";
+#elif BUILDFLAG(IS_APPLE)
return "10f4d9528a5471ab0b235984f0354dd4";
#else
return "fc45021e3ea3ebd406fe6ffaa8c5c5b7";
@@ -4808,7 +4864,9 @@
ASSERT_TRUE(x10_bitmap);
const char* x10_checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "cff29dcbe77092ec7f73e46766a289c7";
+#elif BUILDFLAG(IS_APPLE)
return "9e87791ffdf4cca0a0f118be245970c8";
#else
return "61476636eaa0da0b93d8b1937cf22b75";
@@ -4835,7 +4893,9 @@
ASSERT_TRUE(bitmap);
const char* checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "ba5322a4e6b0f79dca42be88f3007708";
+#elif BUILDFLAG(IS_APPLE)
return "22cf71716a7059f481a63e32b6088c8c";
#else
return "f515a7209d7892065d3716ec462f5c10";
@@ -4850,7 +4910,9 @@
ASSERT_TRUE(x2_bitmap);
const char* x2_checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "e8fb0a707b2924726757a2ed32d6f28d";
+#elif BUILDFLAG(IS_APPLE)
return "5d4be6808bdcec3f6ee7352122dd986d";
#else
return "c69bbe5318ec149f63228e276e708612";
@@ -4865,7 +4927,9 @@
ASSERT_TRUE(x10_bitmap);
const char* x10_checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "eb0cbf56707d1c39ce0ab89a9b43d6a8";
+#elif BUILDFLAG(IS_APPLE)
return "98757f865abde60c7f7f60c74435cb85";
#else
return "bb7c2ec575f27cf882dcd38f2563c00f";
@@ -4915,7 +4979,9 @@
ASSERT_TRUE(bitmap);
const char* checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "ef501232372617a545ae35d7664fd9ec";
+#elif BUILDFLAG(IS_APPLE)
return "a637d62f2e8ae10c3267b2ff5fcc2246";
#else
return "574ae982d02e653ab6a8f23a6cdf4085";
diff --git a/fpdfsdk/fpdf_flatten_embeddertest.cpp b/fpdfsdk/fpdf_flatten_embeddertest.cpp
index 5e07db9..2a29d7e 100644
--- a/fpdfsdk/fpdf_flatten_embeddertest.cpp
+++ b/fpdfsdk/fpdf_flatten_embeddertest.cpp
@@ -75,7 +75,9 @@
TEST_F(FPDFFlattenEmbedderTest, BUG_889099) {
const char* page_checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "1d83328d2d1ca12b9c9ea5faa62ac515";
+#elif BUILDFLAG(IS_APPLE)
return "3b6f937deec2d27029cbce02111dc065";
#else
return "de7119d99f42deab2f4215017bdb16af";
@@ -89,7 +91,9 @@
}();
const char* flattened_page_checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "07deccbd4a42aaf6bf45a525f0be388e";
+#elif BUILDFLAG(IS_APPLE)
return "f1bbe115355a2ad6d8ac34c7ff14ba75";
#else
return "7978c7b3d643a5f0ac0f03ce759c55fe";
diff --git a/fpdfsdk/fpdf_formfill_embeddertest.cpp b/fpdfsdk/fpdf_formfill_embeddertest.cpp
index 7b1395e..dd79566 100644
--- a/fpdfsdk/fpdf_formfill_embeddertest.cpp
+++ b/fpdfsdk/fpdf_formfill_embeddertest.cpp
@@ -1337,7 +1337,9 @@
TEST_F(FPDFFormFillEmbedderTest, FormText) {
const char* focused_text_form_with_abc_checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "8b743c7a6186360862ca6f6db8f55c8f";
+#elif BUILDFLAG(IS_APPLE)
return "d8cf4e7ef7e1c287441bf350006e66d6";
#else
return "b9fb2245a98ac48146da84237a37f8cc";
@@ -1351,7 +1353,9 @@
}();
const char* unfocused_text_form_with_abc_checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "37328bf7614d6fc05b03893ee030aec4";
+#elif BUILDFLAG(IS_APPLE)
return "b9702814ac50dc5ef413ea2e9c4002f1";
#else
return "5f3205f0189d9dde54665f970838f614";
@@ -1458,7 +1462,9 @@
TEST_F(FPDFFormFillEmbedderTest, Bug1302455EditFirstForm) {
const char* checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "2e5d64e4280ca954eb528e82f92abb75";
+#elif BUILDFLAG(IS_APPLE)
return "79538a800f8eb0b4965d43a052303592";
#else
return "143c2bb79fcaecf24f5aa104dce27beb";
@@ -1496,7 +1502,9 @@
TEST_F(FPDFFormFillEmbedderTest, Bug1302455EditSecondForm) {
const char* checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "8408fc1796bf17d48b947ed0e4d65ef2";
+#elif BUILDFLAG(IS_APPLE)
return "074449f4bd27611a2e12aef3ad121cd8";
#else
return "e36726414acb616dc203e8851b510e2c";
@@ -1534,7 +1542,9 @@
TEST_F(FPDFFormFillEmbedderTest, Bug1302455EditBothForms) {
const char* checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "1c2b618f68d1ad2cfa01fcf38efc4831";
+#elif BUILDFLAG(IS_APPLE)
return "f5a3b8d2db662cad38b4573ef1dd3f1d";
#else
return "f82a807c056e22aa55d3d7228eedfe6f";
@@ -1579,7 +1589,9 @@
TEST_F(FPDFFormFillEmbedderTest, RemoveFormFieldHighlight) {
const char* no_highlight_checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "2235e2ba8349552de0c818ae53257949";
+#elif BUILDFLAG(IS_APPLE)
return "e0ad5b4fe007e2e2c27cf6c6fb5b6529";
#else
return "3bfddb2529085021ad283b7e65f71525";
diff --git a/fpdfsdk/fpdf_view_embeddertest.cpp b/fpdfsdk/fpdf_view_embeddertest.cpp
index 28fa4eb..67d4ef7 100644
--- a/fpdfsdk/fpdf_view_embeddertest.cpp
+++ b/fpdfsdk/fpdf_view_embeddertest.cpp
@@ -1456,7 +1456,9 @@
const char* original_checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "1c5d8217aca4f6fa86a8ed192f34b210";
+#elif BUILDFLAG(IS_APPLE)
return "b7ac2ca2b934f4e213ab4ba36c5f8ffd";
#else
return "29cb8045c21cfa2c920fdf43de70efd8";
@@ -1657,7 +1659,9 @@
const char* lcd_text_checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "496d1f907349b153c5ecdc87c8073c7b";
+#elif BUILDFLAG(IS_APPLE)
return "b110924c4af6e87232249ea2a564f0e4";
#else
return "d1decde2de1c07b5274cc8cb44f92427";
@@ -1671,7 +1675,9 @@
}();
const char* no_smoothtext_checksum = []() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "04dcf7d221437081034ca1152c717a8a";
+#elif BUILDFLAG(IS_APPLE)
return "8c99ca392ecff724da0d04b17453a45a";
#else
return "cd5bbe9407c3fcc85d365172a9a55abd";
@@ -2076,7 +2082,11 @@
ASSERT_TRUE(page);
const char* checksum = []() {
-#if !BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ return "d97d0a9da6a5955f68a58a3f25466bd7";
+ }
+#elif !BUILDFLAG(IS_APPLE)
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
return "ceeb93d2bcdb586d62c95b33cadcd873";
}
diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index 564d96d..1126f3f 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -97,6 +97,9 @@
if (use_blink) {
defines += [ "SK_TYPEFACE_FACTORY_FREETYPE" ]
}
+ if (is_win) {
+ defines += [ "SK_TYPEFACE_FACTORY_DIRECTWRITE" ]
+ }
if (is_apple) {
defines += [ "SK_TYPEFACE_FACTORY_CORETEXT" ]
}
@@ -268,16 +271,10 @@
}
if (is_win) {
+ # See SK_TYPEFACE_FACTORY_DIRECTWRITE
sources += [
- "//third_party/skia/src/ports/SkFontHost_win.cpp",
-
- # TODO(crbug.com/pdfium/1830) Consider using SkFontMgr_win_dw_factory
- # instead of SkFontMgr_custom_empty (which is what the embedder test
- # hashes are based upon).
- "//third_party/skia/src/ports/SkFontMgr_custom.cpp",
- "//third_party/skia/src/ports/SkFontMgr_custom_empty.cpp",
- "//third_party/skia/src/ports/SkFontMgr_custom_empty_factory.cpp",
"//third_party/skia/src/ports/SkFontMgr_win_dw.cpp",
+ "//third_party/skia/src/ports/SkFontMgr_win_dw_factory.cpp",
"//third_party/skia/src/ports/SkOSFile_win.cpp",
"//third_party/skia/src/ports/SkRemotableFontMgr_win_dw.cpp",
"//third_party/skia/src/ports/SkScalerContext_win_dw.cpp",
@@ -347,7 +344,7 @@
]
}
- if (is_apple && use_blink) {
+ if (is_win || (is_apple && use_blink)) {
sources += [
# Add the FreeType custom font manager as a fallback backend for variable fonts.
"//third_party/skia/src/ports/SkFontMgr_custom.cpp",
diff --git a/testing/embedder_test_constants.cpp b/testing/embedder_test_constants.cpp
index 4839440..b7c8571 100644
--- a/testing/embedder_test_constants.cpp
+++ b/testing/embedder_test_constants.cpp
@@ -11,7 +11,9 @@
const char* AnnotationStampWithApChecksum() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "f7f3a1029cea01cc993fa7770feebdc1";
+#elif BUILDFLAG(IS_APPLE)
return "f0867738d59a682b8d57baa88b35afc3";
#else
return "c7ff65a3ad1b01c3a0e94d635f10670e";
@@ -34,7 +36,9 @@
const char* HelloWorldChecksum() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "6023c7d8b7258cc686a1d1dbd0f4d6d0";
+#elif BUILDFLAG(IS_APPLE)
return "b110924c4af6e87232249ea2a564f0e4";
#else
return "d1decde2de1c07b5274cc8cb44f92427";
@@ -49,7 +53,9 @@
const char* HelloWorldRemovedChecksum() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "7db00f520f0838da10ef45373af3f6aa";
+#elif BUILDFLAG(IS_APPLE)
return "99cefacd84710f3fb2e3d129ba68ae8a";
#else
return "6e0307348e7c1b92f2f061f92f62fd45";
@@ -76,7 +82,9 @@
const char* TextFormChecksum() {
if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_WIN)
+ return "e83f49ddea0822734a16b986e9935732";
+#elif BUILDFLAG(IS_APPLE)
return "32913f21b1012b74eef37737a03a92b7";
#else
return "b259776fd156003e2a594d1c7ce2d8d7";
diff --git a/testing/resources/pixel/bug_1021762_expected_skia_win.pdf.0.png b/testing/resources/pixel/bug_1021762_expected_skia_win.pdf.0.png
index 1419d2e..a4e4f6b 100644
--- a/testing/resources/pixel/bug_1021762_expected_skia_win.pdf.0.png
+++ b/testing/resources/pixel/bug_1021762_expected_skia_win.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_1072440_expected_skia_win.pdf.0.png b/testing/resources/pixel/bug_1072440_expected_skia_win.pdf.0.png
new file mode 100644
index 0000000..7073c9e
--- /dev/null
+++ b/testing/resources/pixel/bug_1072440_expected_skia_win.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_113910_expected_skia_win.pdf.0.png b/testing/resources/pixel/bug_113910_expected_skia_win.pdf.0.png
new file mode 100644
index 0000000..bcf8d7b
--- /dev/null
+++ b/testing/resources/pixel/bug_113910_expected_skia_win.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_1271578_expected_skia_win.pdf.0.png b/testing/resources/pixel/bug_1271578_expected_skia_win.pdf.0.png
new file mode 100644
index 0000000..65c083d
--- /dev/null
+++ b/testing/resources/pixel/bug_1271578_expected_skia_win.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_1308_1_expected_skia_win.pdf.0.png b/testing/resources/pixel/bug_1308_1_expected_skia_win.pdf.0.png
index 784332c..e76a14b 100644
--- a/testing/resources/pixel/bug_1308_1_expected_skia_win.pdf.0.png
+++ b/testing/resources/pixel/bug_1308_1_expected_skia_win.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_1308_expected_skia_win.pdf.0.png b/testing/resources/pixel/bug_1308_expected_skia_win.pdf.0.png
index 252d0a8..5b23c8f 100644
--- a/testing/resources/pixel/bug_1308_expected_skia_win.pdf.0.png
+++ b/testing/resources/pixel/bug_1308_expected_skia_win.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_1355_expected_skia_win.pdf.0.png b/testing/resources/pixel/bug_1355_expected_skia_win.pdf.0.png
new file mode 100644
index 0000000..e38a541
--- /dev/null
+++ b/testing/resources/pixel/bug_1355_expected_skia_win.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
new file mode 100644
index 0000000..a5b0abe
--- /dev/null
+++ b/testing/resources/pixel/bug_1372651_expected_skia_win.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_1388_2_expected_skia_win.pdf.0.png b/testing/resources/pixel/bug_1388_2_expected_skia_win.pdf.0.png
new file mode 100644
index 0000000..7a60c7d
--- /dev/null
+++ b/testing/resources/pixel/bug_1388_2_expected_skia_win.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_1388_3_expected_skia_win.pdf.0.png b/testing/resources/pixel/bug_1388_3_expected_skia_win.pdf.0.png
new file mode 100644
index 0000000..3b7d2e3
--- /dev/null
+++ b/testing/resources/pixel/bug_1388_3_expected_skia_win.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_1402_expected_skia_win.pdf.0.png b/testing/resources/pixel/bug_1402_expected_skia_win.pdf.0.png
new file mode 100644
index 0000000..5a708ef
--- /dev/null
+++ b/testing/resources/pixel/bug_1402_expected_skia_win.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_1752_expected_skia_win.pdf.0.png b/testing/resources/pixel/bug_1752_expected_skia_win.pdf.0.png
new file mode 100644
index 0000000..10ea42d
--- /dev/null
+++ b/testing/resources/pixel/bug_1752_expected_skia_win.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_1922_expected_skia_win.pdf.0.png b/testing/resources/pixel/bug_1922_expected_skia_win.pdf.0.png
new file mode 100644
index 0000000..0df6b39
--- /dev/null
+++ b/testing/resources/pixel/bug_1922_expected_skia_win.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_524043_1_expected_skia_win.pdf.0.png b/testing/resources/pixel/bug_524043_1_expected_skia_win.pdf.0.png
new file mode 100644
index 0000000..04b94b0
--- /dev/null
+++ b/testing/resources/pixel/bug_524043_1_expected_skia_win.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_524043_2_expected_skia_win.pdf.0.png b/testing/resources/pixel/bug_524043_2_expected_skia_win.pdf.0.png
new file mode 100644
index 0000000..431699b
--- /dev/null
+++ b/testing/resources/pixel/bug_524043_2_expected_skia_win.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_524043_3_expected_skia_win.pdf.0.png b/testing/resources/pixel/bug_524043_3_expected_skia_win.pdf.0.png
new file mode 100644
index 0000000..04b94b0
--- /dev/null
+++ b/testing/resources/pixel/bug_524043_3_expected_skia_win.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_524043_4_expected_skia_win.pdf.0.png b/testing/resources/pixel/bug_524043_4_expected_skia_win.pdf.0.png
new file mode 100644
index 0000000..04b94b0
--- /dev/null
+++ b/testing/resources/pixel/bug_524043_4_expected_skia_win.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_524043_5_expected_skia_win.pdf.0.png b/testing/resources/pixel/bug_524043_5_expected_skia_win.pdf.0.png
new file mode 100644
index 0000000..04b94b0
--- /dev/null
+++ b/testing/resources/pixel/bug_524043_5_expected_skia_win.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_524043_7_expected_skia_win.pdf.0.png b/testing/resources/pixel/bug_524043_7_expected_skia_win.pdf.0.png
new file mode 100644
index 0000000..431699b
--- /dev/null
+++ b/testing/resources/pixel/bug_524043_7_expected_skia_win.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_528103_expected_skia_win.pdf.0.png b/testing/resources/pixel/bug_528103_expected_skia_win.pdf.0.png
new file mode 100644
index 0000000..8176382
--- /dev/null
+++ b/testing/resources/pixel/bug_528103_expected_skia_win.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_543018_1_expected_skia_win.pdf.0.png b/testing/resources/pixel/bug_543018_1_expected_skia_win.pdf.0.png
new file mode 100644
index 0000000..04b94b0
--- /dev/null
+++ b/testing/resources/pixel/bug_543018_1_expected_skia_win.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_543018_2_expected_skia_win.pdf.0.png b/testing/resources/pixel/bug_543018_2_expected_skia_win.pdf.0.png
new file mode 100644
index 0000000..04b94b0
--- /dev/null
+++ b/testing/resources/pixel/bug_543018_2_expected_skia_win.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_551258_1_expected_skia_win.pdf.0.png b/testing/resources/pixel/bug_551258_1_expected_skia_win.pdf.0.png
new file mode 100644
index 0000000..04b94b0
--- /dev/null
+++ b/testing/resources/pixel/bug_551258_1_expected_skia_win.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_665467_expected_skia_win.pdf.0.png b/testing/resources/pixel/bug_665467_expected_skia_win.pdf.0.png
new file mode 100644
index 0000000..f848418
--- /dev/null
+++ b/testing/resources/pixel/bug_665467_expected_skia_win.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_725389_expected_skia_win.pdf.0.png b/testing/resources/pixel/bug_725389_expected_skia_win.pdf.0.png
new file mode 100644
index 0000000..2d010fb
--- /dev/null
+++ b/testing/resources/pixel/bug_725389_expected_skia_win.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_733528_expected_skia_win.pdf.0.png b/testing/resources/pixel/bug_733528_expected_skia_win.pdf.0.png
new file mode 100644
index 0000000..3eb9522
--- /dev/null
+++ b/testing/resources/pixel/bug_733528_expected_skia_win.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
new file mode 100644
index 0000000..75e3b03
--- /dev/null
+++ 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_win.pdf.0.png b/testing/resources/pixel/bug_736695_3_expected_skia_win.pdf.0.png
new file mode 100644
index 0000000..3bbd5fc
--- /dev/null
+++ b/testing/resources/pixel/bug_736695_3_expected_skia_win.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_820345_expected_skia_win.pdf.0.png b/testing/resources/pixel/bug_820345_expected_skia_win.pdf.0.png
new file mode 100644
index 0000000..6bb5321
--- /dev/null
+++ b/testing/resources/pixel/bug_820345_expected_skia_win.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_845697_expected_skia_win.pdf.0.png b/testing/resources/pixel/bug_845697_expected_skia_win.pdf.0.png
new file mode 100644
index 0000000..46fbc46
--- /dev/null
+++ b/testing/resources/pixel/bug_845697_expected_skia_win.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 0f361df..3991278 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/bug_909762_expected_skia_win.pdf.0.png b/testing/resources/pixel/bug_909762_expected_skia_win.pdf.0.png
index 2a06ee0..47db32d 100644
--- a/testing/resources/pixel/bug_909762_expected_skia_win.pdf.0.png
+++ b/testing/resources/pixel/bug_909762_expected_skia_win.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_925736_expected_skia_win.pdf.0.png b/testing/resources/pixel/bug_925736_expected_skia_win.pdf.0.png
new file mode 100644
index 0000000..53fe8d7
--- /dev/null
+++ b/testing/resources/pixel/bug_925736_expected_skia_win.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_984811_expected_skia_win.pdf.0.png b/testing/resources/pixel/bug_984811_expected_skia_win.pdf.0.png
new file mode 100644
index 0000000..c24d4c4
--- /dev/null
+++ b/testing/resources/pixel/bug_984811_expected_skia_win.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/font_size_expected_skia_win.pdf.0.png b/testing/resources/pixel/font_size_expected_skia_win.pdf.0.png
new file mode 100644
index 0000000..770bb50
--- /dev/null
+++ b/testing/resources/pixel/font_size_expected_skia_win.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/generation_numbers1_expected_skia_win.pdf.0.png b/testing/resources/pixel/generation_numbers1_expected_skia_win.pdf.0.png
new file mode 100644
index 0000000..3382f59
--- /dev/null
+++ b/testing/resources/pixel/generation_numbers1_expected_skia_win.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/generation_numbers2_expected_skia_win.pdf.0.png b/testing/resources/pixel/generation_numbers2_expected_skia_win.pdf.0.png
new file mode 100644
index 0000000..3382f59
--- /dev/null
+++ b/testing/resources/pixel/generation_numbers2_expected_skia_win.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/password_expected_skia_win.pdf.0.png b/testing/resources/pixel/password_expected_skia_win.pdf.0.png
new file mode 100644
index 0000000..193e7a0
--- /dev/null
+++ b/testing/resources/pixel/password_expected_skia_win.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
new file mode 100644
index 0000000..b506317
--- /dev/null
+++ 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_win.pdf.0.png b/testing/resources/pixel/scrollable_widgets2_expected_skia_win.pdf.0.png
new file mode 100644
index 0000000..6994adb
--- /dev/null
+++ b/testing/resources/pixel/scrollable_widgets2_expected_skia_win.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/static_password_field_rotate_expected_skia_win.pdf.0.png b/testing/resources/pixel/static_password_field_rotate_expected_skia_win.pdf.0.png
new file mode 100644
index 0000000..0a9ff37
--- /dev/null
+++ b/testing/resources/pixel/static_password_field_rotate_expected_skia_win.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/static_password_field_rotate_expected_skia_win.pdf.1.png b/testing/resources/pixel/static_password_field_rotate_expected_skia_win.pdf.1.png
new file mode 100644
index 0000000..fa7e97e
--- /dev/null
+++ b/testing/resources/pixel/static_password_field_rotate_expected_skia_win.pdf.1.png
Binary files differ
diff --git a/testing/resources/pixel/text_form_custom_font_expected_skia_win.pdf.0.png b/testing/resources/pixel/text_form_custom_font_expected_skia_win.pdf.0.png
new file mode 100644
index 0000000..706903e4
--- /dev/null
+++ b/testing/resources/pixel/text_form_custom_font_expected_skia_win.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/xfa_specific/barcode_test_expected_skia_win.pdf.0.png b/testing/resources/pixel/xfa_specific/barcode_test_expected_skia_win.pdf.0.png
new file mode 100644
index 0000000..2e4ea63
--- /dev/null
+++ b/testing/resources/pixel/xfa_specific/barcode_test_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_win.pdf.0.png b/testing/resources/pixel/xfa_specific/dynamic_list_box_allow_multiple_selection_expected_skia_win.pdf.0.png
new file mode 100644
index 0000000..644da71
--- /dev/null
+++ 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/dynamic_password_field_background_fill_expected_skia_win.pdf.0.png b/testing/resources/pixel/xfa_specific/dynamic_password_field_background_fill_expected_skia_win.pdf.0.png
new file mode 100644
index 0000000..4afde4a
--- /dev/null
+++ b/testing/resources/pixel/xfa_specific/dynamic_password_field_background_fill_expected_skia_win.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/xfa_specific/dynamic_table_color_and_width_expected_skia_win.pdf.0.png b/testing/resources/pixel/xfa_specific/dynamic_table_color_and_width_expected_skia_win.pdf.0.png
new file mode 100644
index 0000000..68b869f
--- /dev/null
+++ b/testing/resources/pixel/xfa_specific/dynamic_table_color_and_width_expected_skia_win.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
new file mode 100644
index 0000000..8c23dc9
--- /dev/null
+++ 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/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 a974ba2..d352038 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 605ed4c..a8fc256 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
diff --git a/xfa/fde/cfde_textout_unittest.cpp b/xfa/fde/cfde_textout_unittest.cpp
index 0067302..77e2949 100644
--- a/xfa/fde/cfde_textout_unittest.cpp
+++ b/xfa/fde/cfde_textout_unittest.cpp
@@ -88,8 +88,9 @@
text_out().DrawLogicText(device(), L"foo", CFX_RectF(0, 0, 2100, 100));
const char* checksum = []() {
#if BUILDFLAG(IS_WIN)
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
- return "76fd535f7d490d963598474494d0701e";
+ if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ return "cdd8f00144e421bf18f22d09896838b0";
+ }
#endif
return "b26f1c171fcdbf185823364185adacf0";
}();
