summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
authorojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-27 00:50:16 +0000
committerojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-27 00:50:16 +0000
commitf8ca6e9ed1768aaf216c4ffa4eb572bbef0dc9fd (patch)
tree7d8eafaff84f2dc9a32072c9b5de115d7f535500 /webkit/tools
parent3adb24ec4914ccb68cb9db958eadba2f54b58fe0 (diff)
downloadchromium_src-f8ca6e9ed1768aaf216c4ffa4eb572bbef0dc9fd.zip
chromium_src-f8ca6e9ed1768aaf216c4ffa4eb572bbef0dc9fd.tar.gz
chromium_src-f8ca6e9ed1768aaf216c4ffa4eb572bbef0dc9fd.tar.bz2
src/webkit side of webKit merge 38653:38729
Review URL: http://codereview.chromium.org/12708 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6081 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rw-r--r--webkit/tools/layout_tests/test_lists/win/tests_fixable.txt14
1 files changed, 14 insertions, 0 deletions
diff --git a/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt
index 4438ea6..204f9f8 100644
--- a/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt
@@ -1168,3 +1168,17 @@ LayoutTests/fast/css/computed-style.html = FAIL
LayoutTests/fast/repaint/change-transform.html = FAIL
LayoutTests/transitions/transition-drt-api-delay.html = TIMEOUT
LayoutTests/transitions/transition-shorthand-delay.html = TIMEOUT
+
+// MERGE 38653:38729: Expectations changed upstream
+LayoutTests/editing/execCommand/19653-4.html = FAIL
+LayoutTests/editing/deleting/5168598.html = FAIL
+LayoutTests/editing/deleting/delete-link-1.html = FAIL
+LayoutTests/editing/inserting/insert-before-link-1.html = FAIL
+LayoutTests/editing/execCommand/19089.html = FAIL
+LayoutTests/fast/block/positioning/047.html = FAIL
+LayoutTests/fast/text/cg-fallback-bolding.html = FAIL
+
+// MERGE 38653:38729: New tests
+LayoutTests/fast/repaint/outline-child-repaint.html = FAIL
+LayoutTests/http/tests/misc/single-character-pi-stylesheet.xhtml = FAIL
+LayoutTests/fast/workers/stress-js-execution.html = TIMEOUT