roll skia to 4012

skia/skia.gyp

Index: skia/skia.gyp
===================================================================
--- skia/skia.gyp	(revision 138091)
+++ skia/skia.gyp	(working copy)
@@ -391,8 +391,6 @@
         '../third_party/skia/src/gpu/GrSoftwarePathRenderer.h',
         '../third_party/skia/src/gpu/GrPathUtils.cpp',
         '../third_party/skia/src/gpu/GrPlotMgr.h',
-        '../third_party/skia/src/gpu/GrProgramStageFactory.cpp',
-        '../third_party/skia/src/gpu/GrProgramStageFactory.h',
         '../third_party/skia/src/gpu/GrRandom.h',
         '../third_party/skia/src/gpu/GrRectanizer.h',
         '../third_party/skia/src/gpu/GrRectanizer_fifo.cpp',
@@ -535,10 +533,15 @@
         #'../third_party/skia/src/ports/SkXMLPullParser_expat.cpp',
         '../third_party/skia/src/ports/sk_predefined_gamma.h',
 
+        '../third_party/skia/src/sfnt/SkOTUtils.cpp',
+        '../third_party/skia/src/sfnt/SkOTUtils.h',
+
         '../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',
@@ -670,6 +673,7 @@
         '../third_party/skia/include/gpu/GrNoncopyable.h',
         '../third_party/skia/include/gpu/GrPaint.h',
         '../third_party/skia/include/gpu/GrPoint.h',
+        '../third_party/skia/include/gpu/GrProgramStageFactory.h',
         '../third_party/skia/include/gpu/GrRect.h',
         '../third_party/skia/include/gpu/GrRefCnt.h',
         '../third_party/skia/include/gpu/GrRenderTarget.h',
@@ -759,6 +763,7 @@
         '../third_party/skia/include/utils',
         '../third_party/skia/src/core',
         '../third_party/skia/src/gpu',
+        '../third_party/skia/src/sfnt',
         '../third_party/skia/src/utils',
       ],
       'msvs_disabled_warnings': [4244, 4267,4345, 4390, 4554, 4800],