Roll skia to r5250.

Control your roll: http://codereview.chromium.org/10034033/
Review URL: https://chromiumcodereview.appspot.com/10869027

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153032 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 163 deletions

diff --git a/skia/skia.gyp b/skia/skia.gyp
index 0bfd4fe..1615a3c 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -18,139 +18,15 @@
       'includes': [
         '../third_party/skia/gyp/core.gypi',
         '../third_party/skia/gyp/effects.gypi',
+        '../third_party/skia/gyp/gpu.gypi',
       ],
 
       'sources': [
+        '<@(gr_sources)',
+        '<@(skgr_sources)',
         # this should likely be moved into src/utils in skia
         '../third_party/skia/src/core/SkFlate.cpp',
 
-        '../third_party/skia/src/gpu/GrAAConvexPathRenderer.cpp',
-        '../third_party/skia/src/gpu/GrAAConvexPathRenderer.h',
-        '../third_party/skia/src/gpu/GrAAHairLinePathRenderer.cpp',
-        '../third_party/skia/src/gpu/GrAAHairLinePathRenderer.h',
-        '../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',
-        '../third_party/skia/src/gpu/GrGpu.cpp',
-        '../third_party/skia/src/gpu/GrGpu.h',
-        '../third_party/skia/src/gpu/GrGpuFactory.cpp',
-        '../third_party/skia/src/gpu/GrInOrderDrawBuffer.cpp',
-        '../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/GrMemoryPool.cpp',
-        '../third_party/skia/src/gpu/GrMemoryPool.h',
-        '../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/GrSWMaskHelper.cpp',
-        '../third_party/skia/src/gpu/GrSWMaskHelper.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',
-        '../third_party/skia/src/gpu/GrStencil.h',
-        '../third_party/skia/src/gpu/GrStencilAndCoverPathRenderer.cpp',
-        '../third_party/skia/src/gpu/GrStencilAndCoverPathRenderer.h',
-        '../third_party/skia/src/gpu/GrStencilBuffer.cpp',
-        '../third_party/skia/src/gpu/GrStencilBuffer.h',
-        '../third_party/skia/src/gpu/GrSurface.cpp',
-        '../third_party/skia/src/gpu/GrTBSearch.h',
-        '../third_party/skia/src/gpu/GrTDArray.h',
-        '../third_party/skia/src/gpu/GrTHashCache.h',
-        '../third_party/skia/src/gpu/GrTLList.h',
-        '../third_party/skia/src/gpu/GrTemplates.h',
-        '../third_party/skia/src/gpu/GrTextContext.cpp',
-        '../third_party/skia/src/gpu/GrTextStrike.cpp',
-        '../third_party/skia/src/gpu/GrTextStrike.h',
-        '../third_party/skia/src/gpu/GrTextStrike_impl.h',
-        '../third_party/skia/src/gpu/GrTexture.cpp',
-        '../third_party/skia/src/gpu/GrVertexBuffer.h',
-        '../third_party/skia/src/gpu/SkGpuCanvas.cpp',
-        '../third_party/skia/src/gpu/SkGpuDevice.cpp',
-        '../third_party/skia/src/gpu/SkGr.cpp',
-        '../third_party/skia/src/gpu/SkGrFontScaler.cpp',
-        '../third_party/skia/src/gpu/SkGrPixelRef.cpp',
-        '../third_party/skia/src/gpu/SkGrTexturePixelRef.cpp',
-        '../third_party/skia/src/gpu/effects/Gr1DKernelEffect.h',
-        '../third_party/skia/src/gpu/effects/GrColorTableEffect.cpp',
-        '../third_party/skia/src/gpu/effects/GrColorTableEffect.h',
-        '../third_party/skia/src/gpu/effects/GrConvolutionEffect.cpp',
-        '../third_party/skia/src/gpu/effects/GrConvolutionEffect.h',
-        '../third_party/skia/src/gpu/effects/GrMorphologyEffect.cpp',
-        '../third_party/skia/src/gpu/effects/GrMorphologyEffect.h',
-        '../third_party/skia/src/gpu/effects/GrSingleTextureEffect.cpp',
-        '../third_party/skia/src/gpu/effects/GrSingleTextureEffect.h',
-        '../third_party/skia/src/gpu/effects/GrTextureDomainEffect.cpp',
-        '../third_party/skia/src/gpu/effects/GrTextureDomainEffect.h',
-        '../third_party/skia/src/gpu/effects/GrTextureStripAtlas.cpp',
-        '../third_party/skia/src/gpu/effects/GrTextureStripAtlas.h',
-        '../third_party/skia/src/gpu/gl/GrGLCaps.cpp',
-        '../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',
-        '../third_party/skia/src/gpu/gl/GrGLStencilBuffer.cpp',
-        '../third_party/skia/src/gpu/gl/GrGLTexture.cpp',
-        '../third_party/skia/src/gpu/gl/GrGLTexture.h',
-        '../third_party/skia/src/gpu/gl/GrGLUniformManager.cpp',
-        '../third_party/skia/src/gpu/gl/GrGLUniformManager.h',
-        '../third_party/skia/src/gpu/gl/GrGLUniformHandle.h',
-        '../third_party/skia/src/gpu/gl/GrGLUtil.cpp',
-        '../third_party/skia/src/gpu/gl/GrGLUtil.h',
-        '../third_party/skia/src/gpu/gl/GrGLVertexBuffer.cpp',
-        '../third_party/skia/src/gpu/gl/GrGLVertexBuffer.h',
-        '../third_party/skia/src/gpu/gl/GrGpuGL.cpp',
-        '../third_party/skia/src/gpu/gl/GrGpuGL.h',
-        '../third_party/skia/src/gpu/gl/GrGpuGL_program.cpp',
-
         '../third_party/skia/src/images/bmpdecoderhelper.cpp',
         '../third_party/skia/src/images/bmpdecoderhelper.h',
         #'../third_party/skia/src/images/SkFDStream.cpp',
@@ -206,6 +82,8 @@
         '../third_party/skia/src/ports/SkFontDescriptor.h',
         #'../third_party/skia/src/ports/SkFontHost_FONTPATH.cpp',
         '../third_party/skia/src/ports/SkFontHost_FreeType.cpp',
+        '../third_party/skia/src/ports/SkFontHost_FreeType_common.cpp',
+        '../third_party/skia/src/ports/SkFontHost_FreeType_common.h',
         '../third_party/skia/src/ports/SkFontHost_android.cpp',
         #'../third_party/skia/src/ports/SkFontHost_ascender.cpp',
         '../third_party/skia/src/ports/SkFontHost_tables.cpp',
@@ -248,42 +126,6 @@
         '../third_party/skia/include/utils/SkNWayCanvas.h',
         '../third_party/skia/src/utils/SkNWayCanvas.cpp',
 
-        '../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',
-        '../third_party/skia/include/gpu/GrGlyph.h',
-        '../third_party/skia/include/gpu/GrInstanceCounter.h',
-        '../third_party/skia/include/gpu/GrKey.h',
-        '../third_party/skia/include/gpu/GrMatrix.h',
-        '../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',
-        '../third_party/skia/include/gpu/GrSamplerState.h',
-        '../third_party/skia/include/gpu/GrScalar.h',
-        '../third_party/skia/include/gpu/GrSurface.h',
-        '../third_party/skia/include/gpu/GrTextContext.h',
-        '../third_party/skia/include/gpu/GrTexture.h',
-        '../third_party/skia/include/gpu/GrTypes.h',
-        '../third_party/skia/include/gpu/GrUserConfig.h',
-        '../third_party/skia/include/gpu/SkGpuCanvas.h',
-        '../third_party/skia/include/gpu/SkGpuDevice.h',
-        '../third_party/skia/include/gpu/SkGr.h',
-        '../third_party/skia/include/gpu/SkGrPixelRef.h',
-        '../third_party/skia/include/gpu/SkGrTexturePixelRef.h',
-
         '../third_party/skia/include/pdf/SkPDFDevice.h',
         '../third_party/skia/include/pdf/SkPDFDocument.h',
 
@@ -473,6 +315,7 @@
           'sources/': [ ['exclude', '_linux\\.(cc|cpp)$'] ],
           'sources!': [
             '../third_party/skia/src/ports/SkFontHost_FreeType.cpp',
+            '../third_party/skia/src/ports/SkFontHost_FreeType_common.cpp',
           ],
         }],
         [ 'use_aura == 1 and use_canvas_skia == 1', {