diff options
| author | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-05 19:31:57 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-05 19:31:57 +0000 |
| commit | de4a74bdc06a268ef285ec5bca43d0da318b1969 (patch) | |
| tree | 54d0d4791cbdf229ef3bff4f1477fcf5349acce5 /skia | |
| parent | b5fb8afb885035cf884e2202e9a2490c26da590c (diff) | |
| download | chromium_src-de4a74bdc06a268ef285ec5bca43d0da318b1969.zip chromium_src-de4a74bdc06a268ef285ec5bca43d0da318b1969.tar.gz chromium_src-de4a74bdc06a268ef285ec5bca43d0da318b1969.tar.bz2 | |
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
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/skia.gyp | 4 | ||||
| -rw-r--r-- | skia/skia_test_expectations.txt | 8 |
2 files changed, 11 insertions, 1 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp index 5b618f1..3548c99 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 33d1e6a..e646884 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) |