summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt6
2 files changed, 6 insertions, 2 deletions
diff --git a/DEPS b/DEPS
index 9bc0970..fd2731a 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "52323",
+ "webkit_revision": "52366",
"ffmpeg_revision": "34297",
"skia_revision": "457",
"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 49c401c..d5a695a 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3126,4 +3126,8 @@ BUG29737 LINUX : LayoutTests/svg/filters/feDisplacementMap.svg = TEXT PASS
BUG30816 WIN LINUX : LayoutTests/editing/selection/doubleclick-beside-cr-span.html = TEXT
// WebKit update 52293->52323
-BUG30792 : LayoutTests/http/tests/security/xss-DENIED-assign-location-href-javascript.html = TEXT \ No newline at end of file
+BUG30792 : LayoutTests/http/tests/security/xss-DENIED-assign-location-href-javascript.html = TEXT
+
+// WebKit update 52323->52366
+BUG30825 WIN LINUX : LayoutTests/fast/dom/Element/id-in-deletebutton.html = TEXT
+BUG30826 WIN : LayoutTests/platform/win/fast/events/panScroll-imageMap-noHref-scroll.html = TEXT \ No newline at end of file