From 75d50f7e453213f4c3634d4990598fc19c8e6bc1 Mon Sep 17 00:00:00 2001 From: "amanda@chromium.org" Date: Tue, 11 Aug 2009 19:33:06 +0000 Subject: Roll WebKit to 47041 TBR=levin BUG=19064 TEST=none Review URL: http://codereview.chromium.org/165311 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23066 0039d316-1c4b-4281-b951-d872f2087c98 --- DEPS | 2 +- webkit/tools/layout_tests/test_expectations.txt | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/DEPS b/DEPS index d79c0c8..2d045ef 100644 --- a/DEPS +++ b/DEPS @@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "47034", + "webkit_revision": "47041", } diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 7fe248f..94ea155 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -2861,3 +2861,7 @@ BUG18995 LINUX WIN : LayoutTests/editing/pasteboard/select-element-1.html = FAIL // Fallout from webkit roll 47010:47034 BUG19028 MAC : LayoutTests/fast/dom/Window/window-open-parent-no-parent.html = PASS CRASH +// Fallout from webkit 47034:47041 +BUG19064 : LayoutTests/fast/harness/override-preferences.html = FAIL +BUG19064 : LayoutTests/fast/harness/override-preferences-2.html = FAIL + -- cgit v1.1