summaryrefslogtreecommitdiffstats
path: root/skia
diff options
context:
space:
mode:
authorreed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-27 17:35:50 +0000
committerreed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-27 17:35:50 +0000
commitbb90ce87747e0341fefb6bbbbac4fc1c6bec08dc (patch)
tree352db88b4defb39d4ecbc28b92b173db9c9f1503 /skia
parentc96a580989fec3db0b97cf8120ff3fde66d8f9ff (diff)
downloadchromium_src-bb90ce87747e0341fefb6bbbbac4fc1c6bec08dc.zip
chromium_src-bb90ce87747e0341fefb6bbbbac4fc1c6bec08dc.tar.gz
chromium_src-bb90ce87747e0341fefb6bbbbac4fc1c6bec08dc.tar.bz2
roll skia to 4804
Review URL: https://chromiumcodereview.appspot.com/10826009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148768 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
-rw-r--r--skia/skia.gyp21
1 files changed, 16 insertions, 5 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp
index 69bab67..cd56174 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',