summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordglazkov@chromium.org <dglazkov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-23 20:33:19 +0000
committerdglazkov@chromium.org <dglazkov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-23 20:33:19 +0000
commit8c7cb3a826021f54cfcfcd97a754b57062218ef5 (patch)
treef83cb6dddf651bfde82cfb941d0aa7918ad362ad
parent05a6a89d5c81770ed543d3eccf87c6495b42a869 (diff)
downloadchromium_src-8c7cb3a826021f54cfcfcd97a754b57062218ef5.zip
chromium_src-8c7cb3a826021f54cfcfcd97a754b57062218ef5.tar.gz
chromium_src-8c7cb3a826021f54cfcfcd97a754b57062218ef5.tar.bz2
WebKit update 48665:48679
Failures are rebaselines. R=levin TEST=none BUG=none Review URL: http://codereview.chromium.org/232004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26970 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rwxr-xr-xwebkit/tools/layout_tests/test_expectations.txt4
2 files changed, 5 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 2d26807..e805144 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "48665",
+ "webkit_revision": "48679",
"ffmpeg_revision": "26428",
}
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index c0b1878..e53228d 100755
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2355,3 +2355,7 @@ BUG_DGLAZKOV WIN LINUX : LayoutTests/fast/table/fixed-table-with-percent-width-i
BUG_DGLAZKOV WIN LINUX : LayoutTests/fast/table/fixed-table-with-percent-width-inside-fixed-width-table.html = FAIL
BUG_DGLAZKOV WIN LINUX : LayoutTests/fast/table/fixed-table-with-small-percent-width.html = FAIL
BUG_DGLAZKOV WIN LINUX : LayoutTests/tables/mozilla/bugs/bug34176.html = FAIL
+
+// WebKit update 48665:48679
+BUG_DGLAZKOV WIN LINUX : LayoutTests/fast/multicol/float-multicol.html = FAIL
+BUG_DGLAZKOV WIN LINUX : LayoutTests/fast/multicol/positioned-with-constrained-height.html = FAIL