diff options
| author | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-26 17:18:11 +0000 |
|---|---|---|
| committer | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-26 17:18:11 +0000 |
| commit | 3937ab5235483cec68de5809bcd202bbd165b143 (patch) | |
| tree | 44dae3304b4db158ef6b29b90d8ccc2587a89e8a | |
| parent | 19196960cc20884337a29999c7d372be5e5eef4f (diff) | |
| download | chromium_src-3937ab5235483cec68de5809bcd202bbd165b143.zip chromium_src-3937ab5235483cec68de5809bcd202bbd165b143.tar.gz chromium_src-3937ab5235483cec68de5809bcd202bbd165b143.tar.bz2 | |
Enable subpixel rendering in custom freetype2 library.
Set FT_CONFIG_OPTION_SUBPIXEL_RENDERING in the custom
freetype2 library built for content_shell so that local
Chrome builds will honor the developer's font settings.
BUG=342077
TBR=dpranke@chromium.org
Review URL: https://codereview.chromium.org/163433013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253485 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | third_party/freetype2/freetype2.patch | 9 | ||||
| -rw-r--r-- | third_party/freetype2/include/ftoption.h | 2 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/third_party/freetype2/freetype2.patch b/third_party/freetype2/freetype2.patch index d07f8ac..07e94a3 100644 --- a/third_party/freetype2/freetype2.patch +++ b/third_party/freetype2/freetype2.patch @@ -30,6 +30,15 @@ diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftopti index 759b3a3..f921a04 100644 --- a/include/freetype/config/ftoption.h +++ b/include/freetype/config/ftoption.h +@@ -92,7 +92,7 @@ FT_BEGIN_HEADER + /* This is done to allow FreeType clients to run unmodified, forcing */ + /* them to display normal gray-level anti-aliased glyphs. */ + /* */ +-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */ ++#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING + + + /*************************************************************************/ @@ -495,7 +495,7 @@ FT_BEGIN_HEADER /* Do not #undef this macro here, since the build system might */ /* define it for certain configurations only. */ diff --git a/third_party/freetype2/include/ftoption.h b/third_party/freetype2/include/ftoption.h index f921a04..74f988d 100644 --- a/third_party/freetype2/include/ftoption.h +++ b/third_party/freetype2/include/ftoption.h @@ -92,7 +92,7 @@ FT_BEGIN_HEADER /* This is done to allow FreeType clients to run unmodified, forcing */ /* them to display normal gray-level anti-aliased glyphs. */ /* */ -/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */ +#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING /*************************************************************************/ diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index e93f799..87b9584 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -33,6 +33,8 @@ Bug(dcarney) http/tests/security/naked-global-object.html [ NeedsManualRebaseline ] +crbug.com/342077 [ Linux Android ] fast/text/chromium-linux-fontconfig-renderstyle.html [ NeedsRebaseline ] + # Can be removed after we've rolled to r164251 and are using test_expectations_w3c.txt as well. crbug.com/330086 w3c/web-platform-tests/html-templates/additions-to-parsing-xhtml-documents/node-document.html [ Failure ] crbug.com/330086 w3c/web-platform-tests/html-templates/additions-to-parsing-xhtml-documents/template-child-nodes.html [ Failure ] |