roll skia to 4229

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 375 matching lines @@
         '../third_party/skia/src/gpu/GrInOrderDrawBuffer.h',
         '../third_party/skia/src/gpu/GrIndexBuffer.h',
         '../third_party/skia/src/gpu/GrMatrix.cpp',
         '../third_party/skia/src/gpu/GrMemory.cpp',
         '../third_party/skia/src/gpu/GrPathRenderer.cpp',
         '../third_party/skia/src/gpu/GrPathRenderer.h',
         '../third_party/skia/src/gpu/GrPathRendererChain.cpp',
         '../third_party/skia/src/gpu/GrPathRendererChain.h',
         '../third_party/skia/src/gpu/GrSoftwarePathRenderer.cpp',
         '../third_party/skia/src/gpu/GrSoftwarePathRenderer.h',
+        '../third_party/skia/src/gpu/GrPath.h',
         '../third_party/skia/src/gpu/GrPathUtils.cpp',
         '../third_party/skia/src/gpu/GrPlotMgr.h',
         '../third_party/skia/src/gpu/GrRandom.h',
         '../third_party/skia/src/gpu/GrRectanizer.h',
         '../third_party/skia/src/gpu/GrRectanizer_fifo.cpp',
         '../third_party/skia/src/gpu/GrRenderTarget.cpp',
         '../third_party/skia/src/gpu/GrResource.cpp',
         '../third_party/skia/src/gpu/GrResourceCache.cpp',
         '../third_party/skia/src/gpu/GrResourceCache.h',
         '../third_party/skia/src/gpu/GrStencil.cpp',
@@ skipping 26 matching lines @@
         '../third_party/skia/src/gpu/gl/GrGLCaps.h',
         '../third_party/skia/src/gpu/gl/GrGLContextInfo.cpp',
         '../third_party/skia/src/gpu/gl/GrGLContextInfo.h',
         '../third_party/skia/src/gpu/gl/GrGLCreateNativeInterface_none.cpp',
         '../third_party/skia/src/gpu/gl/GrGLDefaultInterface_none.cpp',
         '../third_party/skia/src/gpu/gl/GrGLDefines.h',
         '../third_party/skia/src/gpu/gl/GrGLIRect.h',
         '../third_party/skia/src/gpu/gl/GrGLIndexBuffer.cpp',
         '../third_party/skia/src/gpu/gl/GrGLIndexBuffer.h',
         '../third_party/skia/src/gpu/gl/GrGLInterface.cpp',
+        '../third_party/skia/src/gpu/gl/GrGLPath.cpp',
+        '../third_party/skia/src/gpu/gl/GrGLPath.h',
         '../third_party/skia/src/gpu/gl/GrGLProgram.cpp',
         '../third_party/skia/src/gpu/gl/GrGLProgram.h',
         '../third_party/skia/src/gpu/gl/GrGLProgramStage.cpp',
         '../third_party/skia/src/gpu/gl/GrGLProgramStage.h',
         '../third_party/skia/src/gpu/gl/GrGLRenderTarget.cpp',
         '../third_party/skia/src/gpu/gl/GrGLRenderTarget.h',
         '../third_party/skia/src/gpu/gl/GrGLSL.cpp',
         '../third_party/skia/src/gpu/gl/GrGLSL.h',
         '../third_party/skia/src/gpu/gl/GrGLShaderBuilder.cpp',
         '../third_party/skia/src/gpu/gl/GrGLShaderBuilder.h',
@@ skipping 97 matching lines @@
         '../third_party/skia/include/utils/mac/SkCGUtils.h',
         '../third_party/skia/include/utils/SkDeferredCanvas.h',
         '../third_party/skia/include/utils/SkMatrix44.h',
         '../third_party/skia/src/utils/mac/SkCreateCGImageRef.cpp',
         '../third_party/skia/src/utils/SkBase64.cpp',
         '../third_party/skia/src/utils/SkBase64.h',
         '../third_party/skia/src/utils/SkBitSet.cpp',
         '../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/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',
@@ skipping 139 matching lines @@
         '../third_party/skia/include/ports/SkTypeface_win.h',
 
         '../third_party/skia/include/images/SkFlipPixelRef.h',
         '../third_party/skia/include/images/SkImageDecoder.h',
         '../third_party/skia/include/images/SkImageEncoder.h',
         '../third_party/skia/include/images/SkImageRef.h',
         '../third_party/skia/include/images/SkImageRef_GlobalPool.h',
         '../third_party/skia/include/images/SkMovie.h',
         '../third_party/skia/include/images/SkPageFlipper.h',
 
+        '../third_party/skia/include/utils/SkNullCanvas.h',
+
         'ext/bitmap_platform_device.h',
         'ext/bitmap_platform_device_android.cc',
         'ext/bitmap_platform_device_android.h',
         'ext/bitmap_platform_device_data.h',
         'ext/bitmap_platform_device_linux.cc',
         'ext/bitmap_platform_device_linux.h',
         'ext/bitmap_platform_device_mac.cc',
         'ext/bitmap_platform_device_mac.h',
         'ext/bitmap_platform_device_win.cc',
         'ext/bitmap_platform_device_win.h',
@@ skipping 548 matching lines @@
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'ext/image_operations_bench.cc',
       ],
     },
   ],
 }