summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 34ddb3f..7ec70e7 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "45916",
+ "webkit_revision": "45936",
}
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 5175d4e..d1bb43a 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2984,3 +2984,7 @@ BUG16823 MAC : LayoutTests/editing/style/font-family-with-space.html = FAIL
BUG16823 MAC : LayoutTests/editing/style/non-inheritable-styles.html = FAIL
BUG16823 MAC : LayoutTests/editing/style/smoosh-styles-003.html = FAIL
BUG16823 MAC : LayoutTests/fast/lists/drag-into-marker.html = FAIL
+
+// Failures from WebKit merge 45916:45936
+BUG16850 LINUX WIN : LayoutTests/fast/css/rem-dynamic-scaling.html = FAIL
+BUG16850 LINUX WIN : LayoutTests/fast/css/rem-units-on-root.html = FAIL