diff --git a/DEPS b/DEPS
index 3a4f5cd..29d6788 100644
--- a/DEPS
+++ b/DEPS
@@ -10,7 +10,7 @@
   'catapult_revision': '86352b966b0245d6883e5f7df27687856978b6d7',
   'clang_revision': 'ae881aab392c247eca831e079d1d45e1c200cce7',
   'cygwin_revision': 'c89e446b273697fadf3a10ff1007a97c0b7de6df',
-  'freetype_revision': 'a12a34451a99cbbcad55d466940fd445171927fd',
+  'freetype_revision': 'c56d8851ea987023cc73981a70d261b3f6427545',
   'gen_library_loader_revision': '916d4acd8b2cde67a390737dfba90b3c37de23a1',
   'gmock_revision': '29763965ab52f24565299976b936d1265cb6a271',
   'gtest_revision': '8245545b6dc9c4703e6496d1efd19e975ad2b038',
@@ -19,7 +19,7 @@
   'jinja2_revision': 'd34383206fa42d52faa10bb9931d6d538f3a57e0',
   'jpeg_turbo_revision': '7260e4d8b8e1e40b17f03fafdf1cd83296900f76',
   'markupsafe_revision': '8f45f5cfa0009d2a70589bcda0349b8cb2b72783',
-  'pdfium_tests_revision': 'c5b04dc19e7439b9aace5d4b482431c41dbf34a7',
+  'pdfium_tests_revision': 'ab561f0075518d699636b884b0db46293cd76261',
   'skia_revision': 'bb581ce30f55360fd3a12e7f5aa1fe324b16d085',
   'tools_memory_revision': '427f10475e1a8d72424c29d00bf689122b738e5d',
   'trace_event_revision': '06294c8a4a6f744ef284cd63cfe54dbf61eea290',
diff --git a/core/fpdfapi/parser/fpdf_parser_decode_embeddertest.cpp b/core/fpdfapi/parser/fpdf_parser_decode_embeddertest.cpp
index 22ea62d..799da49 100644
--- a/core/fpdfapi/parser/fpdf_parser_decode_embeddertest.cpp
+++ b/core/fpdfapi/parser/fpdf_parser_decode_embeddertest.cpp
@@ -116,9 +116,9 @@
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
   const char kExpectedMd5sum[] = "b90475ca64d1348c3bf5e2b77ad9187a";
 #elif _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
-  const char kExpectedMd5sum[] = "5db84ceda153acc4420c2062b182191b";
+  const char kExpectedMd5sum[] = "9a2637b73fd5265309bfddd9c69476cd";
 #else
-  const char kExpectedMd5sum[] = "f24438fe53948941200fd43da37908bc";
+  const char kExpectedMd5sum[] = "f7e129d97c58e91adeace32a4327b925";
 #endif
   CompareBitmap(bitmap, 200, 200, kExpectedMd5sum);
   FPDFBitmap_Destroy(bitmap);
diff --git a/fpdfsdk/fpdfannot_embeddertest.cpp b/fpdfsdk/fpdfannot_embeddertest.cpp
index e62d7c5..c2bd82a 100644
--- a/fpdfsdk/fpdfannot_embeddertest.cpp
+++ b/fpdfsdk/fpdfannot_embeddertest.cpp
@@ -472,13 +472,13 @@
   const char md5_2[] = "cf3cea74bd46497520ff6c4d1ea228c8";
   const char md5_3[] = "ee5372b31fede117fc83b9384598aa25";
 #elif _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
-  const char md5[] = "bdf96279ab82d9f484874db3f0c03429";
-  const char md5_2[] = "5f2b32b7aa93bc1e62a7a7971f54bdd7";
-  const char md5_3[] = "272661f3e5c9516aac4b5beb3ae1b36a";
+  const char md5[] = "4f64add0190ede63f7bb9eb1e2e83edb";
+  const char md5_2[] = "681f0d0738dded0722e146f6c219bfac";
+  const char md5_3[] = "262187984451bae2fe826067d68623ff";
 #else
-  const char md5[] = "07d4168715553b4294525f840c40aa1c";
-  const char md5_2[] = "dd5ba8996af67d0e5add418195e4d61b";
-  const char md5_3[] = "c60c2cc2c4e7b13be90bd77cc4502f97";
+  const char md5[] = "02e1c6adff8fee4aeabd91c2c2e4be43";
+  const char md5_2[] = "87a78cbacd8509b961a67be56b5665a2";
+  const char md5_3[] = "c95de7a9a1f61faca03d953961a319b9";
 #endif
 
   // Open a file with two annotations and load its first page.
