Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(102)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: skia/skia.gyp

Issue 8268006: Roll skia to r2478 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « DEPS ('k') | ui/gfx/gl/gl_bindings_skia_in_process.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: skia/skia.gyp
===================================================================
--- skia/skia.gyp (revision 105346)
+++ skia/skia.gyp (working copy)
@@ -8,115 +8,6 @@
'target_name': 'skia',
'type': '<(component)',
'sources': [
- '../third_party/skia/gpu/src/GrAAHairLinePathRenderer.cpp',
- '../third_party/skia/gpu/src/GrAAHairLinePathRenderer.h',
- '../third_party/skia/gpu/src/GrAddPathRenderers_aahairline.cpp',
- '../third_party/skia/gpu/src/GrAllocPool.cpp',
- '../third_party/skia/gpu/src/GrAtlas.cpp',
- '../third_party/skia/gpu/src/GrBufferAllocPool.cpp',
- '../third_party/skia/gpu/src/GrBufferAllocPool.h',
- '../third_party/skia/gpu/src/GrClip.cpp',
- '../third_party/skia/gpu/src/GrContext.cpp',
- '../third_party/skia/gpu/src/GrDefaultPathRenderer.cpp',
- '../third_party/skia/gpu/src/GrDefaultPathRenderer.h',
- '../third_party/skia/gpu/src/GrDrawTarget.cpp',
- '../third_party/skia/gpu/src/GrDrawTarget.h',
- '../third_party/skia/gpu/src/GrGeometryBuffer.h',
- '../third_party/skia/gpu/src/GrGLDefaultInterface_none.cpp',
- '../third_party/skia/gpu/src/GrGLIndexBuffer.cpp',
- '../third_party/skia/gpu/src/GrGLIndexBuffer.h',
- '../third_party/skia/gpu/src/GrGLInterface.cpp',
- '../third_party/skia/gpu/src/GrGLIRect.h',
- '../third_party/skia/gpu/src/GrGLProgram.cpp',
- '../third_party/skia/gpu/src/GrGLProgram.h',
- '../third_party/skia/gpu/src/GrGLRenderTarget.cpp',
- '../third_party/skia/gpu/src/GrGLRenderTarget.h',
- '../third_party/skia/gpu/src/GrGLStencilBuffer.cpp',
- '../third_party/skia/gpu/src/GrGLStencilBuffer.h',
- '../third_party/skia/gpu/src/GrGLTexture.cpp',
- '../third_party/skia/gpu/src/GrGLTexture.h',
- '../third_party/skia/gpu/src/GrGLUtil.cpp',
- '../third_party/skia/gpu/src/GrGLVertexBuffer.cpp',
- '../third_party/skia/gpu/src/GrGLVertexBuffer.h',
- '../third_party/skia/gpu/src/GrGpu.cpp',
- '../third_party/skia/gpu/src/GrGpu.h',
- '../third_party/skia/gpu/src/GrGpuFactory.cpp',
- '../third_party/skia/gpu/src/GrGpuGL.cpp',
- '../third_party/skia/gpu/src/GrGpuGL.h',
- '../third_party/skia/gpu/src/GrGpuGLFixed.cpp',
- '../third_party/skia/gpu/src/GrGpuGLFixed.h',
- '../third_party/skia/gpu/src/GrGpuGLShaders.cpp',
- '../third_party/skia/gpu/src/GrGpuGLShaders.h',
- '../third_party/skia/gpu/src/GrIndexBuffer.h',
- '../third_party/skia/gpu/src/GrInOrderDrawBuffer.cpp',
- '../third_party/skia/gpu/src/GrInOrderDrawBuffer.h',
- '../third_party/skia/gpu/src/GrMatrix.cpp',
- '../third_party/skia/gpu/src/GrMemory.cpp',
- '../third_party/skia/gpu/src/GrPathRenderer.cpp',
- '../third_party/skia/gpu/src/GrPathRenderer.h',
- '../third_party/skia/gpu/src/GrPathRendererChain.cpp',
- '../third_party/skia/gpu/src/GrPathRendererChain.h',
- '../third_party/skia/gpu/src/GrPathUtils.cpp',
- '../third_party/skia/gpu/src/GrRectanizer_fifo.cpp',
- '../third_party/skia/gpu/src/GrRenderTarget.cpp',
- '../third_party/skia/gpu/src/GrResource.cpp',
- '../third_party/skia/gpu/src/GrResourceCache.cpp',
- '../third_party/skia/gpu/src/GrResourceCache.h',
- '../third_party/skia/gpu/src/GrStencil.cpp',
- '../third_party/skia/gpu/src/GrStencilBuffer.cpp',
- '../third_party/skia/gpu/src/GrStencilBuffer.h',
- '../third_party/skia/gpu/src/GrTesselatedPathRenderer.cpp',
- '../third_party/skia/gpu/src/GrTesselatedPathRenderer.h',
- '../third_party/skia/gpu/src/GrTexture.cpp',
- '../third_party/skia/gpu/src/GrTextContext.cpp',
- '../third_party/skia/gpu/src/GrTextStrike.cpp',
- '../third_party/skia/gpu/src/GrTextStrike_impl.h',
- '../third_party/skia/gpu/src/GrVertexBuffer.h',
-
- '../third_party/skia/gpu/include/GrAllocPool.h',
- '../third_party/skia/gpu/include/GrAllocator.h',
- '../third_party/skia/gpu/include/GrAtlas.h',
- '../third_party/skia/gpu/include/GrClip.h',
- '../third_party/skia/gpu/include/GrClipIterator.h',
- '../third_party/skia/gpu/include/GrColor.h',
- '../third_party/skia/gpu/include/GrConfig.h',
- '../third_party/skia/gpu/include/GrContext.h',
- '../third_party/skia/gpu/include/GrFontScaler.h',
- '../third_party/skia/gpu/include/GrGLConfig.h',
- '../third_party/skia/gpu/include/GrGLConfig_chrome.h',
- '../third_party/skia/gpu/include/GrGLInterface.h',
- '../third_party/skia/gpu/include/GrGlyph.h',
- '../third_party/skia/gpu/include/GrGpuVertex.h',
- '../third_party/skia/gpu/include/GrIPoint.h',
- '../third_party/skia/gpu/include/GrInstanceCounter.h',
- '../third_party/skia/gpu/include/GrKey.h',
- '../third_party/skia/gpu/include/GrMatrix.h',
- '../third_party/skia/gpu/include/GrMesh.h',
- '../third_party/skia/gpu/include/GrNoncopyable.h',
- '../third_party/skia/gpu/include/GrPaint.h',
- '../third_party/skia/gpu/include/GrPath.h',
- '../third_party/skia/gpu/include/GrPathSink.h',
- '../third_party/skia/gpu/include/GrPoint.h',
- '../third_party/skia/gpu/include/GrRandom.h',
- '../third_party/skia/gpu/include/GrRect.h',
- '../third_party/skia/gpu/include/GrRectanizer.h',
- '../third_party/skia/gpu/include/GrRefCnt.h',
- '../third_party/skia/gpu/include/GrRenderTarget.h',
- '../third_party/skia/gpu/include/GrSamplerState.h',
- '../third_party/skia/gpu/include/GrScalar.h',
- '../third_party/skia/gpu/include/GrStencil.h',
- '../third_party/skia/gpu/include/GrStopwatch.h',
- '../third_party/skia/gpu/include/GrStringBuilder.h',
- '../third_party/skia/gpu/include/GrTBSearch.h',
- '../third_party/skia/gpu/include/GrTDArray.h',
- '../third_party/skia/gpu/include/GrTHashCache.h',
- '../third_party/skia/gpu/include/GrTLList.h',
- '../third_party/skia/gpu/include/GrTextContext.h',
- '../third_party/skia/gpu/include/GrTextStrike.h',
- '../third_party/skia/gpu/include/GrTexture.h',
- '../third_party/skia/gpu/include/GrTypes.h',
- '../third_party/skia/gpu/include/GrUserConfig.h',
-
#'../third_party/skia/src/animator/SkAnimate.h',
#'../third_party/skia/src/animator/SkAnimateActive.cpp',
#'../third_party/skia/src/animator/SkAnimateActive.h',
@@ -446,9 +337,73 @@
'../third_party/skia/src/effects/SkRadialGradient_Table.h',
'../third_party/skia/src/effects/SkTransparentShader.cpp',
+ '../third_party/skia/src/gpu/GrAAHairLinePathRenderer.cpp',
+ '../third_party/skia/src/gpu/GrAAHairLinePathRenderer.h',
+ '../third_party/skia/src/gpu/GrAddPathRenderers_aahairline.cpp',
+ '../third_party/skia/src/gpu/GrAllocPool.cpp',
+ '../third_party/skia/src/gpu/GrAtlas.cpp',
+ '../third_party/skia/src/gpu/GrBufferAllocPool.cpp',
+ '../third_party/skia/src/gpu/GrBufferAllocPool.h',
+ '../third_party/skia/src/gpu/GrClip.cpp',
+ '../third_party/skia/src/gpu/GrContext.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/GrGLDefaultInterface_none.cpp',
+ '../third_party/skia/src/gpu/GrGLIndexBuffer.cpp',
+ '../third_party/skia/src/gpu/GrGLIndexBuffer.h',
+ '../third_party/skia/src/gpu/GrGLInterface.cpp',
+ '../third_party/skia/src/gpu/GrGLIRect.h',
+ '../third_party/skia/src/gpu/GrGLProgram.cpp',
+ '../third_party/skia/src/gpu/GrGLProgram.h',
+ '../third_party/skia/src/gpu/GrGLRenderTarget.cpp',
+ '../third_party/skia/src/gpu/GrGLRenderTarget.h',
+ '../third_party/skia/src/gpu/GrGLStencilBuffer.cpp',
+ '../third_party/skia/src/gpu/GrGLStencilBuffer.h',
+ '../third_party/skia/src/gpu/GrGLTexture.cpp',
+ '../third_party/skia/src/gpu/GrGLTexture.h',
+ '../third_party/skia/src/gpu/GrGLUtil.cpp',
+ '../third_party/skia/src/gpu/GrGLVertexBuffer.cpp',
+ '../third_party/skia/src/gpu/GrGLVertexBuffer.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/GrGpuGL.cpp',
+ '../third_party/skia/src/gpu/GrGpuGL.h',
+ '../third_party/skia/src/gpu/GrGpuGLFixed.cpp',
+ '../third_party/skia/src/gpu/GrGpuGLFixed.h',
+ '../third_party/skia/src/gpu/GrGpuGLShaders.cpp',
+ '../third_party/skia/src/gpu/GrGpuGLShaders.h',
+ '../third_party/skia/src/gpu/GrIndexBuffer.h',
+ '../third_party/skia/src/gpu/GrInOrderDrawBuffer.cpp',
+ '../third_party/skia/src/gpu/GrInOrderDrawBuffer.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/GrPathUtils.cpp',
+ '../third_party/skia/src/gpu/GrPrintf_skia.cpp',
+ '../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/GrStencilBuffer.cpp',
+ '../third_party/skia/src/gpu/GrStencilBuffer.h',
+ '../third_party/skia/src/gpu/GrTesselatedPathRenderer.cpp',
+ '../third_party/skia/src/gpu/GrTesselatedPathRenderer.h',
+ '../third_party/skia/src/gpu/GrTexture.cpp',
+ '../third_party/skia/src/gpu/GrTextContext.cpp',
+ '../third_party/skia/src/gpu/GrTextStrike.cpp',
+ '../third_party/skia/src/gpu/GrTextStrike_impl.h',
+ '../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/GrPrintf_skia.cpp',
'../third_party/skia/src/gpu/SkGrFontScaler.cpp',
'../third_party/skia/src/gpu/SkGr.cpp',
'../third_party/skia/src/gpu/SkGrTexturePixelRef.cpp',
@@ -636,6 +591,49 @@
'../third_party/skia/include/effects/SkPorterDuff.h',
'../third_party/skia/include/effects/SkTransparentShader.h',
+ '../third_party/skia/include/gpu/GrAllocPool.h',
+ '../third_party/skia/include/gpu/GrAllocator.h',
+ '../third_party/skia/include/gpu/GrAtlas.h',
+ '../third_party/skia/include/gpu/GrClip.h',
+ '../third_party/skia/include/gpu/GrClipIterator.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/GrFontScaler.h',
+ '../third_party/skia/include/gpu/GrGLConfig.h',
+ '../third_party/skia/include/gpu/GrGLConfig_chrome.h',
+ '../third_party/skia/include/gpu/GrGLInterface.h',
+ '../third_party/skia/include/gpu/GrGlyph.h',
+ '../third_party/skia/include/gpu/GrGpuVertex.h',
+ '../third_party/skia/include/gpu/GrIPoint.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/GrMesh.h',
+ '../third_party/skia/include/gpu/GrNoncopyable.h',
+ '../third_party/skia/include/gpu/GrPaint.h',
+ '../third_party/skia/include/gpu/GrPath.h',
+ '../third_party/skia/include/gpu/GrPathSink.h',
+ '../third_party/skia/include/gpu/GrPoint.h',
+ '../third_party/skia/include/gpu/GrRandom.h',
+ '../third_party/skia/include/gpu/GrRect.h',
+ '../third_party/skia/include/gpu/GrRectanizer.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/GrStencil.h',
+ '../third_party/skia/include/gpu/GrStopwatch.h',
+ '../third_party/skia/include/gpu/GrStringBuilder.h',
+ '../third_party/skia/include/gpu/GrTBSearch.h',
+ '../third_party/skia/include/gpu/GrTDArray.h',
+ '../third_party/skia/include/gpu/GrTHashCache.h',
+ '../third_party/skia/include/gpu/GrTLList.h',
+ '../third_party/skia/include/gpu/GrTextContext.h',
+ '../third_party/skia/include/gpu/GrTextStrike.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',
@@ -715,8 +713,6 @@
'../third_party/skia/include/pdf',
'../third_party/skia/include/ports',
'../third_party/skia/include/utils',
- '../third_party/skia/gpu/include',
- '../third_party/skia/gpu/src',
'../third_party/skia/src/core',
],
'msvs_disabled_warnings': [4244, 4267,4345, 4390, 4554, 4800],
@@ -884,7 +880,6 @@
'../third_party/skia/include/pdf',
'../third_party/skia/include/gpu',
'../third_party/skia/include/ports',
- '../third_party/skia/gpu/include',
'ext',
],
'mac_framework_dirs': [
« no previous file with comments | « DEPS ('k') | ui/gfx/gl/gl_bindings_skia_in_process.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698