summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorreed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-19 13:07:43 +0000
committerreed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-19 13:07:43 +0000
commit4cf7dde300dcd8e33bb5b438c66dffe6c1cf426e (patch)
tree4ff53ead34756b9b7f0a621781bdf60a7076feee
parentbbf3c9d2ef091f6c109d9ab93c2bd2e477806395 (diff)
downloadchromium_src-4cf7dde300dcd8e33bb5b438c66dffe6c1cf426e.zip
chromium_src-4cf7dde300dcd8e33bb5b438c66dffe6c1cf426e.tar.gz
chromium_src-4cf7dde300dcd8e33bb5b438c66dffe6c1cf426e.tar.bz2
roll skia to 2487
Review URL: http://codereview.chromium.org/8336025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106272 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--skia/skia.gyp1
2 files changed, 2 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 78674ea..2b1ee79 100644
--- a/DEPS
+++ b/DEPS
@@ -29,7 +29,7 @@ vars = {
"libvpx_revision": "103347",
"ffmpeg_revision": "106016",
"sfntly_revision": "98",
- "skia_revision": "2480",
+ "skia_revision": "2487",
"v8_revision": "9637",
"webrtc_revision": "764",
diff --git a/skia/skia.gyp b/skia/skia.gyp
index 2f228e9..347f193 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -190,6 +190,7 @@
'../third_party/skia/src/core/SkBitmapShaderTemplate.h',
'../third_party/skia/src/core/SkBitmap_scroll.cpp',
'../third_party/skia/src/core/SkBlitBWMaskTemplate.h',
+ '../third_party/skia/src/core/SkBlitMask_D32.cpp',
'../third_party/skia/src/core/SkBlitRow_D16.cpp',
'../third_party/skia/src/core/SkBlitRow_D32.cpp',
'../third_party/skia/src/core/SkBlitRow_D4444.cpp',