summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt3
2 files changed, 4 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index e2dee85..ecdb275 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "51724",
+ "webkit_revision": "51772",
"ffmpeg_revision": "33521",
"skia_revision": "451",
"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 ccab51b..f46a13e 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3119,3 +3119,6 @@ BUG_AJWONG : LayoutTests/svg/carto.net/selectionlist.svg = IMAGE PASS
BUG_AJWONG : LayoutTests/tables/mozilla/bugs/bug15933.html = IMAGE PASS
BUG_AJWONG WIN : chrome/fast/forms/basic-selects.html = IMAGE
BUG_AJWONG WIN :LayoutTests/fast/body-propagation/overflow/004-xhtml.xhtml = IMAGE+TEXT PASS
+
+// Failres from Webkit merger 51724 -> 51772
+BUG_AJWONG: LayoutTests/http/tests/security/cross-frame-access-getOwnPropertyDescriptor.html = TEXT