summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt8
2 files changed, 9 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 9bf5065..47d342d 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "45247",
+ "webkit_revision": "45270",
}
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 248e38d..8a8f74a 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2807,6 +2807,14 @@ BUG15460 : LayoutTests/media/video-controls-rendering.html = FAIL
BUG15460 : LayoutTests/media/video-empty-source.html = FAIL
BUG15460 : LayoutTests/media/video-zoom-controls.html = FAIL
+// WebKit 45247:45270
+BUGMERGE WIN LINUX : LayoutTests/editing/inserting/break-blockquote-after-delete.html = FAIL
+BUGMERGE WIN LINUX : LayoutTests/fast/text/international/hindi-whitespace.html = FAIL
+BUGMERGE WIN LINUX : LayoutTests/svg/custom/createImageElement.svg = FAIL
+
+BUG15478 SKIP : LayoutTests/fast/frames/viewsource-on-image-file.html = FAIL
+BUG15478 SKIP : LayoutTests/platform/qt/fast/events/event-sender-keydown-frame.html = FAIL
+
// Flaky for a while on DEBUG
BUG15267 WIN LINUX DEBUG : LayoutTests/transitions/cancel-transition.html = PASS FAIL