commit 133542fbe7c01dd296d6ffd205281702ad914506
author Andrew Weintraub <asweintraub@google.com> Mon Jan 08 16:42:34 2018 -0500
committer Chromium commit bot <commit-bot@chromium.org> Tue Jan 09 08:13:55 2018 +0000
tree c64a4a24d28f3f58ea0e5c62abb8af8ae0add0b0
parent 93c0f344d8c568535bd56d591b3d42050c71676a

Fix cl/22012 to always call FXFT_Library_SetLcdFilter so that we render properly regardless of whether "Harmony" is built in.

Bug:
Change-Id: I37bf8161d758e8789f81956ea28598480908b47f
Reviewed-on: https://pdfium-review.googlesource.com/22451
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>

core/fxge/cfx_fontmgr.cpp

diff --git a/core/fxge/cfx_fontmgr.cpp b/core/fxge/cfx_fontmgr.cpp
index 0d4524c..c652117 100644
--- a/core/fxge/cfx_fontmgr.cpp
+++ b/core/fxge/cfx_fontmgr.cpp
@@ -105,10 +105,10 @@
   // Freetype versions >= 2.8.1 support hinting even if subpixel rendering is
   // disabled. https://sourceforge.net/projects/freetype/files/freetype2/2.8.1/
   m_FTLibrarySupportsHinting =
-      major > 2 || (major >= 2 && minor > 8) ||
-      (major >= 2 && minor >= 8 && patch >= 1) ||
       FXFT_Library_SetLcdFilter(m_FTLibrary, FT_LCD_FILTER_DEFAULT) !=
-          FT_Err_Unimplemented_Feature;
+          FT_Err_Unimplemented_Feature ||
+      major > 2 || (major >= 2 && minor > 8) ||
+      (major >= 2 && minor >= 8 && patch >= 1);
 }
 
 void CFX_FontMgr::SetSystemFontInfo(