summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-26 23:12:21 +0000
committerjorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-26 23:12:21 +0000
commitcef6a3f303f26ec57db803cac377da30a203d9c9 (patch)
tree4d3422f69a14e904320853afea606c2d6e7817fc
parentd80a585deb9565e83276c3e0042014b2412b4efa (diff)
downloadchromium_src-cef6a3f303f26ec57db803cac377da30a203d9c9.zip
chromium_src-cef6a3f303f26ec57db803cac377da30a203d9c9.tar.gz
chromium_src-cef6a3f303f26ec57db803cac377da30a203d9c9.tar.bz2
Roll the WebKit deps: 47791:47797
TBR=ojan BUG=20356,20359 TEST=none Review URL: http://codereview.chromium.org/173537 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24556 0039d316-1c4b-4281-b951-d872f2087c98
-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 626eea8..4781011 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "47791",
+ "webkit_revision": "47797",
}
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 79bf68f..d1e95e3 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2817,3 +2817,7 @@ BUG20314 MAC : LayoutTests/fast/css/only-of-type-pseudo-class.html = FAIL
// WebKit 47777:47790 - getOwnPropertyDescriptor
BUG20345 : LayoutTests/fast/js/getOwnPropertyDescriptor.html = FAIL
+
+// Webkit 47790:47797
+BUG20359 LINUX WIN : LayoutTests/fast/repaint/inline-overflow.html = FAIL
+BUG20356 LINUX WIN : LayoutTests/http/tests/xmlhttprequest/cross-origin-cookie-storage.html = TIMEOUT