From dadae0959cb255d6d8fddb8d62ed082a350e2971 Mon Sep 17 00:00:00 2001 From: Max Vujovic Date: Mon, 23 Jun 2014 13:18:00 -0400 Subject: [PATCH] Bug 948265 - Move SVG filter chain tests into their own folder to make their filenames more readable. r=mstange --HG-- rename : layout/reftests/svg/filters/multiple-svg-filters-long-chain.svg => layout/reftests/svg/filters/svg-filter-chains/long-chain.svg rename : layout/reftests/svg/filters/multiple-svg-filters-with-multiple-primitives.svg => layout/reftests/svg/filters/svg-filter-chains/multiple-primitives-per-filter.svg rename : layout/reftests/svg/filters/multiple-svg-filters-second-uses-SourceGraphic.svg => layout/reftests/svg/filters/svg-filter-chains/second-filter-uses-SourceGraphic.svg rename : layout/reftests/svg/filters/multiple-svg-filters-ref.svg => layout/reftests/svg/filters/svg-filter-chains/simple-chain-ref.svg rename : layout/reftests/svg/filters/multiple-svg-filters.svg => layout/reftests/svg/filters/svg-filter-chains/simple-chain.svg --- layout/reftests/svg/filters/reftest.list | 8 +++----- .../long-chain.svg} | 0 .../multiple-primitives-per-filter.svg} | 0 .../reftests/svg/filters/svg-filter-chains/reftest.list | 9 +++++++++ .../second-filter-uses-SourceGraphic.svg} | 0 .../simple-chain-ref.svg} | 0 .../simple-chain.svg} | 0 7 files changed, 12 insertions(+), 5 deletions(-) rename layout/reftests/svg/filters/{multiple-svg-filters-long-chain.svg => svg-filter-chains/long-chain.svg} (100%) rename layout/reftests/svg/filters/{multiple-svg-filters-with-multiple-primitives.svg => svg-filter-chains/multiple-primitives-per-filter.svg} (100%) create mode 100644 layout/reftests/svg/filters/svg-filter-chains/reftest.list rename layout/reftests/svg/filters/{multiple-svg-filters-second-uses-SourceGraphic.svg => svg-filter-chains/second-filter-uses-SourceGraphic.svg} (100%) rename layout/reftests/svg/filters/{multiple-svg-filters-ref.svg => svg-filter-chains/simple-chain-ref.svg} (100%) rename layout/reftests/svg/filters/{multiple-svg-filters.svg => svg-filter-chains/simple-chain.svg} (100%) diff --git a/layout/reftests/svg/filters/reftest.list b/layout/reftests/svg/filters/reftest.list index 1eae56db81f..74a611ce1c0 100644 --- a/layout/reftests/svg/filters/reftest.list +++ b/layout/reftests/svg/filters/reftest.list @@ -2,6 +2,9 @@ # subregion. The fe*-2 tests test with no clipping (which stresses # the automatic optimal surface-size computation a bit more). +# SVG filter chain tests +include svg-filter-chains/reftest.list + skip-if(B2G) == dynamic-filtered-foreignObject-01.svg pass.svg # bug 773482 random-if(B2G&&browserIsRemote) == dynamic-filter-invalidation-01.svg pass.svg == dynamic-filter-invalidation-02.svg pass.svg @@ -102,8 +105,3 @@ fuzzy(2,2659) skip-if(d2d) == feSpecularLighting-1.svg feSpecularLighting-1-ref. == fePointLight-zoomed-page.svg fePointLight-zoomed-page-ref.svg == feTurbulence-offset.svg feTurbulence-offset-ref.svg - -pref(layout.css.filters.enabled,true) == multiple-svg-filters.svg multiple-svg-filters-ref.svg -pref(layout.css.filters.enabled,true) == multiple-svg-filters-long-chain.svg multiple-svg-filters-ref.svg -pref(layout.css.filters.enabled,true) == multiple-svg-filters-second-uses-SourceGraphic.svg multiple-svg-filters-ref.svg -pref(layout.css.filters.enabled,true) == multiple-svg-filters-with-multiple-primitives.svg multiple-svg-filters-ref.svg diff --git a/layout/reftests/svg/filters/multiple-svg-filters-long-chain.svg b/layout/reftests/svg/filters/svg-filter-chains/long-chain.svg similarity index 100% rename from layout/reftests/svg/filters/multiple-svg-filters-long-chain.svg rename to layout/reftests/svg/filters/svg-filter-chains/long-chain.svg diff --git a/layout/reftests/svg/filters/multiple-svg-filters-with-multiple-primitives.svg b/layout/reftests/svg/filters/svg-filter-chains/multiple-primitives-per-filter.svg similarity index 100% rename from layout/reftests/svg/filters/multiple-svg-filters-with-multiple-primitives.svg rename to layout/reftests/svg/filters/svg-filter-chains/multiple-primitives-per-filter.svg diff --git a/layout/reftests/svg/filters/svg-filter-chains/reftest.list b/layout/reftests/svg/filters/svg-filter-chains/reftest.list new file mode 100644 index 00000000000..d95c17e020f --- /dev/null +++ b/layout/reftests/svg/filters/svg-filter-chains/reftest.list @@ -0,0 +1,9 @@ +# These tests verify that SVG filter chains behave properly. +# e.g. filter: url(#f1) url(#f2) url(#f3) + +default-preferences pref(layout.css.filters.enabled,true) + +== long-chain.svg simple-chain-ref.svg +== multiple-primitives-per-filter.svg simple-chain-ref.svg +== second-filter-uses-SourceGraphic.svg simple-chain-ref.svg +== simple-chain.svg simple-chain-ref.svg diff --git a/layout/reftests/svg/filters/multiple-svg-filters-second-uses-SourceGraphic.svg b/layout/reftests/svg/filters/svg-filter-chains/second-filter-uses-SourceGraphic.svg similarity index 100% rename from layout/reftests/svg/filters/multiple-svg-filters-second-uses-SourceGraphic.svg rename to layout/reftests/svg/filters/svg-filter-chains/second-filter-uses-SourceGraphic.svg diff --git a/layout/reftests/svg/filters/multiple-svg-filters-ref.svg b/layout/reftests/svg/filters/svg-filter-chains/simple-chain-ref.svg similarity index 100% rename from layout/reftests/svg/filters/multiple-svg-filters-ref.svg rename to layout/reftests/svg/filters/svg-filter-chains/simple-chain-ref.svg diff --git a/layout/reftests/svg/filters/multiple-svg-filters.svg b/layout/reftests/svg/filters/svg-filter-chains/simple-chain.svg similarity index 100% rename from layout/reftests/svg/filters/multiple-svg-filters.svg rename to layout/reftests/svg/filters/svg-filter-chains/simple-chain.svg