XFA: merge patch from CL 789163008 and 815333002
authorLei Zhang <thestig@google.com>
Sat, 20 Dec 2014 02:26:28 +0000 (18:26 -0800)
committerBo Xu <bo_xu@foxitsoftware.com>
Sat, 20 Dec 2014 03:36:06 +0000 (19:36 -0800)
commite1082c90fa84db89810fd596c73db414f5a865d8
tree6588a7a6c0f3f2126927bbb4a07777e086fc4aac
parent0b07b3138f0d6b0f9cedf5d1d126366e754729e3
XFA: merge patch from CL 789163008 and 815333002

Add the license back to ftmodule.h after the freetype 2.5.4 upgrade.

Review URL: https://codereview.chromium.org/815333002

Set the freetype options missing in the recent update.

Turn on the FT_CONFIG_OPTION_SUBPIXEL_RENDERING to enable sub-pixel rendering.

Also undef some other options to match what they look like before.

BUG=444243
R=thestig@chromium.org

Review URL: https://codereview.chromium.org/789163008
third_party/freetype/include/config/ftmodule.h
third_party/freetype/include/config/ftoption.h