diff options
author | bsalomon@google.com <bsalomon@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-20 18:04:25 +0000 |
---|---|---|
committer | bsalomon@google.com <bsalomon@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-20 18:04:25 +0000 |
commit | 61243ddad88e802332e14031f0627f4e37b23ef6 (patch) | |
tree | 202faf982ce890f56a980295bd4736717597c2c5 /skia | |
parent | 3fae79d84a30dbe5a756f1a22debb3f269331bde (diff) | |
download | chromium_src-61243ddad88e802332e14031f0627f4e37b23ef6.zip chromium_src-61243ddad88e802332e14031f0627f4e37b23ef6.tar.gz chromium_src-61243ddad88e802332e14031f0627f4e37b23ef6.tar.bz2 |
Roll skia to r2506.
Review URL: http://codereview.chromium.org/8360002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106524 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
-rw-r--r-- | skia/skia.gyp | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp index 347f193..5bee59e 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -341,8 +341,11 @@ '../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/GrAllocator.h', + '../third_party/skia/src/gpu/GrAllocPool.h', '../third_party/skia/src/gpu/GrAllocPool.cpp', '../third_party/skia/src/gpu/GrAtlas.cpp', + '../third_party/skia/src/gpu/GrAtlas.h', '../third_party/skia/src/gpu/GrBufferAllocPool.cpp', '../third_party/skia/src/gpu/GrBufferAllocPool.h', '../third_party/skia/src/gpu/GrClip.cpp', @@ -352,6 +355,7 @@ '../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/GrGLCreateNativeInterface_none.cpp', '../third_party/skia/src/gpu/GrGLDefaultInterface_none.cpp', '../third_party/skia/src/gpu/GrGLIndexBuffer.cpp', '../third_party/skia/src/gpu/GrGLIndexBuffer.h', @@ -377,6 +381,7 @@ '../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/GrGpuVertex.h', '../third_party/skia/src/gpu/GrIndexBuffer.h', '../third_party/skia/src/gpu/GrInOrderDrawBuffer.cpp', '../third_party/skia/src/gpu/GrInOrderDrawBuffer.h', @@ -387,20 +392,30 @@ '../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/GrPlotMgr.h', '../third_party/skia/src/gpu/GrPrintf_skia.cpp', + '../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/GrStencilBuffer.cpp', '../third_party/skia/src/gpu/GrStencilBuffer.h', + '../third_party/skia/src/gpu/GrStringBuilder.h', + '../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/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.h', '../third_party/skia/src/gpu/GrTextStrike_impl.h', '../third_party/skia/src/gpu/GrVertexBuffer.h', '../third_party/skia/src/gpu/SkGpuCanvas.cpp', @@ -592,9 +607,6 @@ '../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', @@ -605,33 +617,19 @@ '../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', |