summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-05 08:31:43 +0000
committerajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-05 08:31:43 +0000
commit6c7e80e37a94833f145d2fbe036ca7db331eafd7 (patch)
tree5468980b2b808eb82c162a36306e3a1197a7c072
parent802956b3dcaab1ba66c2abadfdf820304ee85796 (diff)
downloadchromium_src-6c7e80e37a94833f145d2fbe036ca7db331eafd7.zip
chromium_src-6c7e80e37a94833f145d2fbe036ca7db331eafd7.tar.gz
chromium_src-6c7e80e37a94833f145d2fbe036ca7db331eafd7.tar.bz2
Roll Webkit 51711 -> 51724.
Change test expectations as reported by layout try bots. BUG=29470 TEST=none Review URL: http://codereview.chromium.org/466050 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33925 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt41
2 files changed, 38 insertions, 5 deletions
diff --git a/DEPS b/DEPS
index 158d77e..cb73b49 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "51711",
+ "webkit_revision": "51724",
"ffmpeg_revision": "33521",
"skia_revision": "451",
"chromium_git": "http://src.chromium.org/git",
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 8f002762..fa9612a 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -294,9 +294,7 @@ WONTFIX LINUX WIN : LayoutTests/fast/replaced/pdf-as-image.html = FAIL
// These tests try to print a PDF file as the expected result. I don't think
// we plan on supporting this anytime soon.
WONTFIX SKIP : LayoutTests/printing/media-queries-print.html = PASS
-
-// TODO(ajwong): uncomment with next DEPS roll.
-//WONTFIX SKIP : LayoutTests/printing/compositing-layer-printing.html = PASS
+WONTFIX SKIP : LayoutTests/printing/compositing-layer-printing.html = PASS
// Chrome doesn't call the willCacheResponse callback (a method
// of ResourceHandleClient). That function is Mac-specific.
@@ -1338,7 +1336,7 @@ BUG10331 LINUX : LayoutTests/css2.1/t1008-c44-ln-box-02-d-ag.html = FAIL
BUG10332 LINUX : LayoutTests/css2.1/t1605-c545-txttrans-00-b-ag.html = FAIL
// Linux: color off by one. Rounding error?
-BUG10333 LINUX : LayoutTests/editing/deleting/deletionUI-single-instance.html = FAIL
+BUG10333 LINUX WIN : LayoutTests/editing/deleting/deletionUI-single-instance.html = FAIL IMAGE
// Asks for "system" fonts, which we don't support at all.
BUG10335 LINUX : LayoutTests/fast/css/css2-system-fonts.html = FAIL
@@ -3093,3 +3091,38 @@ BUG_SENORBLANCO WIN : LayoutTests/svg/batik/text/textFeatures.svg = IMAGE
BUG_SENORBLANCO WIN : LayoutTests/svg/custom/foreign-object-skew.svg = IMAGE
BUG_SENORBLANCO WIN : LayoutTests/svg/custom/js-late-gradient-and-object-creation.svg = IMAGE
BUG_SENORBLANCO WIN : LayoutTests/transforms/2d/hindi-rotated.html = IMAGE
+
+// Need rebaselining due to r51722.
+BUG_29470 : LayoutTests/fast/borders/border-radius-constraints.html = IMAGE
+BUG_29470 : LayoutTests/fast/borders/border-radius-huge-assert.html = IMAGE
+BUG_29470 : LayoutTests/fast/borders/border-radius-split-inline.html = IMAGE
+BUG_29470 : LayoutTests/fast/borders/borderRadiusAllStylesAllCorners.html = IMAGE
+BUG_29470 : LayoutTests/fast/borders/borderRadiusArcs01.html = IMAGE
+BUG_29470 : LayoutTests/fast/borders/borderRadiusDashed01.html = IMAGE
+BUG_29470 : LayoutTests/fast/borders/borderRadiusDashed02.html = IMAGE
+BUG_29470 : LayoutTests/fast/borders/borderRadiusDashed03.html = IMAGE
+BUG_29470 : LayoutTests/fast/borders/borderRadiusDotted01.html = IMAGE
+BUG_29470 : LayoutTests/fast/borders/borderRadiusDotted02.html = IMAGE
+BUG_29470 : LayoutTests/fast/borders/borderRadiusDotted03.html = IMAGE
+BUG_29470 : LayoutTests/fast/borders/borderRadiusDouble02.html = IMAGE
+BUG_29470 : LayoutTests/fast/borders/borderRadiusGroove01.html = IMAGE
+BUG_29470 : LayoutTests/fast/borders/borderRadiusGroove02.html = IMAGE
+BUG_29470 : LayoutTests/fast/borders/borderRadiusInset01.html = IMAGE
+BUG_29470 : LayoutTests/fast/borders/borderRadiusInvalidColor.html = IMAGE
+BUG_29470 : LayoutTests/fast/borders/borderRadiusOutset01.html = IMAGE
+BUG_29470 : LayoutTests/fast/borders/borderRadiusRidge01.html = IMAGE
+BUG_29470 : LayoutTests/fast/borders/borderRadiusSolid01.html = IMAGE
+BUG_29470 : LayoutTests/fast/borders/borderRadiusSolid02.html = IMAGE
+BUG_29470 : LayoutTests/fast/borders/borderRadiusSolid03.html = IMAGE
+BUG_29470 : LayoutTests/fast/borders/borderRadiusSolid04.html = IMAGE
+BUG_29470 : LayoutTests/fast/borders/fieldsetBorderRadius.html = IMAGE
+BUG_29470 : LayoutTests/fast/css/text-input-with-webkit-border-radius.html = IMAGE
+BUG_29470 : LayoutTests/fast/repaint/border-radius-repaint.html = IMAGE
+BUG_29470 : LayoutTests/svg/custom/svg-fonts-in-html.html = IMAGE
+
+// Failures from WebKit merge 51711:51724
+BUG_AJWONG : LayoutTests/fast/js/string-property-deletion.html = TEXT
+BUG_AJWONG : LayoutTests/svg/carto.net/selectionlist.svg = IMAGE PASS
+BUG_AJWONG : LayoutTests/tables/mozilla/bugs/bug15933.html = IMAGE PASS
+BUG_AJWONG WIN : chrome/fast/forms/basic-selects.html = IMAGE
+BUG_AJWONG WIN :LayoutTests/fast/body-propagation/overflow/004-xhtml.xhtml = IMAGE+TEXT PASS