summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjparent@chromium.org <jparent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-07 00:52:42 +0000
committerjparent@chromium.org <jparent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-07 00:52:42 +0000
commit46f191d41760be1671bee49cac5b615b96309efb (patch)
treeb52a015ac6c5b7f10f2d0774769ce3011b19c7e7
parent7e36465c6e0a66226d2361e09dd53ce104329a02 (diff)
downloadchromium_src-46f191d41760be1671bee49cac5b615b96309efb.zip
chromium_src-46f191d41760be1671bee49cac5b615b96309efb.tar.gz
chromium_src-46f191d41760be1671bee49cac5b615b96309efb.tar.bz2
Recommit of 28192 (WebKit roll: 49190:49206), that was rolled out in 28201,
due to test_expectations corruption. This should be the same, just without crazy changes to test_expectations. I have no idea how that happened. BUG=none TEST=none TBR=johnnyg Review URL: http://codereview.chromium.org/260025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28206 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt7
2 files changed, 7 insertions, 2 deletions
diff --git a/DEPS b/DEPS
index 4e71038..080feb7 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "49190",
+ "webkit_revision": "49206",
"ffmpeg_revision": "27457",
}
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 7f4e869..3492746 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3828,7 +3828,7 @@ BUG_SENORBLANCO LINUX : LayoutTests/fast/forms/input-appearance-visibility.html
BUG_SENORBLANCO LINUX : LayoutTests/fast/forms/input-appearance-width.html = FAIL
BUG_SENORBLANCO LINUX : LayoutTests/fast/forms/input-baseline.html = FAIL
BUG_SENORBLANCO LINUX : LayoutTests/fast/forms/input-disabled-color.html = FAIL
-BUG_SENORBLANCO LINUX : LayoutTests/fast/forms/input-double-click-selection-gap-bug.html = FAIL
+BUG_SENORBLANCO LINUX : LayoutTests/fast/forms/input-double-click-selection-gap-bug.html = CRASH FAIL
BUG_SENORBLANCO LINUX : LayoutTests/fast/forms/input-field-text-truncated.html = FAIL
BUG_SENORBLANCO LINUX : LayoutTests/fast/forms/input-paste-undo.html = FAIL
BUG_SENORBLANCO LINUX : LayoutTests/fast/forms/input-readonly-autoscroll.html = FAIL
@@ -4931,6 +4931,11 @@ BUG_JORLOW: LayoutTests/storage/domstorage/sessionstorage/complex-values.html =
// Added in http://trac.webkit.org/changeset/49153, probably just needs expectations.
BUG_JPARENT: LayoutTests/svg/filters/sourceAlpha.svg = FAIL
+ // WebKit update: 49190:49206
+ BUG_JPARENT MAC DEBUG : LayoutTests/editing/execCommand/paste-1.html = FAIL PASS
+ BUG_JPARENT MAC DEBUG : LayoutTests/editing/execCommand/paste-2.html = FAIL PASS
+ BUG_JPARENT WIN DEBUG : LayoutTests/fast/frames/calculate-percentage.html = CRASH
+
// Started failing for no apparent reason at r28124
// BUG_SENORBLANCO FAIL on next line is due to Skia roll and should be reverted by end of 10/06/2009
BUG23972 LINUX : LayoutTests/fast/forms/form-element-geometry.html = CRASH FAIL