diff options
author | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-30 20:18:53 +0000 |
---|---|---|
committer | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-30 20:18:53 +0000 |
commit | 5a886e15229b627967aeb85f349e33a3645ba929 (patch) | |
tree | 86f318c1c400b763795f3658608e46ed8aedbd25 /skia | |
parent | 5a07c19cb57f297222a4bf036f2995b194223b2d (diff) | |
download | chromium_src-5a886e15229b627967aeb85f349e33a3645ba929.zip chromium_src-5a886e15229b627967aeb85f349e33a3645ba929.tar.gz chromium_src-5a886e15229b627967aeb85f349e33a3645ba929.tar.bz2 |
Roll Skia DEPS to 4834 & update skia.gyp
Control: http://codereview.chromium.org/10824087/
Review URL: https://chromiumcodereview.appspot.com/10821090
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149008 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
-rw-r--r-- | skia/skia.gyp | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp index b8317b9..17c817a 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -325,14 +325,11 @@ '../third_party/skia/src/effects/Sk1DPathEffect.cpp', '../third_party/skia/src/effects/Sk2DPathEffect.cpp', '../third_party/skia/src/effects/SkAvoidXfermode.cpp', - '../third_party/skia/src/effects/SkBitmapCache.cpp', - '../third_party/skia/src/effects/SkBitmapCache.h', '../third_party/skia/src/effects/SkBlurDrawLooper.cpp', '../third_party/skia/src/effects/SkBlurImageFilter.cpp', '../third_party/skia/src/effects/SkBlurMask.cpp', '../third_party/skia/src/effects/SkBlurMask.h', '../third_party/skia/src/effects/SkBlurMaskFilter.cpp', - '../third_party/skia/src/effects/SkClampRange.cpp', '../third_party/skia/src/effects/SkColorFilters.cpp', '../third_party/skia/src/effects/SkColorMatrixFilter.cpp', '../third_party/skia/src/effects/SkCornerPathEffect.cpp', @@ -342,7 +339,6 @@ '../third_party/skia/src/effects/SkEmbossMask.h', '../third_party/skia/src/effects/SkEmbossMask_Table.h', '../third_party/skia/src/effects/SkEmbossMaskFilter.cpp', - '../third_party/skia/src/effects/SkGradientShader.cpp', '../third_party/skia/src/effects/SkKernel33MaskFilter.cpp', '../third_party/skia/src/effects/SkLayerDrawLooper.cpp', '../third_party/skia/src/effects/SkLayerRasterizer.cpp', @@ -351,10 +347,25 @@ '../third_party/skia/src/effects/SkPaintFlagsDrawFilter.cpp', '../third_party/skia/src/effects/SkPorterDuff.cpp', '../third_party/skia/src/effects/SkPixelXorXfermode.cpp', - '../third_party/skia/src/effects/SkRadialGradient_Table.h', '../third_party/skia/src/effects/SkTableColorFilter.cpp', '../third_party/skia/src/effects/SkTransparentShader.cpp', + '../third_party/skia/src/effects/gradients/SkBitmapCache.cpp', + '../third_party/skia/src/effects/gradients/SkBitmapCache.h', + '../third_party/skia/src/effects/gradients/SkClampRange.cpp', + '../third_party/skia/src/effects/gradients/SkGradientShader.cpp', + '../third_party/skia/src/effects/gradients/SkLinearGradient.cpp', + '../third_party/skia/src/effects/gradients/SkLinearGradient.h', + '../third_party/skia/src/effects/gradients/SkRadialGradient.cpp', + '../third_party/skia/src/effects/gradients/SkRadialGradient.h', + '../third_party/skia/src/effects/gradients/SkTwoPointRadialGradient.cpp', + '../third_party/skia/src/effects/gradients/SkTwoPointRadialGradient.h', + '../third_party/skia/src/effects/gradients/SkTwoPointConicalGradient.cpp', + '../third_party/skia/src/effects/gradients/SkTwoPointConicalGradient.h', + '../third_party/skia/src/effects/gradients/SkSweepGradient.cpp', + '../third_party/skia/src/effects/gradients/SkSweepGradient.h', + '../third_party/skia/src/effects/gradients/SkGradientShaderPriv.h', + '../third_party/skia/src/gpu/GrAAConvexPathRenderer.cpp', '../third_party/skia/src/gpu/GrAAConvexPathRenderer.h', '../third_party/skia/src/gpu/GrAAHairLinePathRenderer.cpp', @@ -438,8 +449,6 @@ '../third_party/skia/src/gpu/effects/GrConvolutionEffect.h', '../third_party/skia/src/gpu/effects/GrMorphologyEffect.cpp', '../third_party/skia/src/gpu/effects/GrMorphologyEffect.h', - '../third_party/skia/src/gpu/effects/GrGradientEffects.cpp', - '../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', |