@@ -624,13 +624,13 @@
   const char md5_2[] = "ff012f5697436dfcaec25b32d1333596";
   const char md5_3[] = "86cf8cb2755a7a2046a543e66d9c1e61";
 #elif _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
-  const char md5[] = "bdf96279ab82d9f484874db3f0c03429";
-  const char md5_2[] = "048a9af8b6239b59a19dacd8e1688e0a";
-  const char md5_3[] = "3be8aa2ebc927e32060e7116dd937a14";
+  const char md5[] = "4f64add0190ede63f7bb9eb1e2e83edb";
+  const char md5_2[] = "6fb176c20996cc554d0210d8c8b6138f";
+  const char md5_3[] = "546959714dfb0dcd7e7b00259e8d178c";
 #else
-  const char md5[] = "07d4168715553b4294525f840c40aa1c";
-  const char md5_2[] = "9685b2a0cf11ee730125f88ab10ff1d0";
-  const char md5_3[] = "0763407baf3656b8061bbbe698e9fd89";
+  const char md5[] = "02e1c6adff8fee4aeabd91c2c2e4be43";
+  const char md5_2[] = "e7658232abd8977cdc3367dd02aee04a";
+  const char md5_3[] = "f393432b9a9b452ea69022f46c8b3f75";
 #endif
 
   // Open a file with two annotations and load its first page.
@@ -703,13 +703,13 @@
   const char md5_2[] = "e5680ed048c2cfd9a1d27212cdf41286";
   const char md5_3[] = "79f5cfb0b07caaf936f65f6a7a57ce77";
 #elif _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
-  const char md5[] = "bdf96279ab82d9f484874db3f0c03429";
-  const char md5_2[] = "fa5709c115d4ebd502df91841b44b3ef";
-  const char md5_3[] = "9f6fa52dc477ccf52be4184d8589ef3f";
+  const char md5[] = "4f64add0190ede63f7bb9eb1e2e83edb";
+  const char md5_2[] = "998abae4962f8f41e094e7612d8339fc";
+  const char md5_3[] = "e89b82ca4589b8f0b45fff42ca3a96a4";
 #else
-  const char md5[] = "07d4168715553b4294525f840c40aa1c";
-  const char md5_2[] = "40a4c5e0561b062882b47253be3393ef";
-  const char md5_3[] = "f8ce0682add01f6d273890ac64d90fa6";
+  const char md5[] = "02e1c6adff8fee4aeabd91c2c2e4be43";
+  const char md5_2[] = "3fbbaec4d846ccf2be89e09daae0273d";
+  const char md5_3[] = "2ad0acaf2d8990bcdf48e1d12e6c44ad";
 #endif
 
   // Open a file with two annotations and load its first page.
@@ -839,9 +839,9 @@
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
   const char md5[] = "c35408717759562d1f8bf33d317483d2";
 #elif _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
-  const char md5[] = "bdf96279ab82d9f484874db3f0c03429";
+  const char md5[] = "4f64add0190ede63f7bb9eb1e2e83edb";
 #else
-  const char md5[] = "07d4168715553b4294525f840c40aa1c";
+  const char md5[] = "02e1c6adff8fee4aeabd91c2c2e4be43";
 #endif
   TestSaved(595, 842, md5);
   FPDF_ANNOTATION new_annot = FPDFPage_GetAnnot(m_SavedPage, 0);
diff --git a/fpdfsdk/fpdfedit_embeddertest.cpp b/fpdfsdk/fpdfedit_embeddertest.cpp
index a461f37..cc3e50b 100644
--- a/fpdfsdk/fpdfedit_embeddertest.cpp
+++ b/fpdfsdk/fpdfedit_embeddertest.cpp
@@ -324,7 +324,7 @@
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
   const char md5[] = "f9e6fa74230f234286bfcada9f7606d8";
 #else
-  const char md5[] = "2fdfc5dda29374cfba4349362e38ebdb";
+  const char md5[] = "bc6e6eb50dda4695ba0fb4d04ed82ada";
 #endif
   CompareBitmap(bitmap, 200, 200, md5);
   FPDFBitmap_Destroy(bitmap);
@@ -450,7 +450,7 @@
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
   const char md5[] = "a4dddc1a3930fa694bbff9789dab4161";
 #else
-  const char md5[] = "6e8a9b0682f60fd3ff1bf087b093d30d";
+  const char md5[] = "7a35771853a1cbba38f6775807878625";
 #endif
   CompareBitmap(page_bitmap, 612, 792, md5);
   FPDFBitmap_Destroy(page_bitmap);
