diff options
| author | inferno@chromium.org <inferno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-28 02:46:36 +0000 |
|---|---|---|
| committer | inferno@chromium.org <inferno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-28 02:46:36 +0000 |
| commit | e9c7de643c44609c2c1a4c69383e0ca86ee5197c (patch) | |
| tree | c20be03c25aa4b4925b45dc7af88081ae9545239 /skia | |
| parent | 66fcdd5d8b6faeefc391a91ac9a4c885691c960c (diff) | |
| download | chromium_src-e9c7de643c44609c2c1a4c69383e0ca86ee5197c.zip chromium_src-e9c7de643c44609c2c1a4c69383e0ca86ee5197c.tar.gz chromium_src-e9c7de643c44609c2c1a4c69383e0ca86ee5197c.tar.bz2 | |
Revert 148768 - roll skia to 4804
Review URL: https://chromiumcodereview.appspot.com/10826009
TBR=reed@google.com
Review URL: https://chromiumcodereview.appspot.com/10835026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148875 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/skia.gyp | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp index 156ef53..b8317b9 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -325,11 +325,14 @@ '../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', @@ -339,6 +342,7 @@ '../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', @@ -347,25 +351,10 @@ '../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', |