diff options
| author | epoger@chromium.org <epoger@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-20 13:56:19 +0000 |
|---|---|---|
| committer | epoger@chromium.org <epoger@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-20 13:56:19 +0000 |
| commit | 38ba6f239813f76f5c7349f70b2dbe0af96434e8 (patch) | |
| tree | cda45a94aff4518f26cfeae07cce4dfd82aebae6 /skia | |
| parent | 58adcff33b497d36ac7916b4c3e5fc12b3bc8755 (diff) | |
| download | chromium_src-38ba6f239813f76f5c7349f70b2dbe0af96434e8.zip chromium_src-38ba6f239813f76f5c7349f70b2dbe0af96434e8.tar.gz chromium_src-38ba6f239813f76f5c7349f70b2dbe0af96434e8.tar.bz2 | |
Skia DEPS roll 3039->3071 with gyp and test_expectations changes
Review URL: https://chromiumcodereview.appspot.com/9192026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118440 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/skia.gyp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp index 0d92e83..d6c33c7 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -344,7 +344,9 @@ '../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/GrAAConvexPathRenderer.cpp', + '../third_party/skia/src/gpu/GrAAConvexPathRenderer.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', @@ -733,7 +735,6 @@ 'GR_STATIC_RECT_VB=1', 'GR_AGGRESSIVE_SHADER_OPTS=1', 'SK_DISABLE_FAST_AA_STROKE_RECT', - 'SK_OLD_EMPTY_PATH_BEHAVIOR=1', 'SK_DEFAULT_FONT_CACHE_LIMIT=(20*1024*1024)', # skia uses static initializers to initialize the serialization logic |