summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordimich@google.com <dimich@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-20 02:37:02 +0000
committerdimich@google.com <dimich@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-20 02:37:02 +0000
commit605191666111c662795e4a0089e902b7017787f4 (patch)
tree1b48e9eb0c2a1c3abf64ccc73636f7653d940cdb
parent014783448b8fefe9744b8554f69285fbaaa64a70 (diff)
downloadchromium_src-605191666111c662795e4a0089e902b7017787f4.zip
chromium_src-605191666111c662795e4a0089e902b7017787f4.tar.gz
chromium_src-605191666111c662795e4a0089e902b7017787f4.tar.bz2
WebKit roll up to 51223.
BUG=28317 TEST=none Review URL: http://codereview.chromium.org/402108 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32591 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt4
2 files changed, 5 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index e9456a3..bf31560 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "51211",
+ "webkit_revision": "51223",
"ffmpeg_revision": "30374",
"chromium_git": "http://src.chromium.org/git",
}
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index e9c6dea..3e28807 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3052,3 +3052,7 @@ BUG28266 : LayoutTests/fast/forms/input-step.html = FAIL
// Video Captions are added upsteram (r51191), need to implement.
BUG28301 : LayoutTests/media/media-captions.html = TIMEOUT
+
+// New tests, seems proper drawing method is not implemented in Skia. Upstream r51212.
+BUG28317 : LayoutTests/fast/css/color-correction-on-background-image.html = FAIL
+BUG28317 : LayoutTests/fast/css/color-correction-untagged-images.html = FAIL