From 6ce29341c196b3a19ca36a524314645391eac273 Mon Sep 17 00:00:00 2001 From: "sadrul@chromium.org" Date: Fri, 20 Jan 2012 14:59:05 +0000 Subject: Revert 118440 since it breaks views_unittests:HitTestMasks on windows """ Skia DEPS roll 3039->3071 with gyp and test_expectations changes Review URL: https://chromiumcodereview.appspot.com/9192026 TBR=epoger@chromium.org Review URL: https://chromiumcodereview.appspot.com/9233009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118443 0039d316-1c4b-4281-b951-d872f2087c98 --- skia/skia.gyp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'skia') diff --git a/skia/skia.gyp b/skia/skia.gyp index d6c33c7..0d92e83 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -344,9 +344,7 @@ '../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/GrAddPathRenderers_default.cpp', + '../third_party/skia/src/gpu/GrAddPathRenderers_aahairline.cpp', '../third_party/skia/src/gpu/GrAllocator.h', '../third_party/skia/src/gpu/GrAllocPool.h', '../third_party/skia/src/gpu/GrAllocPool.cpp', @@ -735,6 +733,7 @@ '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 -- cgit v1.1