diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-20 14:59:05 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-20 14:59:05 +0000 |
| commit | 6ce29341c196b3a19ca36a524314645391eac273 (patch) | |
| tree | a51eec24806a385342b76e70e52415e44627640b | |
| parent | b1ae6118016b657f091a0e20da0a7604c70345e1 (diff) | |
| download | chromium_src-6ce29341c196b3a19ca36a524314645391eac273.zip chromium_src-6ce29341c196b3a19ca36a524314645391eac273.tar.gz chromium_src-6ce29341c196b3a19ca36a524314645391eac273.tar.bz2 | |
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
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | skia/skia.gyp | 5 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 5 |
3 files changed, 4 insertions, 8 deletions
@@ -36,7 +36,7 @@ vars = { "lss_revision": "9", "ffmpeg_revision": "117977", "sfntly_revision": "118", - "skia_revision": "3071", + "skia_revision": "3039", # Three lines of non-changing comments so that # the commit queue can handle CLs rolling Skia # and V8 without interference from each other. 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 diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 9271a9d..b7ddeb6 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -13,7 +13,4 @@ BUGCR110493 CPU : svg/transforms/animated-path-inside-transformed-html.xhtml = I BUGCR110493 CPU : fast/borders/border-image-rotate-transform.html = IMAGE BUGCR110493 CPU : svg/custom/focus-ring.svg = IMAGE -// EPOGER: To be rebaselined after Skia rev. 3071 propagates to webkit. -BUGWK71820 : svg/custom/path-moveto-only-rendering.svg = PASS IMAGE+TEXT -BUGWK71820 : svg/custom/subpaths-moveto-only-rendering.svg = PASS TEXT -BUGWK64675 : svg/custom/zero-path-square-cap-rendering.svg = PASS IMAGE+TEXT + |