Trying to get the layout test bots green.

TBR=ajwong
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/160215

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21738 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 67 insertions, 62 deletions

diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 55b918d..5798609 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -1112,7 +1112,8 @@ BUG10322 : LayoutTests/accessibility/non-native-image-crash.html = PASS
 BUG10322 WIN : LayoutTests/fast/borders/fieldsetBorderRadius.html = FAIL
 
 // This test isn't hanging, it just takes 12-13 seconds to run.
-BUG10322 SLOW WIN LINUX : LayoutTests/http/tests/misc/acid3.html = FAIL
+// NOTE: Crashing now due to a WebKit merge, see below
+// BUG10322 SLOW : LayoutTests/http/tests/misc/acid3.html = FAIL
 
 // Expectations for this test changed upstream. We should fix this test, but
 // it doesn't need to block the current release
@@ -3112,66 +3113,70 @@ BUG_DARIN WIN LINUX : LayoutTests/tables/mozilla_expected_failures/marvin/backgr
 BUG_DARIN WIN LINUX : LayoutTests/tables/mozilla_expected_failures/marvin/backgr_position-table-row-group.html = FAIL
 BUG_DARIN WIN LINUX : LayoutTests/tables/mozilla_expected_failures/marvin/backgr_position-table-row.html = FAIL
 
-// Test failures from WebKit merge 46369 to 46417
+// Test failures from WebKit merge 46369 to 46426
+BUG_PKASTING WIN : LayoutTests/http/tests/security/cross-frame-access-port-explicit-domain.html = FAIL
+BUG_PKASTING WIN : LayoutTests/http/tests/xmlhttprequest/cross-origin-authorization.html = TIMEOUT
+BUG_PKASTING WIN : LayoutTests/media/video-source-type-params.html = CRASH
 BUG_PKASTING WIN LINUX : LayoutTests/editing/style/remove-underline-from-stylesheet.html = FAIL
