Revert 148768 - roll skia to 4804

skia/skia.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'targets': [
     {
       'target_name': 'skia',
       'type': '<(component)',
       'variables': {
@@ skipping 307 matching lines @@
         '../third_party/skia/src/core/SkUtils.cpp',
         '../third_party/skia/src/core/SkWriter32.cpp',
         '../third_party/skia/src/core/SkXfermode.cpp',
 
         '../third_party/skia/src/pipe/SkGPipeRead.cpp',
         '../third_party/skia/src/pipe/SkGPipeWrite.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/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',
         '../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/SkGradientShader.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/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/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',
         '../third_party/skia/src/gpu/GrAAHairLinePathRenderer.h',
         '../third_party/skia/src/gpu/GrAARectRenderer.cpp',
         '../third_party/skia/src/gpu/GrAddPathRenderers_default.cpp',
         '../third_party/skia/src/gpu/GrAllocPool.cpp',
         '../third_party/skia/src/gpu/GrAllocPool.h',
         '../third_party/skia/src/gpu/GrAllocator.h',
         '../third_party/skia/src/gpu/GrAtlas.cpp',
@@ skipping 942 matching lines @@
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'ext/image_operations_bench.cc',
       ],
     },
   ],
 }