Roll Skia DEPS to 5042 & skia.gyp changes

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 183 matching lines @@
         '../third_party/skia/src/core/SkBitmapSamplerTemplate.h',
         '../third_party/skia/src/core/SkBitmapShader16BilerpTemplate.h',
         '../third_party/skia/src/core/SkBitmapShaderTemplate.h',
         '../third_party/skia/src/core/SkBitmap_scroll.cpp',
         '../third_party/skia/src/core/SkBlitBWMaskTemplate.h',
         '../third_party/skia/src/core/SkBlitMask_D32.cpp',
         '../third_party/skia/src/core/SkBlitRow_D16.cpp',
         '../third_party/skia/src/core/SkBlitRow_D32.cpp',
         '../third_party/skia/src/core/SkBlitRow_D4444.cpp',
         '../third_party/skia/src/core/SkBlitter.cpp',
+        '../third_party/skia/src/core/SkBlitter.h',
         '../third_party/skia/src/core/SkBlitter_4444.cpp',
         '../third_party/skia/src/core/SkBlitter_A1.cpp',
         '../third_party/skia/src/core/SkBlitter_A8.cpp',
         '../third_party/skia/src/core/SkBlitter_ARGB32.cpp',
         '../third_party/skia/src/core/SkBlitter_RGB16.cpp',
         '../third_party/skia/src/core/SkBlitter_Sprite.cpp',
         '../third_party/skia/src/core/SkBuffer.cpp',
         '../third_party/skia/src/core/SkCanvas.cpp',
         '../third_party/skia/src/core/SkChunkAlloc.cpp',
         '../third_party/skia/src/core/SkClipStack.cpp',
@@ skipping 76 matching lines @@
         '../third_party/skia/src/core/SkRasterizer.cpp',
         '../third_party/skia/src/core/SkRect.cpp',
         '../third_party/skia/src/core/SkRefCnt.cpp',
         '../third_party/skia/src/core/SkRefDict.cpp',
         '../third_party/skia/src/core/SkRegion.cpp',
         '../third_party/skia/src/core/SkRegionPriv.h',
         '../third_party/skia/src/core/SkRegion_path.cpp',
         '../third_party/skia/src/core/SkScalar.cpp',
         '../third_party/skia/src/core/SkScalerContext.cpp',
         '../third_party/skia/src/core/SkScan.cpp',
+        '../third_party/skia/src/core/SkScan.h',
         '../third_party/skia/src/core/SkScanPriv.h',
         '../third_party/skia/src/core/SkScan_AntiPath.cpp',
         '../third_party/skia/src/core/SkScan_Antihair.cpp',
         '../third_party/skia/src/core/SkScan_Hairline.cpp',
         '../third_party/skia/src/core/SkScan_Path.cpp',
         '../third_party/skia/src/core/SkShader.cpp',
-        '../third_party/skia/src/core/SkShape.cpp',
         '../third_party/skia/src/core/SkSpriteBlitter_ARGB32.cpp',
         '../third_party/skia/src/core/SkSpriteBlitter_RGB16.cpp',
         '../third_party/skia/src/core/SkSinTable.h',
         '../third_party/skia/src/core/SkSpriteBlitter.h',
         '../third_party/skia/src/core/SkSpriteBlitterTemplate.h',
         '../third_party/skia/src/core/SkStream.cpp',
         '../third_party/skia/src/core/SkString.cpp',
         '../third_party/skia/src/core/SkStroke.cpp',
         '../third_party/skia/src/core/SkStrokerPriv.cpp',
         '../third_party/skia/src/core/SkStrokerPriv.h',
@@ skipping 276 matching lines @@
         '../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/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',
@@ skipping 35 matching lines @@
         '../third_party/skia/include/core/SkRandom.h',
         '../third_party/skia/include/core/SkRasterizer.h',
         '../third_party/skia/include/core/SkReader32.h',
         '../third_party/skia/include/core/SkRect.h',
         '../third_party/skia/include/core/SkRefCnt.h',
         '../third_party/skia/include/core/SkRefDict.h',
         '../third_party/skia/include/core/SkRegion.h',
         '../third_party/skia/include/core/SkScalar.h',
         '../third_party/skia/include/core/SkScalarCompare.h',
         '../third_party/skia/include/core/SkScalerContext.h',
-        '../third_party/skia/include/core/SkScan.h',
         '../third_party/skia/include/core/SkShader.h',
         '../third_party/skia/include/core/SkStream.h',
         '../third_party/skia/include/core/SkString.h',
         '../third_party/skia/include/core/SkTArray.h',
         '../third_party/skia/include/core/SkTDArray.h',
         '../third_party/skia/include/core/SkTDStack.h',
         '../third_party/skia/include/core/SkTDict.h',
         '../third_party/skia/include/core/SkTRegistry.h',
         '../third_party/skia/include/core/SkTScopedPtr.h',
         '../third_party/skia/include/core/SkTSearch.h',
@@ skipping 672 matching lines @@
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'ext/image_operations_bench.cc',
       ],
     },
   ],
 }