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

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 161 matching lines @@
 
         '../third_party/skia/src/animator/SkTime.cpp',
 
         '../third_party/skia/src/core/ARGB32_Clamp_Bilinear_BitmapShader.h',
         '../third_party/skia/src/core/Sk64.cpp',
         '../third_party/skia/src/core/SkAAClip.cpp',
         '../third_party/skia/src/core/SkAdvancedTypefaceMetrics.cpp',
         '../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',
         '../third_party/skia/src/core/SkBitmapProcState.h',
         '../third_party/skia/src/core/SkBitmapProcState_matrix.h',
         '../third_party/skia/src/core/SkBitmapProcState_matrixProcs.cpp',
         '../third_party/skia/src/core/SkBitmapProcState_sample.h',
         '../third_party/skia/src/core/SkBitmapSampler.cpp',
         '../third_party/skia/src/core/SkBitmapSampler.h',
         '../third_party/skia/src/core/SkBitmapSamplerTemplate.h',
@@ skipping 35 matching lines @@
         '../third_party/skia/src/core/SkDeque.cpp',
         '../third_party/skia/src/core/SkDevice.cpp',
         '../third_party/skia/src/core/SkDither.cpp',
         '../third_party/skia/src/core/SkDraw.cpp',
         '../third_party/skia/src/core/SkDrawProcs.h',
         #'../third_party/skia/src/core/SkDrawing.cpp',
         '../third_party/skia/src/core/SkEdgeBuilder.cpp',
         '../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',
         '../third_party/skia/src/core/SkFlate.cpp',
         '../third_party/skia/src/core/SkFlattenable.cpp',
         '../third_party/skia/src/core/SkFlattenableBuffers.cpp',
         '../third_party/skia/src/core/SkFloat.cpp',
         '../third_party/skia/src/core/SkFloat.h',
         '../third_party/skia/src/core/SkFloatBits.cpp',
         '../third_party/skia/src/core/SkFontHost.cpp',
@@ skipping 128 matching lines @@
         '../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',
         '../third_party/skia/src/gpu/GrAtlas.h',
         '../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',
         '../third_party/skia/src/gpu/GrContext.cpp',
         '../third_party/skia/src/gpu/GrCustomStage.cpp',
         '../third_party/skia/src/gpu/GrDefaultPathRenderer.cpp',
         '../third_party/skia/src/gpu/GrDefaultPathRenderer.h',
         '../third_party/skia/src/gpu/GrDrawTarget.cpp',
         '../third_party/skia/src/gpu/GrDrawTarget.h',
         '../third_party/skia/src/gpu/GrGeometryBuffer.h',
@@ skipping 190 matching lines @@
         '../third_party/skia/src/utils/SkBitSet.h',
         '../third_party/skia/src/utils/SkDeferredCanvas.cpp',
         '../third_party/skia/src/utils/SkMatrix44.cpp',
         '../third_party/skia/src/utils/SkNullCanvas.cpp',
         '../third_party/skia/include/utils/SkNWayCanvas.h',
         '../third_party/skia/src/utils/SkNWayCanvas.cpp',
 
         '../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',
         '../third_party/skia/include/core/SkBounder.h',
         '../third_party/skia/include/core/SkBuffer.h',
         '../third_party/skia/include/core/SkCanvas.h',
         '../third_party/skia/include/core/SkChunkAlloc.h',
         '../third_party/skia/include/core/SkClipStack.h',
         '../third_party/skia/include/core/SkColor.h',
         '../third_party/skia/include/core/SkColorFilter.h',
         '../third_party/skia/include/core/SkColorPriv.h',
         '../third_party/skia/include/core/SkColorShader.h',
         '../third_party/skia/include/core/SkComposeShader.h',
         '../third_party/skia/include/core/SkData.h',
         '../third_party/skia/include/core/SkDeque.h',
         '../third_party/skia/include/core/SkDescriptor.h',
         '../third_party/skia/include/core/SkDevice.h',
         '../third_party/skia/include/core/SkDither.h',
         '../third_party/skia/include/core/SkDraw.h',
         '../third_party/skia/include/core/SkDrawFilter.h',
         '../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',
         '../third_party/skia/include/core/SkFloatBits.h',
         '../third_party/skia/include/core/SkFloatingPoint.h',
         '../third_party/skia/include/core/SkFontHost.h',
         '../third_party/skia/include/core/SkGeometry.h',
         '../third_party/skia/include/core/SkGraphics.h',
         '../third_party/skia/include/core/SkInstCnt.h',
         '../third_party/skia/include/core/SkMMapStream.h',
@@ skipping 64 matching lines @@
         '../third_party/skia/include/effects/SkLayerDrawLooper.h',
         '../third_party/skia/include/effects/SkLayerRasterizer.h',
         '../third_party/skia/include/effects/SkLightingImageFilter.h',
         '../third_party/skia/include/effects/SkMorphologyImageFilter.h',
         '../third_party/skia/include/effects/SkPaintFlagsDrawFilter.h',
         '../third_party/skia/include/effects/SkPixelXorXfermode.h',
         '../third_party/skia/include/effects/SkPorterDuff.h',
         '../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',
         '../third_party/skia/include/gpu/GrContext.h',
         '../third_party/skia/include/gpu/GrCustomStage.h',
         '../third_party/skia/include/gpu/GrFontScaler.h',
         '../third_party/skia/include/gpu/gl/GrGLConfig.h',
         '../third_party/skia/include/gpu/gl/GrGLConfig_chrome.h',
         '../third_party/skia/include/gpu/gl/GrGLFunctions.h',
         '../third_party/skia/include/gpu/gl/GrGLInterface.h',
@@ skipping 622 matching lines @@
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'ext/image_operations_bench.cc',
       ],
     },
   ],
 }