1 files changed, 7 insertions, 89 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 80a07cb..9ee2cde 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -585,9 +585,9 @@ BUG1124568 DEFER : LayoutTests/fast/dom/Window/window-function-name-getter-prece
 BUG4363 DEFER SKIP : LayoutTests/media = TIMEOUT
 BUG4363 DEFER SKIP : LayoutTests/fast/media = PASS FAIL
 BUG4363 DEFER : LayoutTests/http/tests/media = FAIL
-BUG4363 DEFER : LayoutTests/http/tests/security/local-video-poster-from-remote.html = FAIL
-BUG4363 DEFER : LayoutTests/http/tests/security/local-video-source-from-remote.html = FAIL
-BUG4363 DEFER : LayoutTests/http/tests/security/local-video-src-from-remote.html = FAIL
+BUG4363 DEFER : LayoutTests/http/tests/security/local-video-poster-from-remote.html = FAIL TIMEOUT
+BUG4363 DEFER : LayoutTests/http/tests/security/local-video-source-from-remote.html = FAIL TIMEOUT
+BUG4363 DEFER : LayoutTests/http/tests/security/local-video-src-from-remote.html = FAIL TIMEOUT
 BUG4363 DEFER : LayoutTests/fast/dom/Window/custom-constructors.html = FAIL
 
 // Function arguments object is copied for each access.
@@ -2464,93 +2464,11 @@ BUG10529 LINUX : LayoutTests/editing/inserting/6703873.html = FAIL
 // to include window.showModalDialog, which we give as undefined.
 BUG10530 : LayoutTests/fast/dom/Window/window-function-frame-getter-precedence.html = FAIL
 
-// New test from merge 42523:42547.  Needs rebaseline.
+// New test from merge 42523:42547.
+// Needs rebaseline.
 BUG_TONY LINUX : LayoutTests/fast/runin/generated.html = FAIL
-
-// Regressions from merge 42523:42547.
-// Due to r42547.  Just need to rebaseline.
-BUG_TONY LINUX : LayoutTests/editing/execCommand/insertImage.html = FAIL
-BUG_TONY LINUX : LayoutTests/editing/pasteboard/drag-image-to-contenteditable-in-iframe.html = FAIL
-BUG_TONY LINUX : LayoutTests/editing/selection/select-missing-image.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/block/basic/014.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/block/float/002.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/block/float/015.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/block/float/017.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/block/float/018.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/block/float/019.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/block/float/032.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/block/float/034.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/block/float/035.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/block/float/float-in-float-hit-testing.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/block/float/float-in-float-painting.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/block/float/tableshifting.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/block/margin-collapse/100.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/block/margin-collapse/101.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/block/margin-collapse/102.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/block/margin-collapse/negative-margins.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/block/positioning/058.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/block/positioning/061.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/dom/HTMLImageElement/image-alt-text.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/dom/HTMLInputElement/input-image-alt-text.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/dom/inner-text.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/encoding/utf-16-big-endian.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/encoding/utf-16-little-endian.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/flexbox/023.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/flexbox/024.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/forms/002.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/forms/005.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/forms/input-value.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/images/image-in-map.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/images/imagemap-case.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/inline-block/inline-block-vertical-align.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/inline/001.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/inline/styledEmptyInlinesWithBRs.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/invalid/012.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/invalid/016.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/loader/start-load-in-unload.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/overflow/infiniteRecursion.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/parser/comment-in-script.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/repaint/list-marker-2.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/replaced/005.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/replaced/006.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/replaced/008.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/replaced/absolute-position-percentage-height.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/replaced/replaced-breaking-mixture.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/replaced/replaced-breaking.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/replaced/selection-rect-in-table-cell.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/replaced/selection-rect-transform.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/replaced/selection-rect.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/table/008.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/table/009.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/table/014.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/table/024.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/table/025.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/table/027.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/table/028.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/table/growCellForImageQuirk.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/table/height-percent-test.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/table/replaced-percent-height.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/table/unbreakable-images-quirk.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/table/wide-colspan.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/table/wide-column.html = FAIL
-BUG_TONY LINUX : LayoutTests/fast/text/whitespace/normal-after-nowrap-breaking.html = FAIL
-BUG_TONY LINUX : LayoutTests/tables/mozilla/bugs/bug11026.html = FAIL
-BUG_TONY LINUX : LayoutTests/tables/mozilla/bugs/bug12268.html = FAIL
-BUG_TONY LINUX : LayoutTests/tables/mozilla/bugs/bug17587.html = FAIL
-BUG_TONY LINUX : LayoutTests/tables/mozilla/bugs/bug215629.html = FAIL
-BUG_TONY LINUX : LayoutTests/tables/mozilla/bugs/bug2962.html = FAIL
-BUG_TONY LINUX : LayoutTests/tables/mozilla/bugs/bug2997.html = FAIL
-BUG_TONY LINUX : LayoutTests/tables/mozilla/bugs/bug3977.html = FAIL
-BUG_TONY LINUX : LayoutTests/tables/mozilla/bugs/bug4527.html = FAIL
-BUG_TONY LINUX : LayoutTests/tables/mozilla/bugs/bug4576.html = FAIL
-BUG_TONY LINUX : LayoutTests/tables/mozilla/bugs/bug5538.html = FAIL
-BUG_TONY LINUX : LayoutTests/tables/mozilla/bugs/bug56201.html = FAIL
-BUG_TONY LINUX : LayoutTests/tables/mozilla/bugs/bug57828.html = FAIL
-BUG_TONY LINUX : LayoutTests/tables/mozilla/bugs/bug9123-1.html = FAIL
-BUG_TONY LINUX : LayoutTests/tables/mozilla/collapsing_borders/bug41262-3.html = FAIL
-BUG_TONY LINUX : LayoutTests/tables/mozilla_expected_failures/bugs/bug23847.html = FAIL
-BUG_TONY LINUX : LayoutTests/tables/mozilla_expected_failures/bugs/bug32205-4.html = FAIL
-BUG_TONY LINUX : LayoutTests/tables/mozilla_expected_failures/bugs/bug45621.html = FAIL
+// TODO(tc): Investigate
+BUG_TONY LINUX : LayoutTests/fast/lists/inlineBoxWrapperNullCheck.html = FAIL
 
 // TODO(brettw) Regressions from merge 42244:42287
 BUG10571 WIN : LayoutTests/http/tests/navigation/anchor-basic.html = FAIL