summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
authorlevin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-13 09:55:49 +0000
committerlevin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-13 09:55:49 +0000
commit8b10265866853398efd8921a55bcf9bfa87cc5cb (patch)
treeab291315ba7f36d04dbde98e57e36a7af55d03fb /webkit/tools
parent32d9329c718c9ab7412d210af6597bbac2241277 (diff)
downloadchromium_src-8b10265866853398efd8921a55bcf9bfa87cc5cb.zip
chromium_src-8b10265866853398efd8921a55bcf9bfa87cc5cb.tar.gz
chromium_src-8b10265866853398efd8921a55bcf9bfa87cc5cb.tar.bz2
Roll WebKit DEPS 50840:50929.
TBR=brettw@chromium.org BUG=None TEST=None Review URL: http://codereview.chromium.org/391049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31898 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt41
1 files changed, 33 insertions, 8 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index fa370de..93ca54b9 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -1964,14 +1964,14 @@ BUG23496 MAC : LayoutTests/fast/forms/001.html = IMAGE
BUG23496 MAC : LayoutTests/fast/forms/basic-inputs.html = IMAGE
// BUG23496 MAC : LayoutTests/fast/forms/box-shadow-override.html = IMAGE
BUG23496 MAC : LayoutTests/fast/forms/checkbox-radio-onchange.html = IMAGE
-BUG23496 MAC : LayoutTests/fast/forms/file-input-disabled.html = IMAGE
-BUG23496 MAC : LayoutTests/fast/forms/form-element-geometry.html = IMAGE
+BUG23496 MAC : LayoutTests/fast/forms/file-input-disabled.html = IMAGE+TEXT
+BUG23496 MAC : LayoutTests/fast/forms/form-element-geometry.html = IMAGE+TEXT
BUG23496 MAC : LayoutTests/fast/forms/formmove.html = IMAGE
// Recently became crashy. See http://crbug.com/24721
BUG23496 MAC : LayoutTests/fast/forms/formmove2.html = IMAGE CRASH
BUG23496 MAC : LayoutTests/fast/forms/indeterminate.html = IMAGE
-BUG23496 MAC : LayoutTests/fast/forms/input-appearance-height.html = IMAGE
-BUG23496 MAC : LayoutTests/fast/forms/input-value.html = IMAGE
+BUG23496 MAC : LayoutTests/fast/forms/input-appearance-height.html = IMAGE+TEXT
+BUG23496 MAC : LayoutTests/fast/forms/input-value.html = IMAGE+TEXT
// BUG23496 MAC : LayoutTests/fast/forms/menulist-narrow-width.html = IMAGE
BUG23496 MAC : LayoutTests/fast/forms/menulist-no-overflow.html = IMAGE
BUG23496 MAC : LayoutTests/fast/forms/radio-attr-order.html = IMAGE
@@ -1995,7 +1995,7 @@ BUG23496 MAC : LayoutTests/tables/mozilla_expected_failures/core/captions2.html
// Big button widgets are broken
BUG23495 MAC : LayoutTests/fast/forms/basic-buttons.html = IMAGE
-BUG23495 MAC : LayoutTests/fast/forms/box-shadow-override.html = IMAGE
+BUG23495 MAC : LayoutTests/fast/forms/box-shadow-override.html = IMAGE+TEXT
BUG23495 MAC : LayoutTests/fast/forms/button-sizes.html = IMAGE
// Text declared as "monospace" with no size is bigger in Chromium
@@ -2931,7 +2931,7 @@ BUG_JPARENT WIN DEBUG : LayoutTests/fast/frames/calculate-percentage.html = CRAS
BUG_JPARENT LINUX DEBUG SLOW : LayoutTests/fast/frames/calculate-fixed.html = PASS
// Started failing for no apparent reason at r28124
-BUG23972 LINUX : LayoutTests/fast/forms/form-element-geometry.html = CRASH PASS
+BUG23972 LINUX : LayoutTests/fast/forms/form-element-geometry.html = CRASH PASS TEXT
// Flaky timeouts first appearing at r27764 (webkit 48947)
BUG9798 RELEASE : LayoutTests/http/tests/cookies/multiple-cookies.html = TIMEOUT PASS
@@ -3053,8 +3053,8 @@ BUG27044 : LayoutTests/accessibility/aria-tab-roles.html = TEXT
BUG27044 : LayoutTests/accessibility/aria-combobox.html = TEXT
// WebKit 50603:50667
-BUG27164 : LayoutTests/plugins/document-open.html = TEXT
-BUG27164 : LayoutTests/plugins/window-open.html = TEXT
+BUG27164 : LayoutTests/plugins/document-open.html = TEXT TIMEOUT
+BUG27164 : LayoutTests/plugins/window-open.html = TEXT TIMEOUT
BUG_LEVIN WIN LINUX : LayoutTests/fast/block/positioning/relative-positioned-inline-container.html = IMAGE+TEXT
BUG_LEVIN WIN DEBUG : LayoutTests/svg/custom/gradient-stop-style-change.svg = TEXT
@@ -3124,3 +3124,28 @@ BUG27551 WIN : LayoutTests/fast/css/shadow-multiple.html = IMAGE
BUG27553 WIN MAC : LayoutTests/fast/text/atsui-partial-selection.html = IMAGE
BUG27556 SKIP WIN LINUX : LayoutTests/websocket/tests = FAIL
+
+// WebKit merge 50840:50929
+BUG27555 : LayoutTests/accessibility/document-attributes.html = TEXT
+BUG27555 : LayoutTests/fast/forms/file-input-direction.html = TEXT
+BUG27555 : LayoutTests/fast/forms/hidden-input-file.html = TEXT
+BUG27555 : LayoutTests/fast/forms/input-file-re-render.html = MISSING
+
+BUG27555 MAC : LayoutTests/fast/css/color-correction-on-box-shadow.html = IMAGE
+BUG27555 WIN LINUX : LayoutTests/fast/css/color-correction-on-box-shadow.html = IMAGE+TEXT
+BUG27555 MAC : LayoutTests/fast/css/color-correction-on-text-shadow.html = IMAGE
+BUG27555 WIN LINUX : LayoutTests/fast/css/color-correction-on-text-shadow.html = IMAGE+TEXT
+BUG27555 MAC : LayoutTests/fast/reflections/opacity-reflection-transform.html = IMAGE
+BUG27555 WIN LINUX : LayoutTests/fast/reflections/opacity-reflection-transform.html = IMAGE+TEXT
+
+BUG27555 WIN LINUX : LayoutTests/fast/forms/file-input-disabled.html = TEXT
+BUG27555 WIN : LayoutTests/fast/forms/form-element-geometry.html = TEXT
+BUG27555 WIN LINUX : LayoutTests/fast/forms/input-appearance-height.html = TEXT
+BUG27555 WIN LINUX : LayoutTests/fast/forms/input-value.html = IMAGE+TEXT
+
+BUG27555 WIN MAC : LayoutTests/media/media-fullscreen-inline.html = TIMEOUT
+BUG27555 WIN MAC : LayoutTests/media/media-fullscreen-not-in-document.html = TIMEOUT
+
+BUG27555 WIN LINUX : LayoutTests/fast/canvas/canvas-shadow.html = TEXT
+BUG27555 WIN LINUX : LayoutTests/fast/multicol/single-line.html = IMAGE+TEXT
+