Roll Skia to r5213.

Control your roll: https://chromiumcodereview.appspot.com/10034033
Review URL: https://chromiumcodereview.appspot.com/10834432

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152757 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 70 deletions

diff --git a/skia/skia.gyp b/skia/skia.gyp
index 9b9b165..0bfd4fe 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -17,57 +17,13 @@
 
       'includes': [
         '../third_party/skia/gyp/core.gypi',
+        '../third_party/skia/gyp/effects.gypi',
       ],
 
       'sources': [
         # this should likely be moved into src/utils in skia
         '../third_party/skia/src/core/SkFlate.cpp',
 
-        '../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/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/SkColorFilters.cpp',
-        '../third_party/skia/src/effects/SkColorMatrixFilter.cpp',
-        '../third_party/skia/src/effects/SkCornerPathEffect.cpp',
-        '../third_party/skia/src/effects/SkDashPathEffect.cpp',
-        '../third_party/skia/src/effects/SkDiscretePathEffect.cpp',
-        '../third_party/skia/src/effects/SkEmbossMask.cpp',
-        '../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/SkKernel33MaskFilter.cpp',
-        '../third_party/skia/src/effects/SkLayerDrawLooper.cpp',
-        '../third_party/skia/src/effects/SkLayerRasterizer.cpp',
-        '../third_party/skia/src/effects/SkLightingImageFilter.cpp',
-        '../third_party/skia/src/effects/SkMagnifierImageFilter.cpp',
-        '../third_party/skia/src/effects/SkMorphologyImageFilter.cpp',
-        '../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/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',
@@ -156,6 +112,8 @@
         '../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/effects/GrTextureStripAtlas.cpp',
+        '../third_party/skia/src/gpu/effects/GrTextureStripAtlas.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',
@@ -290,31 +248,6 @@
         '../third_party/skia/include/utils/SkNWayCanvas.h',
         '../third_party/skia/src/utils/SkNWayCanvas.cpp',
 
-        '../third_party/skia/include/effects/Sk1DPathEffect.h',
-        '../third_party/skia/include/effects/Sk2DPathEffect.h',
-        '../third_party/skia/include/effects/SkAvoidXfermode.h',
-        '../third_party/skia/include/effects/SkBlurDrawLooper.h',
-        '../third_party/skia/include/effects/SkBlurImageFilter.h',
-        '../third_party/skia/include/effects/SkBlurMaskFilter.h',
-        '../third_party/skia/include/effects/SkColorMatrix.h',
-        '../third_party/skia/include/effects/SkColorMatrixFilter.h',
-        '../third_party/skia/include/effects/SkCornerPathEffect.h',
-        '../third_party/skia/include/effects/SkDashPathEffect.h',
-        '../third_party/skia/include/effects/SkDiscretePathEffect.h',
-        '../third_party/skia/include/effects/SkDrawExtraPathEffect.h',
-        '../third_party/skia/include/effects/SkEmbossMaskFilter.h',
-        '../third_party/skia/include/effects/SkGradientShader.h',
-        '../third_party/skia/include/effects/SkKernel33MaskFilter.h',
-        '../third_party/skia/include/effects/SkLayerDrawLooper.h',
-        '../third_party/skia/include/effects/SkLayerRasterizer.h',
-        '../third_party/skia/include/effects/SkLightingImageFilter.h',
-        '../third_party/skia/include/effects/SkMorphologyImageFilter.h',
-        '../third_party/skia/include/effects/SkMagnifierImageFilter.h',
-        '../third_party/skia/include/effects/SkPaintFlagsDrawFilter.h',
-        '../third_party/skia/include/effects/SkPixelXorXfermode.h',
-        '../third_party/skia/include/effects/SkPorterDuff.h',
-        '../third_party/skia/include/effects/SkTransparentShader.h',
-
         '../third_party/skia/include/gpu/GrAARectRenderer.h',
         '../third_party/skia/include/gpu/GrCacheID.h',
         '../third_party/skia/include/gpu/GrClipData.h',