diff options
| author | twiz@chromium.org <twiz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-20 14:59:00 +0000 |
|---|---|---|
| committer | twiz@chromium.org <twiz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-20 14:59:00 +0000 |
| commit | 3be74a00516016a7df0b5f3e4996c349e16e957d (patch) | |
| tree | 2835372721b7e0cefa33058f23856aba883b7e64 | |
| parent | d55917908e06bf543c941bf0f6e0f2648eeeece8 (diff) | |
| download | chromium_src-3be74a00516016a7df0b5f3e4996c349e16e957d.zip chromium_src-3be74a00516016a7df0b5f3e4996c349e16e957d.tar.gz chromium_src-3be74a00516016a7df0b5f3e4996c349e16e957d.tar.bz2 | |
Roll skia to 4683.
Reference change-set: http://codereview.chromium.org/10804035/
BUG=138159
R=senorblanco@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10815016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147655 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | skia/skia.gyp | 2 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 4 |
3 files changed, 7 insertions, 1 deletions
@@ -57,7 +57,7 @@ vars = { "ffmpeg_hash": "23f177366e3bce3a628a7d3feedceed4e18dcc04", "sfntly_revision": "134", - "skia_revision": "4647", + "skia_revision": "4683", # 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 5b85187..b12fb7d 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -430,6 +430,8 @@ '../third_party/skia/src/gpu/SkGrPixelRef.cpp', '../third_party/skia/src/gpu/SkGrTexturePixelRef.cpp', '../third_party/skia/src/gpu/effects/Gr1DKernelEffect.h', + '../third_party/skia/src/gpu/effects/GrColorTableEffect.cpp', + '../third_party/skia/src/gpu/effects/GrColorTableEffect.h', '../third_party/skia/src/gpu/effects/GrConvolutionEffect.cpp', '../third_party/skia/src/gpu/effects/GrConvolutionEffect.h', '../third_party/skia/src/gpu/effects/GrMorphologyEffect.cpp', diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index ed2a7de..d39ec03 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -32,3 +32,7 @@ // // EVERYTHING BELOW THIS LINE WILL BE DELETED AT EVERY WEBKIT DEPS ROLL +// Requires rebaselining after skia roll +BUGCR138159 : platform/chromium/virtual/gpu/fast/canvas/canvas-text-alignment.html = IMAGE +BUGCR138159 : platform/chromium/virtual/gpu/fast/canvas/gradient-add-second-start-end-stop.html = IMAGE + |