diff options
| author | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-02 14:42:21 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-02 14:42:21 +0000 |
| commit | 479745ec27b4e240fb75966abbe99759d201f2dc (patch) | |
| tree | 1602720c9686bef78f0c5beaf92c4a58c528a367 /skia | |
| parent | 7a19ea21fef7cc98f869a1823ef2c2202ec7d3c9 (diff) | |
| download | chromium_src-479745ec27b4e240fb75966abbe99759d201f2dc.zip chromium_src-479745ec27b4e240fb75966abbe99759d201f2dc.tar.gz chromium_src-479745ec27b4e240fb75966abbe99759d201f2dc.tar.bz2 | |
Roll Skia DEPS to 4904 & update skia.gyp
control: http://codereview.chromium.org/10825153/
Review URL: https://chromiumcodereview.appspot.com/10843051
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149625 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/skia.gyp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp index 7aeb406..7ddd006 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -382,7 +382,7 @@ '../third_party/skia/src/gpu/GrBinHashKey.h', '../third_party/skia/src/gpu/GrBufferAllocPool.cpp', '../third_party/skia/src/gpu/GrBufferAllocPool.h', - '../third_party/skia/src/gpu/GrClip.cpp', + '../third_party/skia/src/gpu/GrClipData.cpp', '../third_party/skia/src/gpu/GrClipMaskManager.cpp', '../third_party/skia/src/gpu/GrClipMaskManager.h', '../third_party/skia/src/gpu/GrContext.cpp', @@ -701,8 +701,7 @@ '../third_party/skia/include/effects/SkTransparentShader.h', '../third_party/skia/include/gpu/GrAARectRenderer.h', - '../third_party/skia/include/gpu/GrClip.h', - '../third_party/skia/include/gpu/GrClipIterator.h', + '../third_party/skia/include/gpu/GrClipData.h', '../third_party/skia/include/gpu/GrColor.h', '../third_party/skia/include/gpu/GrConfig.h', '../third_party/skia/include/gpu/GrContext.h', |