diff options
| author | junov@chromium.org <junov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-28 17:07:27 +0000 |
|---|---|---|
| committer | junov@chromium.org <junov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-28 17:07:27 +0000 |
| commit | 2a31cac799c49910cceb0891d9d65615b970f034 (patch) | |
| tree | be0a385d199a50f4e041c0facf4251c9f6657658 | |
| parent | 96ad4a20f0e424a295df8fb3fa1ff364d96ea192 (diff) | |
| download | chromium_src-2a31cac799c49910cceb0891d9d65615b970f034.zip chromium_src-2a31cac799c49910cceb0891d9d65615b970f034.tar.gz chromium_src-2a31cac799c49910cceb0891d9d65615b970f034.tar.bz2 | |
Rolling Skia DEPS from r1959 to r1980
Review URL: http://codereview.chromium.org/7524024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94485 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | skia/skia.gyp | 4 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 7 |
3 files changed, 10 insertions, 3 deletions
@@ -22,7 +22,7 @@ vars = { "libvpx_revision": "90416", "ffmpeg_revision": "94207", "sfntly_revision": "25", - "skia_revision": "1959", + "skia_revision": "1980", "v8_revision": "8751", "webrtc_revision": "232", } diff --git a/skia/skia.gyp b/skia/skia.gyp index 2644d47..92f4325 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -39,10 +39,10 @@ '../third_party/skia/gpu/src/GrPathUtils.cpp', '../third_party/skia/gpu/src/GrRectanizer_fifo.cpp', '../third_party/skia/gpu/src/GrResource.cpp', + '../third_party/skia/gpu/src/GrResourceCache.cpp', '../third_party/skia/gpu/src/GrStencil.cpp', '../third_party/skia/gpu/src/GrTesselatedPathRenderer.cpp', '../third_party/skia/gpu/src/GrTexture.cpp', - '../third_party/skia/gpu/src/GrTextureCache.cpp', '../third_party/skia/gpu/src/GrTextContext.cpp', '../third_party/skia/gpu/src/GrTextStrike.cpp', '../third_party/skia/gpu/src/GrTextStrike_impl.h', @@ -85,6 +85,7 @@ '../third_party/skia/gpu/include/GrRect.h', '../third_party/skia/gpu/include/GrRectanizer.h', '../third_party/skia/gpu/include/GrRefCnt.h', + '../third_party/skia/gpu/include/GrResourceCache.h', '../third_party/skia/gpu/include/GrSamplerState.h', '../third_party/skia/gpu/include/GrScalar.h', '../third_party/skia/gpu/include/GrStencil.h', @@ -99,7 +100,6 @@ '../third_party/skia/gpu/include/GrTextContext.h', '../third_party/skia/gpu/include/GrTextStrike.h', '../third_party/skia/gpu/include/GrTexture.h', - '../third_party/skia/gpu/include/GrTextureCache.h', '../third_party/skia/gpu/include/GrTypes.h', '../third_party/skia/gpu/include/GrUserConfig.h', '../third_party/skia/gpu/include/GrVertexBuffer.h', diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 707c890..3815811 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -6,3 +6,10 @@ // until the changes can be landed upstream. // PLEASE DO NOT LEAVE ENTRIES IN THIS FILE FOR MORE THAN 24 HRS. +BUGCR90673 WIN : fast/blockflow/english-lr-text.html = IMAGE +BUGCR90673 WIN : fast/blockflow/japanese-ruby-vertical-lr.html = IMAGE +BUGCR90673 WIN : fast/blockflow/japanese-ruby-vertical-rl.html = IMAGE +BUGCR90673 WIN : fast/text/stroking-decorations.html = IMAGE +BUGCR90673 WIN : fast/text/stroking.html = IMAGE +BUGCR90673 WIN : svg/batik/text/verticalText.svg = IMAGE + |