diff options
author | tkent@chromium.org <tkent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-05 23:56:19 +0000 |
---|---|---|
committer | tkent@chromium.org <tkent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-05 23:56:19 +0000 |
commit | 5efb4a5d61617525f55feb01964159c1ce740a0c (patch) | |
tree | 0ef79f30c988ae533f4e69a53a3ca78ebf95eba7 /webkit | |
parent | 52b5206c50899606d03b5c0d75645520a65d784f (diff) | |
download | chromium_src-5efb4a5d61617525f55feb01964159c1ce740a0c.zip chromium_src-5efb4a5d61617525f55feb01964159c1ce740a0c.tar.gz chromium_src-5efb4a5d61617525f55feb01964159c1ce740a0c.tar.bz2 |
test_shell: Implement the additional bool flag for
layoutTestController.dumpAsText() to support text dump + image dump. It was
introduced by WebKit r63536.
BUG=50197
TEST=none
Review URL: http://codereview.chromium.org/3302006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58615 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 186 | ||||
-rw-r--r-- | webkit/tools/test_shell/layout_test_controller.cc | 7 | ||||
-rw-r--r-- | webkit/tools/test_shell/layout_test_controller.h | 5 | ||||
-rw-r--r-- | webkit/tools/test_shell/test_shell.cc | 3 |
4 files changed, 199 insertions, 2 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 04caef1..5514b43 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -32,6 +32,192 @@ BUGWK44945 MAC : fast/files/apply-blob-url-to-img.html = IMAGE // Newly added test apparently misbehaves. BUGWK45102 : media/media-can-play-mpeg4-video.html = TEXT +// Need rebaline. +BUG50197 WIN LINUX : svg/dynamic-updates/SVGCircleElement-dom-cx-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGCircleElement-dom-cy-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGCircleElement-dom-r-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGCircleElement-svgdom-cx-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGCircleElement-svgdom-cy-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGCircleElement-svgdom-r-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGClipPath-influences-hitTesting.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGClipPathElement-dom-clipPathUnits-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGClipPathElement-svgdom-clipPathUnits-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGCursorElement-dom-x-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGCursorElement-dom-y-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGCursorElement-svgdom-x-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGCursorElement-svgdom-y-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGEllipseElement-dom-cx-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGEllipseElement-dom-cy-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGEllipseElement-dom-rx-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGEllipseElement-dom-ry-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGEllipseElement-svgdom-cx-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGEllipseElement-svgdom-cy-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGEllipseElement-svgdom-rx-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGEllipseElement-svgdom-ry-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFEDiffuseLightingElement-dom-diffuseConstant-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFEDiffuseLightingElement-dom-in-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFEDiffuseLightingElement-dom-lighting-color-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFEDiffuseLightingElement-dom-surfaceScale-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFEDiffuseLightingElement-svgdom-diffuseConstant-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFEDiffuseLightingElement-svgdom-in-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFEDiffuseLightingElement-svgdom-surfaceScale-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFEOffsetElement-dom-dx-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFEOffsetElement-dom-dy-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFEOffsetElement-dom-in-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFEOffsetElement-svgdom-dx-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFEOffsetElement-svgdom-dy-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFEOffsetElement-svgdom-in-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFilterElement-dom-filterRes-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFilterElement-dom-filterUnits-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFilterElement-dom-height-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFilterElement-dom-primitiveUnits-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFilterElement-dom-width-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFilterElement-dom-x-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFilterElement-dom-y-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFilterElement-svgdom-filterRes-call.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFilterElement-svgdom-filterResX-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFilterElement-svgdom-filterResY-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFilterElement-svgdom-filterUnits-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFilterElement-svgdom-height-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFilterElement-svgdom-primitiveUnits-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFilterElement-svgdom-width-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFilterElement-svgdom-x-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFilterElement-svgdom-y-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFilterPrimitiveStandardAttributes-dom-height-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFilterPrimitiveStandardAttributes-dom-result-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFilterPrimitiveStandardAttributes-dom-width-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFilterPrimitiveStandardAttributes-dom-x-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFilterPrimitiveStandardAttributes-dom-y-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFilterPrimitiveStandardAttributes-svgdom-height-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFilterPrimitiveStandardAttributes-svgdom-result-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFilterPrimitiveStandardAttributes-svgdom-width-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFilterPrimitiveStandardAttributes-svgdom-x-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFilterPrimitiveStandardAttributes-svgdom-y-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGForeignObjectElement-dom-height-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGForeignObjectElement-dom-width-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGForeignObjectElement-dom-x-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGForeignObjectElement-dom-y-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGForeignObjectElement-svgdom-height-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGForeignObjectElement-svgdom-width-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGForeignObjectElement-svgdom-x-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGForeignObjectElement-svgdom-y-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGImageElement-dom-height-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGImageElement-dom-preserveAspectRatio-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGImageElement-dom-width-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGImageElement-dom-x-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGImageElement-dom-y-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGImageElement-svgdom-height-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGImageElement-svgdom-width-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGImageElement-svgdom-x-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGImageElement-svgdom-y-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGLineElement-dom-x1-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGLineElement-dom-x2-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGLineElement-dom-y1-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGLineElement-dom-y2-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGLineElement-svgdom-x1-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGLineElement-svgdom-x2-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGLineElement-svgdom-y1-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGLineElement-svgdom-y2-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGLinearGradientElement-dom-gradientTransform-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGLinearGradientElement-dom-gradientUnits-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGLinearGradientElement-dom-x1-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGLinearGradientElement-dom-x2-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGLinearGradientElement-dom-y1-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGLinearGradientElement-dom-y2-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGLinearGradientElement-svgdom-gradientUnits-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGLinearGradientElement-svgdom-x1-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGLinearGradientElement-svgdom-x2-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGLinearGradientElement-svgdom-y1-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGLinearGradientElement-svgdom-y2-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGMarkerElement-dom-markerHeight-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGMarkerElement-dom-markerUnits-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGMarkerElement-dom-markerWidth-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGMarkerElement-dom-orient-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGMarkerElement-dom-refX-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGMarkerElement-dom-refY-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGMarkerElement-svgdom-markerHeight-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGMarkerElement-svgdom-markerUnits-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGMarkerElement-svgdom-markerWidth-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGMarkerElement-svgdom-orientAngle-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGMarkerElement-svgdom-orientType-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGMarkerElement-svgdom-refX-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGMarkerElement-svgdom-refY-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGMarkerElement-svgdom-setOrientToAngle-call.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGMarkerElement-svgdom-setOrientToAuto-call.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGMaskElement-dom-height-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGMaskElement-dom-maskContentUnits-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGMaskElement-dom-maskUnits-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGMaskElement-dom-width-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGMaskElement-dom-x-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGMaskElement-dom-y-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGMaskElement-svgdom-height-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGMaskElement-svgdom-maskContentUnits-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGMaskElement-svgdom-maskUnits-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGMaskElement-svgdom-width-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGMaskElement-svgdom-x-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGMaskElement-svgdom-y-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGPatternElement-dom-height-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGPatternElement-dom-patternContentUnits-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGPatternElement-dom-patternTransform-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGPatternElement-dom-patternUnits-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGPatternElement-dom-width-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGPatternElement-dom-x-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGPatternElement-dom-y-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGPatternElement-svgdom-height-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGPatternElement-svgdom-patternContentUnits-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGPatternElement-svgdom-patternUnits-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGPatternElement-svgdom-width-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGPatternElement-svgdom-x-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGPatternElement-svgdom-y-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGRadialGradientElement-dom-cx-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGRadialGradientElement-dom-cy-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGRadialGradientElement-dom-fx-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGRadialGradientElement-dom-fy-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGRadialGradientElement-dom-gradientTransform-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGRadialGradientElement-dom-gradientUnits-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGRadialGradientElement-dom-r-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGRadialGradientElement-svgdom-cx-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGRadialGradientElement-svgdom-cy-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGRadialGradientElement-svgdom-fx-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGRadialGradientElement-svgdom-fy-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGRadialGradientElement-svgdom-gradientUnits-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGRadialGradientElement-svgdom-r-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGRectElement-dom-height-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGRectElement-dom-width-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGRectElement-dom-x-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGRectElement-dom-y-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGRectElement-svgdom-height-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGRectElement-svgdom-width-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGRectElement-svgdom-x-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGRectElement-svgdom-y-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGTRefElement-dom-href-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGTextElement-dom-transform-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGTextElement-svgdom-transform-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFESpotLightElement-dom-limitingConeAngle-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFESpotLightElement-dom-pointsAtX-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFESpotLightElement-dom-pointsAtY-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFESpotLightElement-dom-pointsAtZ-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFESpotLightElement-dom-specularExponent-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFESpotLightElement-dom-x-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFESpotLightElement-dom-y-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFESpotLightElement-dom-z-attr.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFESpotLightElement-svgdom-limitingConeAngle-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFESpotLightElement-svgdom-pointsAtX-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFESpotLightElement-svgdom-pointsAtY-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFESpotLightElement-svgdom-pointsAtZ-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFESpotLightElement-svgdom-specularExponent-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFESpotLightElement-svgdom-x-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFESpotLightElement-svgdom-y-prop.html = IMAGE +BUG50197 WIN LINUX : svg/dynamic-updates/SVGFESpotLightElement-svgdom-z-prop.html = IMAGE +BUG50197 WIN MAC LINUX : svg/dynamic-updates/SVGFEDiffuseLightingElement-lighting-color-css-prop.html = IMAGE +BUG50197 WIN MAC LINUX : svg/dynamic-updates/SVGImageElement-svgdom-preserveAspectRatio-prop.html = IMAGE +BUG50197 WIN MAC LINUX : svg/dynamic-updates/SVGLinearGradientElement-svgdom-gradientTransform-prop.html = IMAGE +BUG50197 WIN MAC LINUX : svg/dynamic-updates/SVGPatternElement-svgdom-patternTransform-prop.html = IMAGE +BUG50197 WIN MAC LINUX : svg/dynamic-updates/SVGRadialGradientElement-svgdom-gradientTransform-prop.html = IMAGE +// Upstream test_expectations.txt contains the entry for it as TEXT. We need to +// change it to IMAGE+TEXT because we started to check images. +BUG32153 : svg/dynamic-updates/SVGTextElement-svgdom-rotate-prop.html = IMAGE+TEXT + // Temporary disable test. Will investigate (antonm@chromium.org). BUGANTONM : fast/js/reserved-words-as-property.html = CRASH TEXT diff --git a/webkit/tools/test_shell/layout_test_controller.cc b/webkit/tools/test_shell/layout_test_controller.cc index 9ec3dfb..a04d22e 100644 --- a/webkit/tools/test_shell/layout_test_controller.cc +++ b/webkit/tools/test_shell/layout_test_controller.cc @@ -55,6 +55,7 @@ using WebKit::WebURL; TestShell* LayoutTestController::shell_ = NULL; // Most of these flags need to be cleared in Reset() so that they get turned // off between each test run. +bool LayoutTestController::generate_pixel_results_ = true; bool LayoutTestController::dump_as_text_ = false; bool LayoutTestController::dump_editing_callbacks_ = false; bool LayoutTestController::dump_frame_load_callbacks_ = false; @@ -256,8 +257,11 @@ void LayoutTestController::WorkQueue::AddWork(WorkItem* work) { } void LayoutTestController::dumpAsText(const CppArgumentList& args, - CppVariant* result) { + CppVariant* result) { dump_as_text_ = true; + generate_pixel_results_ = false; + if (args.size() > 0 && args[0].isBool()) + generate_pixel_results_ = args[0].value.boolValue; result->SetNull(); } @@ -494,6 +498,7 @@ void LayoutTestController::Reset() { #endif // defined(TOOLKIT_GTK) shell_->webView()->removeAllUserContent(); } + generate_pixel_results_ = true; dump_as_text_ = false; dump_editing_callbacks_ = false; dump_frame_load_callbacks_ = false; diff --git a/webkit/tools/test_shell/layout_test_controller.h b/webkit/tools/test_shell/layout_test_controller.h index 97e53bd..ca66448 100644 --- a/webkit/tools/test_shell/layout_test_controller.h +++ b/webkit/tools/test_shell/layout_test_controller.h @@ -294,6 +294,7 @@ class LayoutTestController : public CppBoundClass { void SetWorkQueueFrozen(bool frozen) { work_queue_.set_frozen(frozen); } bool ShouldDumpAsText() { return dump_as_text_; } + bool ShouldGeneratePixelResults() { return generate_pixel_results_; } bool ShouldDumpEditingCallbacks() { return dump_editing_callbacks_; } bool ShouldDumpFrameLoadCallbacks() { return dump_frame_load_callbacks_; } void SetShouldDumpFrameLoadCallbacks(bool value) { @@ -395,6 +396,10 @@ class LayoutTestController : public CppBoundClass { // text representation of the renderer. static bool dump_as_text_; + // If true, dump pixel results. This can be true even if + // dump_as_text_ is true. + static bool generate_pixel_results_; + // If true, the test_shell will write a descriptive line for each editing // command. static bool dump_editing_callbacks_; diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc index 3117277..c02a535 100644 --- a/webkit/tools/test_shell/test_shell.cc +++ b/webkit/tools/test_shell/test_shell.cc @@ -283,7 +283,8 @@ void TestShell::Dump(TestShell* shell) { } } - if (params->dump_pixels && !should_dump_as_text) { + if (params->dump_pixels + && shell->layout_test_controller()->ShouldGeneratePixelResults()) { // Image output: we write the image data to the file given on the // command line (for the dump pixels argument), and the MD5 sum to // stdout. |