summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorreed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-13 19:20:25 +0000
committerreed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-13 19:20:25 +0000
commit30316fc0198db227a68a6f1176936905bd704fa3 (patch)
tree94135d7a7e5b61a33a046552babb753a6b5def6b
parent51923c9ad2cb24bab87265ad38feae3ab61ef4ee (diff)
downloadchromium_src-30316fc0198db227a68a6f1176936905bd704fa3.zip
chromium_src-30316fc0198db227a68a6f1176936905bd704fa3.tar.gz
chromium_src-30316fc0198db227a68a6f1176936905bd704fa3.tar.bz2
roll skia to 2258
Review URL: http://codereview.chromium.org/7892006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100948 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--skia/skia.gyp3
2 files changed, 4 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index f0b891b2..b7ce3dd 100644
--- a/DEPS
+++ b/DEPS
@@ -29,7 +29,7 @@ vars = {
"libvpx_revision": "97420",
"ffmpeg_revision": "99115",
"sfntly_revision": "54",
- "skia_revision": "2249",
+ "skia_revision": "2258",
"v8_revision": "9248",
"webrtc_revision": "565",
diff --git a/skia/skia.gyp b/skia/skia.gyp
index 106efa9..8b836a8 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -787,6 +787,9 @@
'ext/SkFontHost_fontconfig.cpp',
'ext/SkFontHost_fontconfig_direct.cpp',
],
+ 'defines': [
+ 'SK_MAX_SIZE_FOR_LCDTEXT=256',
+ ],
}],
[ 'OS == "mac"', {
'defines': [