summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-02 10:04:21 +0000
committerpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-02 10:04:21 +0000
commit6bcbadfe623f6d273a8cc7fc78ce25c1e91dd10b (patch)
tree019bf01027ea31a6fa2d2c6552109b793e21e736
parentbbffa669691c4d2f9f1ab8f95226171be7b2dd04 (diff)
downloadchromium_src-6bcbadfe623f6d273a8cc7fc78ce25c1e91dd10b.zip
chromium_src-6bcbadfe623f6d273a8cc7fc78ce25c1e91dd10b.tar.gz
chromium_src-6bcbadfe623f6d273a8cc7fc78ce25c1e91dd10b.tar.bz2
WebKit roll 54127 -> 54213.
TBR=hamaji,senorblanco Review URL: http://codereview.chromium.org/564009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37817 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt11
2 files changed, 12 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index a40f296..26d4e46 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "54127",
+ "webkit_revision": "54213",
"ffmpeg_revision": "34297",
"skia_revision": "475",
"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 f72981f..ceb6a4a 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2925,3 +2925,14 @@ BUG33538 : fast/dom/Window/anonymous-slot-with-changes.html = TEXT
BUG33997 MAC : svg/custom/dominant-baseline-hanging.svg = IMAGE
BUG33997 MAC : svg/custom/gradient-stop-corner-cases.svg = IMAGE
BUG34001 MAC : fast/dom/Range/getClientRects.html = TEXT
+
+// WebKit roll 54127 -> 54213
+BUG34200 : fast/js/math.html = TEXT
+BUG34200 : fast/loader/crash-copying-backforwardlist.html = TEXT
+BUG34200 : printing/page-break-always.html = TEXT
+BUG34200 : printing/pageNumerForElementById.html = TEXT
+BUG8635 WIN LINUX : svg/batik/filters/feTile.svg = IMAGE
+BUG8635 WIN LINUX : svg/custom/stroked-pattern.svg = IMAGE
+BUG8635 WIN LINUX : svg/filters/feTile.svg = IMAGE
+BUG8635 WIN LINUX : svg/filters/subRegion-in-userSpace.svg = IMAGE
+BUG34202 : security/block-test.html = TEXT