-BUG_PKASTING MAC : LayoutTests/svg/W3C-SVG-1.1/struct-dom-01-b.svg = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/custom/baseval-animval-equality.svg = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/custom/dynamic-svg-document-creation.svg = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/custom/js-update-gradient.svg = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/custom/js-update-pattern.svg = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/custom/svg-xml-dom-sync.html = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/custom/text-dom-01-f.svg = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/custom/use-instanceRoot-event-bubbling.xhtml = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/custom/use-property-changes-through-svg-dom.svg = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/custom/viewport-update2.svg = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/dom/animated-tearoff-equality.xhtml = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/dom/animated-tearoff-lifespan.xhtml = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGCircleElement-svgdom-cx-prop.html = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGCircleElement-svgdom-cy-prop.html = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGCircleElement-svgdom-r-prop.html = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGCursorElement-svgdom-x-prop.html = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGCursorElement-svgdom-y-prop.html = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGEllipseElement-svgdom-cx-prop.html = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGEllipseElement-svgdom-cy-prop.html = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGEllipseElement-svgdom-rx-prop.html = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGEllipseElement-svgdom-ry-prop.html = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGForeignObjectElement-svgdom-height-prop.html = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGForeignObjectElement-svgdom-width-prop.html = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGForeignObjectElement-svgdom-x-prop.html = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGForeignObjectElement-svgdom-y-prop.html = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGImageElement-svgdom-height-prop.html = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGImageElement-svgdom-width-prop.html = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGImageElement-svgdom-x-prop.html = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGImageElement-svgdom-y-prop.html = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGLineElement-svgdom-x1-prop.html = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGLineElement-svgdom-x2-prop.html = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGLineElement-svgdom-y1-prop.html = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGLineElement-svgdom-y2-prop.html = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-svgdom-x1-prop.html = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-svgdom-x2-prop.html = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-svgdom-y1-prop.html = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-svgdom-y2-prop.html = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-markerHeight-prop.html = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-markerWidth-prop.html = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-refX-prop.html = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-refY-prop.html = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGMaskElement-svgdom-height-prop.html = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGMaskElement-svgdom-width-prop.html = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGMaskElement-svgdom-x-prop.html = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGMaskElement-svgdom-y-prop.html = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGPatternElement-svgdom-height-prop.html = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGPatternElement-svgdom-width-prop.html = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGPatternElement-svgdom-x-prop.html = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGPatternElement-svgdom-y-prop.html = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-svgdom-cx-prop.html = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-svgdom-cy-prop.html = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-svgdom-fx-prop.html = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-svgdom-fy-prop.html = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-svgdom-r-prop.html = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGRectElement-svgdom-height-prop.html = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGRectElement-svgdom-width-prop.html = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGRectElement-svgdom-x-prop.html = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/dynamic-updates/SVGRectElement-svgdom-y-prop.html = CRASH
-BUG_PKASTING MAC : LayoutTests/svg/hixie/dynamic/005.xml = CRASH
+BUG_PKASTING LINUX : LayoutTests/fast/canvas/image-pattern-rotate.html = FAIL
+BUG17845 : LayoutTests/svg/W3C-SVG-1.1/struct-dom-01-b.svg = CRASH
+BUG17845 : LayoutTests/svg/custom/baseval-animval-equality.svg = CRASH
+BUG17845 : LayoutTests/svg/custom/dynamic-svg-document-creation.svg = CRASH
+BUG17845 : LayoutTests/svg/custom/js-update-gradient.svg = CRASH
+BUG17845 : LayoutTests/svg/custom/js-update-pattern.svg = CRASH
+BUG17845 : LayoutTests/svg/custom/svg-xml-dom-sync.html = CRASH
+BUG17845 : LayoutTests/svg/custom/text-dom-01-f.svg = CRASH
+BUG17845 : LayoutTests/svg/custom/use-instanceRoot-event-bubbling.xhtml = CRASH
+BUG17845 : LayoutTests/svg/custom/use-property-changes-through-svg-dom.svg = CRASH
+BUG17845 : LayoutTests/svg/custom/viewport-update2.svg = CRASH
+BUG17845 : LayoutTests/svg/dom/animated-tearoff-equality.xhtml = CRASH
+BUG17845 : LayoutTests/svg/dom/animated-tearoff-lifespan.xhtml = CRASH
+BUG17845 : LayoutTests/svg/dynamic-updates/SVGCircleElement-svgdom-cx-prop.html = CRASH
+BUG17845 : LayoutTests/svg/dynamic-updates/SVGCircleElement-svgdom-cy-prop.html = CRASH
+BUG17845 : LayoutTests/svg/dynamic-updates/SVGCircleElement-svgdom-r-prop.html = CRASH
+BUG17845 : LayoutTests/svg/dynamic-updates/SVGCursorElement-svgdom-x-prop.html = CRASH
+BUG17845 : LayoutTests/svg/dynamic-updates/SVGCursorElement-svgdom-y-prop.html = CRASH
+BUG17845 : LayoutTests/svg/dynamic-updates/SVGEllipseElement-svgdom-cx-prop.html = CRASH
+BUG17845 : LayoutTests/svg/dynamic-updates/SVGEllipseElement-svgdom-cy-prop.html = CRASH
+BUG17845 : LayoutTests/svg/dynamic-updates/SVGEllipseElement-svgdom-rx-prop.html = CRASH
+BUG17845 : LayoutTests/svg/dynamic-updates/SVGEllipseElement-svgdom-ry-prop.html = CRASH
+BUG17845 : LayoutTests/svg/dynamic-updates/SVGForeignObjectElement-svgdom-height-prop.html = CRASH
+BUG17845 : LayoutTests/svg/dynamic-updates/SVGForeignObjectElement-svgdom-width-prop.html = CRASH
+BUG17845 : LayoutTests/svg/dynamic-updates/SVGForeignObjectElement-svgdom-x-prop.html = CRASH
+BUG17845 : LayoutTests/svg/dynamic-updates/SVGForeignObjectElement-svgdom-y-prop.html = CRASH
+BUG17845 : LayoutTests/svg/dynamic-updates/SVGImageElement-svgdom-height-prop.html = CRASH
+BUG17845 : LayoutTests/svg/dynamic-updates/SVGImageElement-svgdom-width-prop.html = CRASH
+BUG17845 : LayoutTests/svg/dynamic-updates/SVGImageElement-svgdom-x-prop.html = CRASH
+BUG17845 : LayoutTests/svg/dynamic-updates/SVGImageElement-svgdom-y-prop.html = CRASH
+BUG17845 : LayoutTests/svg/dynamic-updates/SVGLineElement-svgdom-x1-prop.html = CRASH
+BUG17845 : LayoutTests/svg/dynamic-updates/SVGLineElement-svgdom-x2-prop.html = CRASH
+BUG17845 : LayoutTests/svg/dynamic-updates/SVGLineElement-svgdom-y1-prop.html = CRASH
+BUG17845 : LayoutTests/svg/dynamic-updates/SVGLineElement-svgdom-y2-prop.html = CRASH
+BUG17845 : LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-svgdom-x1-prop.html = CRASH
+BUG17845 : LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-svgdom-x2-prop.html = CRASH
+BUG17845 : LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-svgdom-y1-prop.html = CRASH
+BUG17845 : LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-svgdom-y2-prop.html = CRASH
+BUG17845 : LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-markerHeight-prop.html = CRASH
+BUG17845 : LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-markerWidth-prop.html = CRASH
+BUG17845 : LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-refX-prop.html = CRASH
+BUG17845 : LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-refY-prop.html = CRASH
+BUG17845 : LayoutTests/svg/dynamic-updates/SVGMaskElement-svgdom-height-prop.html = CRASH
+BUG17845 : LayoutTests/svg/dynamic-updates/SVGMaskElement-svgdom-width-prop.html = CRASH
+BUG17845 : LayoutTests/svg/dynamic-updates/SVGMaskElement-svgdom-x-prop.html = CRASH
+BUG17845 : LayoutTests/svg/dynamic-updates/SVGMaskElement-svgdom-y-prop.html = CRASH
+BUG17845 : LayoutTests/svg/dynamic-updates/SVGPatternElement-svgdom-height-prop.html = CRASH
+BUG17845 : LayoutTests/svg/dynamic-updates/SVGPatternElement-svgdom-width-prop.html = CRASH
+BUG17845 : LayoutTests/svg/dynamic-updates/SVGPatternElement-svgdom-x-prop.html = CRASH
+BUG17845 : LayoutTests/svg/dynamic-updates/SVGPatternElement-svgdom-y-prop.html = CRASH
+BUG17845 : LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-svgdom-cx-prop.html = CRASH
+BUG17845 : LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-svgdom-cy-prop.html = CRASH
+BUG17845 : LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-svgdom-fx-prop.html = CRASH
+BUG17845 : LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-svgdom-fy-prop.html = CRASH
+BUG17845 : LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-svgdom-r-prop.html = CRASH
+BUG17845 : LayoutTests/svg/dynamic-updates/SVGRectElement-svgdom-height-prop.html = CRASH
+BUG17845 : LayoutTests/svg/dynamic-updates/SVGRectElement-svgdom-width-prop.html = CRASH
+BUG17845 : LayoutTests/svg/dynamic-updates/SVGRectElement-svgdom-x-prop.html = CRASH
+BUG17845 : LayoutTests/svg/dynamic-updates/SVGRectElement-svgdom-y-prop.html = CRASH
+BUG17845 : LayoutTests/svg/hixie/dynamic/005.xml = CRASH
 // This was already SLOW FAIL, only CRASH is new
-BUG_PKASTING SLOW MAC : LayoutTests/http/tests/misc/acid3.html = FAIL CRASH
+BUG17845 SLOW : LayoutTests/http/tests/misc/acid3.html = FAIL CRASH