@@ -468,9 +468,9 @@
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
   const char md5_2[] = "a5c4ace4c6f27644094813fe1441a21c";
 #elif _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
-  const char md5_2[] = "56863642d4d8b418cfd810fdb5a5d92f";
+  const char md5_2[] = "b231b329a4b566fb9b42bfc15fe59bb7";
 #else
-  const char md5_2[] = "0c83875429688bda45a55a692d5aa781";
+  const char md5_2[] = "f85fae151851436072b7b3c6703e506a";
 #endif
   CompareBitmap(page_bitmap, 612, 792, md5_2);
   FPDFBitmap_Destroy(page_bitmap);
@@ -488,9 +488,9 @@
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
   const char md5_3[] = "40b3ef04f915ff4c4208948001763544";
 #elif _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
-  const char md5_3[] = "d69d419def35a098d9c10f8317d6709b";
+  const char md5_3[] = "ba874b3b137f984510c4e287ed4ba7ae";
 #else
-  const char md5_3[] = "8b300d3c6dfc12fa9af97e12ed5bd80a";
+  const char md5_3[] = "c5aed6a8ef05558c8c47d58c87cbcb46";
 #endif
   CompareBitmap(page_bitmap, 612, 792, md5_3);
   FPDFBitmap_Destroy(page_bitmap);
@@ -791,7 +791,7 @@
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
     const char md5[] = "17d2b6cd574cf66170b09c8927529a94";
 #else
-    const char md5[] = "28e5b10743660dcdfd1618db47b39d32";
+    const char md5[] = "1722c6a9deed953d730de9cd13dcbd55";
 #endif  // _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
     CompareBitmap(page_bitmap, 612, 792, md5);
     FPDFBitmap_Destroy(page_bitmap);
@@ -809,7 +809,7 @@
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
   const char md5_2[] = "8eded4193ff1f0f77b8b600a825e97ea";
 #else
-  const char md5_2[] = "a068eef4110d607f77c87ea8340fa2a5";
+  const char md5_2[] = "9d7885072058f6c3e68ecaf32e917f30";
 #endif  // _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
   CompareBitmap(page_bitmap2, 612, 792, md5_2);
   FPDFBitmap_Destroy(page_bitmap2);
diff --git a/fpdfsdk/fpdfformfill_embeddertest.cpp b/fpdfsdk/fpdfformfill_embeddertest.cpp
index 83e560a..7089927 100644
--- a/fpdfsdk/fpdfformfill_embeddertest.cpp
+++ b/fpdfsdk/fpdfformfill_embeddertest.cpp
@@ -332,9 +332,9 @@
   const char md5_2[] = "35b1a4b679eafc749a0b6fda750c0e8d";
   const char md5_3[] = "65c64a7c355388f719a752aa1e23f6fe";
 #else
