diff options
| author | tomhudson@google.com <tomhudson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-19 16:38:00 +0000 |
|---|---|---|
| committer | tomhudson@google.com <tomhudson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-19 16:38:00 +0000 |
| commit | 7175fb1aa0ce9af46b557a8e59930f244df4cdb2 (patch) | |
| tree | 58b1029ccb14b225acbd424c470b096c21791349 | |
| parent | 1e855567284cdfdd022534ecd6d191ad28f58e9c (diff) | |
| download | chromium_src-7175fb1aa0ce9af46b557a8e59930f244df4cdb2.zip chromium_src-7175fb1aa0ce9af46b557a8e59930f244df4cdb2.tar.gz chromium_src-7175fb1aa0ce9af46b557a8e59930f244df4cdb2.tar.bz2 | |
Roll skia DEPS to r4647; we've had persistent Android breakage in 4654-4665.
Control is at http://chromiumcodereview.appspot.com/10807034/
Review URL: https://chromiumcodereview.appspot.com/10809012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147455 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | skia/skia.gyp | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -57,7 +57,7 @@ vars = { "ffmpeg_hash": "23f177366e3bce3a628a7d3feedceed4e18dcc04", "sfntly_revision": "134", - "skia_revision": "4634", + "skia_revision": "4647", # Three lines of non-changing comments so that # the commit queue can handle CLs rolling Skia # and V8 without interference from each other. diff --git a/skia/skia.gyp b/skia/skia.gyp index d67d7d0..5b85187 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -438,6 +438,8 @@ '../third_party/skia/src/gpu/effects/GrGradientEffects.h', '../third_party/skia/src/gpu/effects/GrSingleTextureEffect.cpp', '../third_party/skia/src/gpu/effects/GrSingleTextureEffect.h', + '../third_party/skia/src/gpu/effects/GrTextureDomainEffect.cpp', + '../third_party/skia/src/gpu/effects/GrTextureDomainEffect.h', '../third_party/skia/src/gpu/gl/GrGLCaps.cpp', '../third_party/skia/src/gpu/gl/GrGLCaps.h', '../third_party/skia/src/gpu/gl/GrGLContextInfo.cpp', |