summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhamaji@chromium.org <hamaji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-27 20:03:23 +0000
committerhamaji@chromium.org <hamaji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-27 20:03:23 +0000
commite85b1ef76f63646811a539ca35f7df551123afd1 (patch)
tree2489d837a0e044ad63a89f42f1514759b474a262
parent40676ab2827e430e5719b1646aa66e9d07bc37fe (diff)
downloadchromium_src-e85b1ef76f63646811a539ca35f7df551123afd1.zip
chromium_src-e85b1ef76f63646811a539ca35f7df551123afd1.tar.gz
chromium_src-e85b1ef76f63646811a539ca35f7df551123afd1.tar.bz2
WebKit roll 51406:51410.
TEST=trybot BUG=none Review URL: http://codereview.chromium.org/443023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33227 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt6
2 files changed, 7 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index a9bc180..d96cb44 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "51406",
+ "webkit_revision": "51410",
"ffmpeg_revision": "30374",
"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 525a410..467a8be 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3038,3 +3038,9 @@ BUG28605 WIN LINUX : LayoutTests/svg/filters/filterRes.svg = IMAGE
// New tests. Failures from merge 51210:51325.
BUG28646 : LayoutTests/editing/selection/transformed-selection-rects.html = FAIL
+
+// New failures from merge 51406:51410.
+BUG28905 : LayoutTests/http/tests/security/isolatedWorld/world-reuse.html = FAIL
+BUG28905 : LayoutTests/plugins/qt-qwidget-plugin.html = FAIL
+
+