Revert 148768 - roll skia to 4804

skia/skia.gyp

Index: skia/skia.gyp
===================================================================
--- skia/skia.gyp	(revision 148874)
+++ skia/skia.gyp	(working copy)
@@ -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',