summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-17 19:26:47 +0000
committervandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-17 19:26:47 +0000
commit64bfe131e4db2620c6f6fa9b15cbc00c4e10b565 (patch)
treef684b3117ec1a8a5a0cc06eb30f51e0b2d5560f8
parent660d948d59127865af35ff82b805b7495895f7ad (diff)
downloadchromium_src-64bfe131e4db2620c6f6fa9b15cbc00c4e10b565.zip
chromium_src-64bfe131e4db2620c6f6fa9b15cbc00c4e10b565.tar.gz
chromium_src-64bfe131e4db2620c6f6fa9b15cbc00c4e10b565.tar.bz2
Roll Skia to r624.
BUG=None TEST=None Review URL: http://codereview.chromium.org/4842001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66494 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--skia/skia.gyp2
2 files changed, 3 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 7f702f8..0fd5cda 100644
--- a/DEPS
+++ b/DEPS
@@ -5,7 +5,7 @@ vars = {
"webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk",
"nacl_trunk": "http://src.chromium.org/native_client/trunk",
"webkit_revision": "72187",
- "skia_revision": "621",
+ "skia_revision": "624",
"chromium_git": "http://git.chromium.org/git",
"swig_revision": "40423",
"nacl_revision": "3664",
diff --git a/skia/skia.gyp b/skia/skia.gyp
index 5be7398..9ff333d 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -270,6 +270,7 @@
'../third_party/skia/src/core/SkRegion.cpp',
'../third_party/skia/src/core/SkRegionPriv.h',
'../third_party/skia/src/core/SkRegion_path.cpp',
+ '../third_party/skia/src/core/SkScalar.cpp',
'../third_party/skia/src/core/SkScalerContext.cpp',
'../third_party/skia/src/core/SkScan.cpp',
'../third_party/skia/src/core/SkScanPriv.h',
@@ -385,6 +386,7 @@
'../third_party/skia/src/ports/sk_predefined_gamma.h',
'../third_party/skia/src/include/utils/mac/SkCGUtils.h',
+ '../third_party/skia/src/include/utils/SkTextFormatParams.h',
'../third_party/skia/src/utils/mac/SkCreateCGImageRef.cpp',
'../third_party/skia/include/core/Sk64.h',