summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
authorericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-15 19:17:19 +0000
committerericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-15 19:17:19 +0000
commitd9f286b1927b3151db2df3553411297d721827e9 (patch)
treec63117ebf28b87ce6ab9422e838698d14e4d3544 /webkit/tools
parent3bd29d38ab1b03648ba9d3682ddc1d23c5cadad5 (diff)
downloadchromium_src-d9f286b1927b3151db2df3553411297d721827e9.zip
chromium_src-d9f286b1927b3151db2df3553411297d721827e9.tar.gz
chromium_src-d9f286b1927b3151db2df3553411297d721827e9.tar.bz2
Chromium side of webkit merge 42440:42523.
Review URL: http://codereview.chromium.org/73066 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13774 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 1abe24d..085e7be 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2447,3 +2447,10 @@ BUG10488 : LayoutTests/fast/css/zoom-body-scroll.html = FAIL
// due to http://trac.webkit.org/changeset/42428.
BUG10489 : chrome/fast/dom/messageport-gc.html = TIMEOUT
+// New test added by http://trac.webkit.org/changeset/42501.
+// Has already been rebaselined for chromium-win.
+BUG10529 MAC LINUX : LayoutTests/editing/inserting/6703873.html = FAIL
+
+// This test was changed upstream in http://trac.webkit.org/changeset/42447
+// to include window.showModalDialog, which we give as undefined.
+BUG10530 : LayoutTests/fast/dom/Window/window-function-frame-getter-precedence.html = FAIL