summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-02 00:09:30 +0000
committerojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-02 00:09:30 +0000
commit831043e189e38aecb62d37762bf7ccda8d39a062 (patch)
tree1f2ade195c9e35670308dbc4a50ecb4abfb34d30
parent0700c200bb205dde188c46096ca4c6bac3425b57 (diff)
downloadchromium_src-831043e189e38aecb62d37762bf7ccda8d39a062.zip
chromium_src-831043e189e38aecb62d37762bf7ccda8d39a062.tar.gz
chromium_src-831043e189e38aecb62d37762bf7ccda8d39a062.tar.bz2
Forgot to include this in the merge change I just landed. TBR to greenify tree.
Review URL: http://codereview.chromium.org/13032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6188 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/tools/layout_tests/test_lists/win/tests_fixable.txt12
1 files changed, 11 insertions, 1 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 0d006ef..4871702 100644
--- a/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt
@@ -1144,7 +1144,7 @@ LayoutTests/editing/deleting/delete-by-word-002.html = FAIL
LayoutTests/editing/deleting/delete-to-end-of-paragraph.html = FAIL
LayoutTests/fast/css/computed-style-without-renderer.html = FAIL
-// MERGE 38625:38653: Regression
+// MERGE 38625:38653: Regressions
LayoutTests/fast/events/key-events-in-input-button.html = FAIL
// MERGE 38625:38653: New tests
@@ -1166,3 +1166,13 @@ LayoutTests/fast/text/cg-fallback-bolding.html = FAIL
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
+
+// MERGE 38729:38760: New tests
+LayoutTests/editing/selection/doubleclick-whitespace.html = FAIL
+LayoutTests/fast/workers/worker-terminate.html = TIMEOUT
+LayoutTests/http/tests/misc/timer-vs-loading.html = TIMEOUT
+
+// MERGE 38729:38760: Regressions
+LayoutTests/editing/selection/5057506.html = FAIL
+LayoutTests/editing/pasteboard/subframe-dragndrop-1.html = FAIL
+LayoutTests/http/tests/misc/DOMContentLoaded-event.html = TIMEOUT