diff options
| author | bsalomon@google.com <bsalomon@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-16 18:05:57 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-16 18:05:57 +0000 |
| commit | fac7cc14b6b6779efc9785f4a7614cdd8a31d5a7 (patch) | |
| tree | 5802eed293d3be7a723ff2603916ea9fa6fad37b /skia | |
| parent | f667c60c91f0a2d2d61a3f9b3aa47c8eebefe596 (diff) | |
| download | chromium_src-fac7cc14b6b6779efc9785f4a7614cdd8a31d5a7.zip chromium_src-fac7cc14b6b6779efc9785f4a7614cdd8a31d5a7.tar.gz chromium_src-fac7cc14b6b6779efc9785f4a7614cdd8a31d5a7.tar.bz2 | |
Roll Skia to 3412
Control your roll: https://chromiumcodereview.appspot.com/9252024
Review URL: https://chromiumcodereview.appspot.com/9704088
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127204 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/skia.gyp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp index bd037e9..117827f 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -355,12 +355,17 @@ '../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', '../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/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', @@ -397,7 +402,6 @@ '../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/GrTextContext.cpp', '../third_party/skia/src/gpu/GrTextStrike.cpp', '../third_party/skia/src/gpu/GrTextStrike.h', '../third_party/skia/src/gpu/GrTextStrike_impl.h', @@ -750,7 +754,6 @@ 'SK_BUILD_NO_IMAGE_ENCODE', 'GR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"', 'GR_STATIC_RECT_VB=1', - 'GR_USE_OFFSCREEN_AA=0', 'GR_AGGRESSIVE_SHADER_OPTS=1', 'SK_DISABLE_FAST_AA_STROKE_RECT', 'SK_DEFAULT_FONT_CACHE_LIMIT=(20*1024*1024)', |