diff options
| author | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-25 17:22:54 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-25 17:22:54 +0000 |
| commit | fb34e5ee8e0cf8dc587714cc1dbe3019ca80ed33 (patch) | |
| tree | 53cd14f4065aeef760940db8d6970830635c5d91 | |
| parent | 509b4fe2c9fd6f3209f36722a47a644868a76385 (diff) | |
| download | chromium_src-fb34e5ee8e0cf8dc587714cc1dbe3019ca80ed33.zip chromium_src-fb34e5ee8e0cf8dc587714cc1dbe3019ca80ed33.tar.gz chromium_src-fb34e5ee8e0cf8dc587714cc1dbe3019ca80ed33.tar.bz2 | |
roll skia to 1946
Review URL: http://codereview.chromium.org/7484068
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93901 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | skia/skia.gyp | 1 |
2 files changed, 2 insertions, 1 deletions
@@ -22,7 +22,7 @@ vars = { "libvpx_revision": "90416", "ffmpeg_revision": "91042", "sfntly_revision": "20", - "skia_revision": "1942", + "skia_revision": "1946", "v8_revision": "8695", "webrtc_revision": "232", } diff --git a/skia/skia.gyp b/skia/skia.gyp index 2644d47..24ca6cc 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -719,6 +719,7 @@ 'GR_AGGRESSIVE_SHADER_OPTS=1', 'SK_DISABLE_FAST_AA_STROKE_RECT', 'SK_IGNORE_CF_OPTIMIZATION', + 'SK_IGNORE_ROTATED_FREETYPE_FIX', ], 'sources!': [ '../third_party/skia/include/core/SkTypes.h', |