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

DEPS

@@ -57,7 +57,7 @@ vars = {
   "ffmpeg_hash": "23f177366e3bce3a628a7d3feedceed4e18dcc04",
 
   "sfntly_revision": "134",
-  "skia_revision": "4780",
+  "skia_revision": "4804",
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling Skia
   # and V8 without interference from each other.

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',