From de4a74bdc06a268ef285ec5bca43d0da318b1969 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Tue, 5 Jun 2012 19:31:57 +0000 Subject: [PATCH] roll skia to 4156 Review URL: https://chromiumcodereview.appspot.com/10541005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140580 0039d316-1c4b-4281-b951-d872f2087c98 --- DEPS | 2 +- skia/skia.gyp | 4 ++++ skia/skia_test_expectations.txt | 8 +++++++- webkit/tools/layout_tests/test_expectations.txt | 4 ++++ 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index ce3bbd541f5b..2864840e3694 100644 --- a/DEPS +++ b/DEPS @@ -55,7 +55,7 @@ vars = { "ffmpeg_hash": "69cc855282d18ff77e4e0a6c0de0abd539572bc8", "sfntly_revision": "128", - "skia_revision": "4138", + "skia_revision": "4156", # 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 5b618f1fac69..3548c99a5653 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -316,6 +316,9 @@ '../third_party/skia/src/core/SkWriter32.cpp', '../third_party/skia/src/core/SkXfermode.cpp', + '../third_party/skia/src/pipe/SkGPipeRead.cpp', + '../third_party/skia/src/pipe/SkGPipeWrite.cpp', + '../third_party/skia/src/effects/Sk1DPathEffect.cpp', '../third_party/skia/src/effects/Sk2DPathEffect.cpp', '../third_party/skia/src/effects/SkAvoidXfermode.cpp', @@ -762,6 +765,7 @@ 'config', '../third_party/skia/include/config', '../third_party/skia/include/core', + '../third_party/skia/include/pipe', '../third_party/skia/include/effects', '../third_party/skia/include/gpu', '../third_party/skia/include/gpu/gl', diff --git a/skia/skia_test_expectations.txt b/skia/skia_test_expectations.txt index 33d1e6a0e4aa..e6468845f392 100644 --- a/skia/skia_test_expectations.txt +++ b/skia/skia_test_expectations.txt @@ -50,6 +50,12 @@ BUGCR130283 : svg/W3C-SVG-1.1/painting-stroke-04-t.svg = TEXT -// END OVERRIDES HERE (this line ensures that the file is newline-terminated) +BUGCR131188 : css3/filters/effect-combined-hw.html = IMAGE +BUGCR131188 : css3/filters/effect-grayscale-hw.html = IMAGE +BUGCR131188 : css3/filters/effect-hue-rotate-hw.html = IMAGE +BUGCR131188 : css3/filters/effect-saturate-hw.html = IMAGE +BUGCR131188 : css3/filters/effect-sepia-hw.html = IMAGE +BUGCR131188 : platform/chromium/virtual/gpu/fast/canvas/fillrect_gradient.html = IMAGE +// END OVERRIDES HERE (this line ensures that the file is newline-terminated) diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 510f0cf0bfea..edc3f877274e 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -28,3 +28,7 @@ // Right?) // // EVERYTHING BELOW THIS LINE WILL BE DELETED AT EVERY WEBKIT DEPS ROLL + +BUGCR131187 : platform/chromium/virtual/gpu/canvas/philip/tests/2d.gradient.radial.cone.cylinder.html = TEXT +BUGCR131187 : platform/chromium/virtual/gpu/fast/canvas/canvas-currentColor.html = TEXT + -- 2.11.4.GIT