diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-12 15:52:22 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-12 15:52:22 +0000 |
| commit | e1a211380c1d146490aa0b37f63d07cb5916604b (patch) | |
| tree | 4bf25fb7dbcac21c8b56e9bda7b7f658a64f633d | |
| parent | e5f1662f0625061f8bafbdf2a54dd19682bd4447 (diff) | |
| download | chromium_src-e1a211380c1d146490aa0b37f63d07cb5916604b.zip chromium_src-e1a211380c1d146490aa0b37f63d07cb5916604b.tar.gz chromium_src-e1a211380c1d146490aa0b37f63d07cb5916604b.tar.bz2 | |
Merge 38320 - Enable the use of Freetype's emboldening in Chrome/Linux. Skia's is not so pretty.
BUG=http://crbug.com/22360
TEST=fast/encoding/denormalisedvoicedjapanesechars.html
Review URL: http://codereview.chromium.org/583001
TBR=senorblanco@chromium.org
Review URL: http://codereview.chromium.org/597060
git-svn-id: svn://svn.chromium.org/chrome/branches/307/src@38897 0039d316-1c4b-4281-b951-d872f2087c98
4 files changed, 6 insertions, 2 deletions
@@ -3,7 +3,7 @@ vars = { "http://svn.webkit.org/repository/webkit/trunk", "webkit_revision": "53877", "ffmpeg_revision": "34297", - "skia_revision": "475", + "skia_revision": "490", "chromium_git": "http://src.chromium.org/git", } diff --git a/skia/config/SkUserConfig.h b/skia/config/SkUserConfig.h index b83a3d6..a51b2fa 100644 --- a/skia/config/SkUserConfig.h +++ b/skia/config/SkUserConfig.h @@ -171,6 +171,10 @@ typedef unsigned uint32_t; #elif defined(SK_BUILD_FOR_UNIX) +// Prefer FreeType's emboldening algorithm to Skia's (which does a hairline +// outline and doesn't look very good). +#define SK_USE_FREETYPE_EMBOLDEN + #ifdef SK_CPU_BENDIAN // Above we set the order for ARGB channels in registers. I suspect that, on // big endian machines, you can keep this the same and everything will work. diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/encoding/denormalised-voiced-japanese-chars-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/encoding/denormalised-voiced-japanese-chars-expected.checksum index 392b217..89e6cdb 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/encoding/denormalised-voiced-japanese-chars-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/encoding/denormalised-voiced-japanese-chars-expected.checksum @@ -1 +1 @@ -908a5323abd44bf8c84744bf94078f6c
\ No newline at end of file +0e8fac8e74ebd0767099acaae7daf3ed
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/encoding/denormalised-voiced-japanese-chars-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/encoding/denormalised-voiced-japanese-chars-expected.png Binary files differindex ac21c70..ca724a5 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/encoding/denormalised-voiced-japanese-chars-expected.png +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/encoding/denormalised-voiced-japanese-chars-expected.png |
