summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoramanda@chromium.org <amanda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-11 19:33:06 +0000
committeramanda@chromium.org <amanda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-11 19:33:06 +0000
commit75d50f7e453213f4c3634d4990598fc19c8e6bc1 (patch)
tree3d0bc8101d3cb6d7594aa73328ad203ee755c2f9
parent51989b7fd206504cbb83dda4ef62d997c5117918 (diff)
downloadchromium_src-75d50f7e453213f4c3634d4990598fc19c8e6bc1.zip
chromium_src-75d50f7e453213f4c3634d4990598fc19c8e6bc1.tar.gz
chromium_src-75d50f7e453213f4c3634d4990598fc19c8e6bc1.tar.bz2
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
-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 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
+