summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjaphet@chromium.org <japhet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-15 23:44:26 +0000
committerjaphet@chromium.org <japhet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-15 23:44:26 +0000
commit7ee3f7254b30ffdc25b1e7a7f2ef48bddd1d782c (patch)
treee0fc6d1f4ff8bf3b5d55210c885dc69cb7da481b
parent349966346211bb65ecc70892e120db7779aaae10 (diff)
downloadchromium_src-7ee3f7254b30ffdc25b1e7a7f2ef48bddd1d782c.zip
chromium_src-7ee3f7254b30ffdc25b1e7a7f2ef48bddd1d782c.tar.gz
chromium_src-7ee3f7254b30ffdc25b1e7a7f2ef48bddd1d782c.tar.bz2
Roll WebKit DEPS 45936:45958.
BUG=none TEST=green build TBR=ericroman Review URL: http://codereview.chromium.org/149720 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20815 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 7ec70e7..503165d 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "45936",
+ "webkit_revision": "45958",
}
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 1196c9e..2fa2958 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2987,3 +2987,9 @@ BUG16823 MAC : LayoutTests/fast/lists/drag-into-marker.html = FAIL
BUG16850 LINUX WIN : LayoutTests/fast/css/rem-dynamic-scaling.html = FAIL CRASH
BUG16850 LINUX WIN : LayoutTests/fast/css/rem-units-on-root.html = FAIL
BUG16850 WIN : LayoutTests/media/progress-event-total.html = FAIL
+
+// Failures from WebKit merge 45936:45958
+BUG16878 LINUX MAC : LayoutTests/fast/js/instanceof-operator.html = CRASH FAIL
+BUG16878 LINUX WIN : LayoutTests/fast/css/attribute-selector-dynamic.xml = FAIL
+BUG16878 LINUX WIN : LayoutTests/fast/runin/001.html = FAIL
+BUG16878 LINUX WIN : LayoutTests/fast/runin/generated.html = FAIL \ No newline at end of file