diff options
| author | dmazzoni@google.com <dmazzoni@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-13 15:59:21 +0000 |
|---|---|---|
| committer | dmazzoni@google.com <dmazzoni@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-13 15:59:21 +0000 |
| commit | 7f27da35c32706156feca681ea206a40c53fa653 (patch) | |
| tree | c430e0b9de6cf464661fadd20da6c2809578f2d4 /skia/skia.gyp | |
| parent | 916bc60d7d2943b01ca3f87918674e3573415d57 (diff) | |
| download | chromium_src-7f27da35c32706156feca681ea206a40c53fa653.zip chromium_src-7f27da35c32706156feca681ea206a40c53fa653.tar.gz chromium_src-7f27da35c32706156feca681ea206a40c53fa653.tar.bz2 | |
Rolling Skia DEPS from r3160 to r3169.
Review URL: https://chromiumcodereview.appspot.com/9380029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121698 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/skia.gyp')
| -rw-r--r-- | skia/skia.gyp | 61 |
1 files changed, 31 insertions, 30 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp index 90c2f87..c670bcd 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -342,14 +342,14 @@ '../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/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/GrAddPathRenderers_default.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/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/GrBufferAllocPool.cpp', @@ -361,35 +361,12 @@ '../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', - '../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/GrGLSL.cpp', - '../third_party/skia/src/gpu/GrGLSL.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/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', + '../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', @@ -417,17 +394,41 @@ '../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/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/SkGrFontScaler.cpp', '../third_party/skia/src/gpu/SkGr.cpp', + '../third_party/skia/src/gpu/SkGrFontScaler.cpp', '../third_party/skia/src/gpu/SkGrTexturePixelRef.cpp', + '../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/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/GrGLProgram.cpp', + '../third_party/skia/src/gpu/gl/GrGLProgram.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/GrGLStencilBuffer.cpp', + '../third_party/skia/src/gpu/gl/GrGLTexture.cpp', + '../third_party/skia/src/gpu/gl/GrGLTexture.h', + '../third_party/skia/src/gpu/gl/GrGLUtil.cpp', + '../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/GrGpuGLShaders.cpp', + '../third_party/skia/src/gpu/gl/GrGpuGLShaders.h', '../third_party/skia/src/images/bmpdecoderhelper.cpp', '../third_party/skia/src/images/bmpdecoderhelper.h', |