summaryrefslogtreecommitdiffstats
path: root/skia
diff options
context:
space:
mode:
authorreed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-12 13:15:18 +0000
committerreed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-12 13:15:18 +0000
commit54821c483f7d307477b1da2cbf8b7b9f84bae91c (patch)
treeaec9c6a8727c6d0a35b2fa9d065a1165b0241a24 /skia
parent2bc34f038d1eb149e75c932061a475dbdb369564 (diff)
downloadchromium_src-54821c483f7d307477b1da2cbf8b7b9f84bae91c.zip
chromium_src-54821c483f7d307477b1da2cbf8b7b9f84bae91c.tar.gz
chromium_src-54821c483f7d307477b1da2cbf8b7b9f84bae91c.tar.bz2
roll skia to 4229
Review URL: https://chromiumcodereview.appspot.com/10538067 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141653 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
-rw-r--r--skia/skia.gyp6
1 files changed, 6 insertions, 0 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp
index 29ffaf4..39fcfe8 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -393,6 +393,7 @@
'../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/GrPath.h',
'../third_party/skia/src/gpu/GrPathUtils.cpp',
'../third_party/skia/src/gpu/GrPlotMgr.h',
'../third_party/skia/src/gpu/GrRandom.h',
@@ -439,6 +440,8 @@
'../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',
@@ -556,6 +559,7 @@
'../third_party/skia/src/utils/SkBitSet.h',
'../third_party/skia/src/utils/SkDeferredCanvas.cpp',
'../third_party/skia/src/utils/SkMatrix44.cpp',
+ '../third_party/skia/src/utils/SkNullCanvas.cpp',
'../third_party/skia/include/utils/SkNWayCanvas.h',
'../third_party/skia/src/utils/SkNWayCanvas.cpp',
@@ -715,6 +719,8 @@
'../third_party/skia/include/images/SkMovie.h',
'../third_party/skia/include/images/SkPageFlipper.h',
+ '../third_party/skia/include/utils/SkNullCanvas.h',
+
'ext/bitmap_platform_device.h',
'ext/bitmap_platform_device_android.cc',
'ext/bitmap_platform_device_android.h',