Roll Skia DEPS to 5003 & skia.gyp changes (Win patch)

skia/skia.gyp

Index: skia/skia.gyp
===================================================================
--- skia/skia.gyp	(revision 150532)
+++ skia/skia.gyp	(working copy)
@@ -179,7 +179,9 @@
         '../third_party/skia/src/core/SkAnnotation.cpp',
         '../third_party/skia/src/core/SkAlphaRuns.cpp',
         '../third_party/skia/src/core/SkAntiRun.h',
+        '../third_party/skia/src/core/SkAutoKern.h',
         '../third_party/skia/src/core/SkBitmap.cpp',
+        '../third_party/skia/src/core/SkBitmapHeap.cpp',
         '../third_party/skia/src/core/SkBitmapProcShader.cpp',
         '../third_party/skia/src/core/SkBitmapProcShader.h',
         '../third_party/skia/src/core/SkBitmapProcState.cpp',
@@ -235,6 +237,7 @@
         '../third_party/skia/src/core/SkEdgeClipper.cpp',
         '../third_party/skia/src/core/SkEdge.cpp',
         '../third_party/skia/src/core/SkEdge.h',
+        '../third_party/skia/src/core/SkFDot6.h',
         '../third_party/skia/src/core/SkFP.h',
         '../third_party/skia/src/core/SkFilterProc.cpp',
         '../third_party/skia/src/core/SkFilterProc.h',
@@ -383,6 +386,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/GrCacheID.cpp',
         '../third_party/skia/src/gpu/GrClipData.cpp',
         '../third_party/skia/src/gpu/GrClipMaskManager.cpp',
         '../third_party/skia/src/gpu/GrClipMaskManager.h',
@@ -593,7 +597,6 @@
         '../third_party/skia/include/core/Sk64.h',
         '../third_party/skia/include/core/SkAdvancedTypefaceMetrics.h',
         '../third_party/skia/include/core/SkAnnotation.h',
-        '../third_party/skia/include/core/SkAutoKern.h',
         '../third_party/skia/include/core/SkBitmap.h',
         '../third_party/skia/include/core/SkBlitRow.h',
         '../third_party/skia/include/core/SkBlitter.h',
@@ -617,7 +620,6 @@
         '../third_party/skia/include/core/SkDrawLooper.h',
         #'../third_party/skia/include/core/SkDrawing.h',
         '../third_party/skia/include/core/SkEndian.h',
-        '../third_party/skia/include/core/SkFDot6.h',
         '../third_party/skia/include/core/SkFixed.h',
         '../third_party/skia/include/core/SkFlate.h',
         '../third_party/skia/include/core/SkFlattenable.h',
@@ -702,6 +704,7 @@
         '../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',
         '../third_party/skia/include/gpu/GrColor.h',
         '../third_party/skia/include/gpu/GrConfig.h',