diff options
| author | epoger@chromium.org <epoger@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-11 16:14:39 +0000 |
|---|---|---|
| committer | epoger@chromium.org <epoger@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-11 16:14:39 +0000 |
| commit | 9d0b0ef4c0c3814be044f17c49499676ffdce7dc (patch) | |
| tree | 5ba5d75e5b88f9f08c8a2f7a86eaa33127ecc92b | |
| parent | 08aa027647128343fbb1b2773dbf4dc94a7cfacf (diff) | |
| download | chromium_src-9d0b0ef4c0c3814be044f17c49499676ffdce7dc.zip chromium_src-9d0b0ef4c0c3814be044f17c49499676ffdce7dc.tar.gz chromium_src-9d0b0ef4c0c3814be044f17c49499676ffdce7dc.tar.bz2 | |
Rolling Skia DEPS from r2633 to r2666
Control group (whitespace-only change) is http://codereview.chromium.org/8538012
Review URL: http://codereview.chromium.org/8538010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109639 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | skia/skia.gyp | 3 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 3 |
3 files changed, 7 insertions, 1 deletions
@@ -28,7 +28,7 @@ vars = { "libvpx_revision": "109236", "ffmpeg_revision": "109452", "sfntly_revision": "98", - "skia_revision": "2633", + "skia_revision": "2666", "v8_revision": "9969", "webrtc_revision": "921", "jsoncpp_revision": "246", diff --git a/skia/skia.gyp b/skia/skia.gyp index 409118a..578b87b 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -212,6 +212,7 @@ '../third_party/skia/src/core/SkComposeShader.cpp', '../third_party/skia/src/core/SkConcaveToTriangles.cpp', '../third_party/skia/src/core/SkConcaveToTriangles.h', + '../third_party/skia/src/core/SkConfig8888.h', '../third_party/skia/src/core/SkCordic.cpp', '../third_party/skia/src/core/SkCordic.h', '../third_party/skia/src/core/SkCoreBlitters.h', @@ -316,6 +317,7 @@ '../third_party/skia/src/effects/SkBitmapCache.cpp', '../third_party/skia/src/effects/SkBitmapCache.h', '../third_party/skia/src/effects/SkBlurDrawLooper.cpp', + '../third_party/skia/src/effects/SkBlurImageFilter.cpp', '../third_party/skia/src/effects/SkBlurMask.cpp', '../third_party/skia/src/effects/SkBlurMask.h', '../third_party/skia/src/effects/SkBlurMaskFilter.cpp', @@ -593,6 +595,7 @@ '../third_party/skia/include/effects/Sk2DPathEffect.h', '../third_party/skia/include/effects/SkAvoidXfermode.h', '../third_party/skia/include/effects/SkBlurDrawLooper.h', + '../third_party/skia/include/effects/SkBlurImageFilter.h', '../third_party/skia/include/effects/SkBlurMaskFilter.h', '../third_party/skia/include/effects/SkColorMatrix.h', '../third_party/skia/include/effects/SkColorMatrixFilter.h', diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 3f3f861..fb7da4e 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -7,5 +7,8 @@ // PLEASE DO NOT LEAVE ENTRIES IN THIS FILE FOR MORE THAN 24 HRS. +BUG_SENORBLANCO GPU : fast/canvas/canvas-transforms-fillRect-shadow.html = TEXT + // Fixed ES5 bugs during the V8 roll, upstream in progress. BUGMSTARZINGER : fast/js/mozilla/strict/15.4.5.1.html = TEXT + |