summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt12
2 files changed, 13 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index dd173ce..48f6165 100644
--- a/DEPS
+++ b/DEPS
@@ -2,7 +2,7 @@ vars = {
"googlecode_url": "http://%s.googlecode.com/svn",
"webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk",
"nacl_trunk": "http://src.chromium.org/native_client/trunk",
- "webkit_revision": "68100",
+ "webkit_revision": "68178",
"ffmpeg_revision": "58574",
"skia_revision": "599",
"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 e656fdc..cd676f0 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -11,3 +11,15 @@ BUGJOHNNYG LINUX : plugins/embed-attributes-style.html = IMAGE
// atwilson will upstream
BUGATWILSON : svg/W3C-SVG-1.1/masking-intro-01-f.svg = IMAGE CRASH
+
+// atwilson will remove once we roll past 68193
+BUGATWILSON WIN : svg/dynamic-updates/SVGFEMorphologyElement-dom-in-attr.html = IMAGE
+BUGATWILSON WIN : svg/dynamic-updates/SVGFEMorphologyElement-dom-operator-attr.html = IMAGE
+BUGATWILSON WIN : svg/dynamic-updates/SVGFEMorphologyElement-dom-radius-attr.html = IMAGE
+BUGATWILSON WIN : svg/dynamic-updates/SVGFEMorphologyElement-svgdom-in-prop.html = IMAGE
+BUGATWILSON WIN : svg/dynamic-updates/SVGFEMorphologyElement-svgdom-operator-prop.html = IMAGE
+BUGATWILSON WIN : svg/dynamic-updates/SVGFEMorphologyElement-svgdom-radius-call.html = IMAGE
+
+// atwilson will upstream
+BUGATWILSON : storage/indexeddb/transaction-basics.html = CRASH
+