summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2017-05-02 11:53:08 -0700
committerChromium commit bot <commit-bot@chromium.org>2017-05-02 19:31:49 +0000
commitb8e89e3182109ff3d93ee5f2ff9b5314af95d548 (patch)
treea08615e04ce0bca38d36eb68b43d81ec18e0ee06
parent48fbb0f8de36d224eea498ad45f641bb5613e3f0 (diff)
downloadpdfium-b8e89e3182109ff3d93ee5f2ff9b5314af95d548.tar.xz
Roll FreeType to 5a3490e.
This follows Chromium's FreeType DEPS roll. Potentially addresses Clang on Windows LLP64 build failure. Roll testing corpus to 5379e0a with updated expectations. BUG=pdfium:705 Change-Id: Ie494b68a52f953436accf8fd1961244f70a92cab Reviewed-on: https://pdfium-review.googlesource.com/4632 Commit-Queue: Lei Zhang <thestig@chromium.org> Reviewed-by: dsinclair <dsinclair@chromium.org>
-rw-r--r--DEPS4
-rw-r--r--fpdfsdk/fpdfedit_embeddertest.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/DEPS b/DEPS
index 9729f77e04..7b25933695 100644
--- a/DEPS
+++ b/DEPS
@@ -10,7 +10,7 @@ vars = {
'catapult_revision': '86352b966b0245d6883e5f7df27687856978b6d7',
'clang_revision': 'd5516794ee576ab181f1a2e334f47186f671ad9e',
'cygwin_revision': 'c89e446b273697fadf3a10ff1007a97c0b7de6df',
- 'freetype_revision': '66725768cdf758cfb3f9abf03cbf5e5a77f42088',
+ 'freetype_revision': '5a3490e054bda8a318ebde482c7fb30213cab3d9',
'gen_library_loader_revision': '916d4acd8b2cde67a390737dfba90b3c37de23a1',
'gmock_revision': '29763965ab52f24565299976b936d1265cb6a271',
'gtest_revision': '8245545b6dc9c4703e6496d1efd19e975ad2b038',
@@ -19,7 +19,7 @@ vars = {
'jinja2_revision': 'd34383206fa42d52faa10bb9931d6d538f3a57e0',
'jpeg_turbo_revision': '7260e4d8b8e1e40b17f03fafdf1cd83296900f76',
'markupsafe_revision': '8f45f5cfa0009d2a70589bcda0349b8cb2b72783',
- 'pdfium_tests_revision': '7c6a0e40f9e4f6f69f75adeae974f86f4ee98f96',
+ 'pdfium_tests_revision': '5379e0a6580443318c8192cdfc78a76e880ca3f6',
'skia_revision': '90e3cd78991ef337dbd0023efb30ece864694308',
'tools_memory_revision': '427f10475e1a8d72424c29d00bf689122b738e5d',
'trace_event_revision': '06294c8a4a6f744ef284cd63cfe54dbf61eea290',
diff --git a/fpdfsdk/fpdfedit_embeddertest.cpp b/fpdfsdk/fpdfedit_embeddertest.cpp
index 4bf68cfe5e..01ac01e706 100644
--- a/fpdfsdk/fpdfedit_embeddertest.cpp
+++ b/fpdfsdk/fpdfedit_embeddertest.cpp
@@ -477,9 +477,9 @@ TEST_F(FPDFEditEmbeddertest, AddStandardFontText) {
#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
const char md5_3[] = "40b3ef04f915ff4c4208948001763544";
#elif _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
- const char md5_3[] = "174f30c36c73adb265c0f6ddb3a61c87";
+ const char md5_3[] = "d69d419def35a098d9c10f8317d6709b";
#else
- const char md5_3[] = "abfa9246d60f821b5b7638efd32dfd92";
+ const char md5_3[] = "8b300d3c6dfc12fa9af97e12ed5bd80a";
#endif
CompareBitmap(page_bitmap, 612, 792, md5_3);
FPDFBitmap_Destroy(page_bitmap);