summaryrefslogtreecommitdiffstats
path: root/skia
diff options
context:
space:
mode:
authorrobertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-02 14:43:56 +0000
committerrobertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-02 14:43:56 +0000
commitc1a131f0a85e2429278f35efd87d0da9789cfa9f (patch)
treef0161575ad5ea44fb10f67ab6887cc808e36643d /skia
parent87c039be483a18654c1603b341b8af13cc85a257 (diff)
downloadchromium_src-c1a131f0a85e2429278f35efd87d0da9789cfa9f.zip
chromium_src-c1a131f0a85e2429278f35efd87d0da9789cfa9f.tar.gz
chromium_src-c1a131f0a85e2429278f35efd87d0da9789cfa9f.tar.bz2
Roll Skia DEPS to r4416 & update skia.gyp
control: http://codereview.chromium.org/10699050/ Review URL: https://chromiumcodereview.appspot.com/10693063 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145143 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
-rw-r--r--skia/skia.gyp5
1 files changed, 1 insertions, 4 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp
index 0165d54..aedee81 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -364,8 +364,6 @@
'../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/GrBatchedTextContext.cpp',
- '../third_party/skia/src/gpu/GrBatchedTextContext.h',
'../third_party/skia/src/gpu/GrBinHashKey.h',
'../third_party/skia/src/gpu/GrBufferAllocPool.cpp',
'../third_party/skia/src/gpu/GrBufferAllocPool.h',
@@ -376,8 +374,6 @@
'../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/GrDefaultTextContext.cpp',
- '../third_party/skia/src/gpu/GrDefaultTextContext.h',
'../third_party/skia/src/gpu/GrDrawTarget.cpp',
'../third_party/skia/src/gpu/GrDrawTarget.h',
'../third_party/skia/src/gpu/GrGeometryBuffer.h',
@@ -420,6 +416,7 @@
'../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',