summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt3
2 files changed, 4 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index be959ea..45901a1 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "52032",
+ "webkit_revision": "52096",
"ffmpeg_revision": "34297",
"skia_revision": "451",
"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 4962744..683fde9 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3350,3 +3350,6 @@ LayoutTests/fast/events/basic-touch-events.html = TEXT
BUG30185 : LayoutTests/websocket/tests/handshake-error.html = TEXT PASS
BUG30185 : LayoutTests/websocket/tests/handshake-fail-by-cross-origin.html = TEXT PASS
BUG30185 : LayoutTests/websocket/tests/handshake-fail-by-sub-protocol-mismatch.html = TEXT PASS
+
+// evan's fix rolled out in http://trac.webkit.org/changeset/52071 due to compat issues.
+BUG30343 LINUX : LayoutTests/fast/css/large-number-round-trip.html = TEXT \ No newline at end of file