-  const char md5_1[] = "23baecc6e94d4c8b894cd39aa04c584c";
-  const char md5_2[] = "499df95d477dfe35ee65b823c69743b5";
-  const char md5_3[] = "8f91b62895fc505d9e17ff2d633756d4";
+  const char md5_1[] = "a5e3ac74c2ee123ec6710e2f0ef8424a";
+  const char md5_2[] = "4526b09382e144d5506ad92149399de6";
+  const char md5_3[] = "80356067d860088864cf50ff85d8459e";
 #endif
   {
     EXPECT_TRUE(OpenDocument("text_form.pdf"));
diff --git a/testing/SUPPRESSIONS b/testing/SUPPRESSIONS
index ed35c71..8389289 100644
--- a/testing/SUPPRESSIONS
+++ b/testing/SUPPRESSIONS
@@ -54,7 +54,7 @@
 FRC_16_8.2.2__T8.3_Count_edit_1.pdf * * *
 FRC_1_8.2.2__T8.3_First_empty.pdf * * *
 FRC_2_8.2.2__T8.3_Last_empty.pdf * * *
-FRC_3.5_P__3616_Password_1.pdf mac,win * *
+FRC_3.5_P__3616_Password_1.pdf * * *
 FRC_3_8.2.2_Type_empty.pdf * * *
 FRC_4_8.2.2__T8.3_Count_empty.pdf * * *
 FRC_5_8.2.2__T8.3_First_remove.pdf * * *
diff --git a/testing/resources/pixel/bug_113910_expected.pdf.0.png b/testing/resources/pixel/bug_113910_expected.pdf.0.png
index 3804347..734647a 100644
--- a/testing/resources/pixel/bug_113910_expected.pdf.0.png
+++ b/testing/resources/pixel/bug_113910_expected.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_524043_1_expected.pdf.0.png b/testing/resources/pixel/bug_524043_1_expected.pdf.0.png
index 5a46384..7d1b89a 100644
--- a/testing/resources/pixel/bug_524043_1_expected.pdf.0.png
+++ b/testing/resources/pixel/bug_524043_1_expected.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_524043_2_expected.pdf.0.png b/testing/resources/pixel/bug_524043_2_expected.pdf.0.png
index 34aa9b4..b366321 100644
--- a/testing/resources/pixel/bug_524043_2_expected.pdf.0.png
+++ b/testing/resources/pixel/bug_524043_2_expected.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_524043_3_expected.pdf.0.png b/testing/resources/pixel/bug_524043_3_expected.pdf.0.png
index 5a46384..7d1b89a 100644
--- a/testing/resources/pixel/bug_524043_3_expected.pdf.0.png
+++ b/testing/resources/pixel/bug_524043_3_expected.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_524043_4_expected.pdf.0.png b/testing/resources/pixel/bug_524043_4_expected.pdf.0.png
index 5a46384..7d1b89a 100644
--- a/testing/resources/pixel/bug_524043_4_expected.pdf.0.png
+++ b/testing/resources/pixel/bug_524043_4_expected.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_524043_5_expected.pdf.0.png b/testing/resources/pixel/bug_524043_5_expected.pdf.0.png
index 5a46384..7d1b89a 100644
--- a/testing/resources/pixel/bug_524043_5_expected.pdf.0.png
+++ b/testing/resources/pixel/bug_524043_5_expected.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_524043_7_expected.pdf.0.png b/testing/resources/pixel/bug_524043_7_expected.pdf.0.png
index 34aa9b4..b366321 100644
--- a/testing/resources/pixel/bug_524043_7_expected.pdf.0.png
+++ b/testing/resources/pixel/bug_524043_7_expected.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_528103_expected.pdf.0.png b/testing/resources/pixel/bug_528103_expected.pdf.0.png
index 479b0fd..504b5d3 100644
--- a/testing/resources/pixel/bug_528103_expected.pdf.0.png
+++ b/testing/resources/pixel/bug_528103_expected.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_528103_expected_win.pdf.0.png b/testing/resources/pixel/bug_528103_expected_win.pdf.0.png
index 27c0df7..4275f50 100644
--- a/testing/resources/pixel/bug_528103_expected_win.pdf.0.png
+++ b/testing/resources/pixel/bug_528103_expected_win.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_543018_1_expected.pdf.0.png b/testing/resources/pixel/bug_543018_1_expected.pdf.0.png
index 5a46384..7d1b89a 100644
--- a/testing/resources/pixel/bug_543018_1_expected.pdf.0.png
+++ b/testing/resources/pixel/bug_543018_1_expected.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_543018_2_expected.pdf.0.png b/testing/resources/pixel/bug_543018_2_expected.pdf.0.png
index 5a46384..7d1b89a 100644
--- a/testing/resources/pixel/bug_543018_2_expected.pdf.0.png
+++ b/testing/resources/pixel/bug_543018_2_expected.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_551258_1_expected.pdf.0.png b/testing/resources/pixel/bug_551258_1_expected.pdf.0.png
index 5a46384..7d1b89a 100644
--- a/testing/resources/pixel/bug_551258_1_expected.pdf.0.png
+++ b/testing/resources/pixel/bug_551258_1_expected.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_733528_expected.pdf.0.png b/testing/resources/pixel/bug_733528_expected.pdf.0.png
index cdd39c1..2825db0 100644
--- a/testing/resources/pixel/bug_733528_expected.pdf.0.png
+++ b/testing/resources/pixel/bug_733528_expected.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_736695_2_expected.pdf.0.png b/testing/resources/pixel/bug_736695_2_expected.pdf.0.png
index b89ef8f..7416cba 100644
--- a/testing/resources/pixel/bug_736695_2_expected.pdf.0.png
+++ b/testing/resources/pixel/bug_736695_2_expected.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_736695_3_expected.pdf.0.png b/testing/resources/pixel/bug_736695_3_expected.pdf.0.png
index 722a74e..da7b571 100644
--- a/testing/resources/pixel/bug_736695_3_expected.pdf.0.png
+++ b/testing/resources/pixel/bug_736695_3_expected.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/font_size_expected.pdf.0.png b/testing/resources/pixel/font_size_expected.pdf.0.png
index 5950b74..bcb30c4 100644
--- a/testing/resources/pixel/font_size_expected.pdf.0.png
+++ b/testing/resources/pixel/font_size_expected.pdf.0.png
Binary files differ