summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-27 19:22:07 +0000
committerjorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-27 19:22:07 +0000
commit300a83ade07eff3a8fc034f5fca4bce5a916e4af (patch)
treee63705467cffabd60082560bb8c2407e4c592a89
parentb909b540017ba1a4b4824967883ae13fff674597 (diff)
downloadchromium_src-300a83ade07eff3a8fc034f5fca4bce5a916e4af.zip
chromium_src-300a83ade07eff3a8fc034f5fca4bce5a916e4af.tar.gz
chromium_src-300a83ade07eff3a8fc034f5fca4bce5a916e4af.tar.bz2
Roll webkit to 50158
TBR=rolandsteiner TEST=none BUG=none Review URL: http://codereview.chromium.org/338045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30233 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 eb331e3..20205fc 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "50101",
+ "webkit_revision": "50158",
"ffmpeg_revision": "28488",
}
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index a185f42..c093d07 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3249,3 +3249,9 @@ BUG_JORLOW : LayoutTests/storage/domstorage/documentURI.html = FAIL
// Test added by Ryosuke: http://trac.webkit.org/changeset/50090
BUG25880 WIN LINUX : LayoutTests/editing/style/remove-nested-inline-styles.html = FAIL
BUG25889 MAC DEBUG : LayoutTests/fast/forms/select-empty-option-height.html = TIMEOUT
+
+// WebKit roll 50101:50158
+BUG_JORLOW : LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer.html = FAIL
+BUG_JORLOW : LayoutTests/fast/css/getComputedStyle/computed-style.html = FAIL
+BUG_JORLOW RELEASE LINUX WIN : LayoutTests/svg/css/getComputedStyle-basic.xhtml = FAIL
+