summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt5
2 files changed, 5 insertions, 2 deletions
diff --git a/DEPS b/DEPS
index 9da7a2f..65e49ca 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "49245",
+ "webkit_revision": "49254",
"ffmpeg_revision": "27457",
}
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 650334c..2ae5e2a 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3083,7 +3083,6 @@ BUG24102 LINUX MAC : LayoutTests/fast/forms/input-maxlength.html = TIMEOUT
// Webkit update: 49221:49245
BUG_HAMAJI : LayoutTests/fast/css/counters/t1204-increment-00-c-o.html = FAIL
BUG_HAMAJI : LayoutTests/fast/css/counters/t1204-increment-01-c-o.html = FAIL
-BUG_JOHNNYG WIN : LayoutTests/fast/forms/select-size.html = PASS CRASH
BUG_JOHNNYG WIN : LayoutTests/fast/css/last-child-pseudo-class.html = FAIL
// Failing after r28267
@@ -3091,3 +3090,7 @@ BUG_24116 : LayoutTests/http/tests/loading/gmail-assert-on-load.html = FAIL
// Failing at WebKit Linux (dbg)(3) build 7795
BUG_24119 LINUX DEBUG : LayoutTests/tables/mozilla/bugs/bug1220.html = PASS FAIL
+
+// WebKit roll 49245:49254
+BUG_24142 : LayoutTests/fast/css/large-number-round-trip.html = FAIL
+BUG_JOHNNYG WIN LINUX : LayoutTests/fast/frames/viewsource-link-on-href-value.html = FAIL PASS