Roll Skia DEPS to 4904 & update skia.gyp

control: http://codereview.chromium.org/10825153/
Review URL: https://chromiumcodereview.appspot.com/10843051

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

DEPS

@@ -29,7 +29,7 @@ vars = {
   "ffmpeg_hash": "4287c0271f399b98eb6851e6e650098f26b8c3c2",
 
   "sfntly_revision": "134",
-  "skia_revision": "4889",
+  "skia_revision": "4904",
   # 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

@@ -382,7 +382,7 @@
         '../third_party/skia/src/gpu/GrBinHashKey.h',
         '../third_party/skia/src/gpu/GrBufferAllocPool.cpp',
         '../third_party/skia/src/gpu/GrBufferAllocPool.h',
-        '../third_party/skia/src/gpu/GrClip.cpp',
+        '../third_party/skia/src/gpu/GrClipData.cpp',
         '../third_party/skia/src/gpu/GrClipMaskManager.cpp',
         '../third_party/skia/src/gpu/GrClipMaskManager.h',
         '../third_party/skia/src/gpu/GrContext.cpp',
@@ -701,8 +701,7 @@
         '../third_party/skia/include/effects/SkTransparentShader.h',
 
         '../third_party/skia/include/gpu/GrAARectRenderer.h',
-        '../third_party/skia/include/gpu/GrClip.h',
-        '../third_party/skia/include/gpu/GrClipIterator.h',
+        '../third_party/skia/include/gpu/GrClipData.h',
         '../third_party/skia/include/gpu/GrColor.h',
         '../third_party/skia/include/gpu/GrConfig.h',
         '../third_party/skia/include/gpu/GrContext.h',