From 843da70a1a04dd726e84f5069a7d56bdfed44d10 Mon Sep 17 00:00:00 2001 From: Jonathan Watt Date: Fri, 26 Jan 2018 10:39:11 +0000 Subject: [PATCH] Bug 1436438 part 1 - Remove the tests that test SVG path data DOM interfaces. r=longsonr MozReview-Commit-ID: 78yzAb6Khf1 --- dom/svg/crashtests/367357-1.xhtml | 20 --- dom/svg/crashtests/369249-1.svg | 20 --- dom/svg/crashtests/372046-1.svg | 17 --- dom/svg/crashtests/372046-2.svg | 17 --- dom/svg/crashtests/435209-1.svg | 11 -- dom/svg/crashtests/crashtests.list | 5 - dom/svg/test/mochitest.ini | 4 +- dom/svg/test/test_SVGPathSegList.xhtml | 128 ---------------- dom/svg/test/test_SVGxxxList.xhtml | 57 ------- dom/svg/test/test_SVGxxxListIndexing.xhtml | 7 - dom/svg/test/test_pathLength.html | 58 ------- dom/svg/test/test_pathSeg.xhtml | 142 ------------------ .../mochitest/general/test_interfaces.js | 40 ----- layout/reftests/svg/path-03.svg | 29 ---- layout/reftests/svg/reftest.list | 1 - layout/svg/crashtests/327709-1.svg | 17 --- layout/svg/crashtests/crashtests.list | 1 - .../web-platform/meta/svg/historical.html.ini | 3 - 18 files changed, 1 insertion(+), 576 deletions(-) delete mode 100644 dom/svg/crashtests/367357-1.xhtml delete mode 100644 dom/svg/crashtests/369249-1.svg delete mode 100644 dom/svg/crashtests/372046-1.svg delete mode 100644 dom/svg/crashtests/372046-2.svg delete mode 100644 dom/svg/crashtests/435209-1.svg delete mode 100644 dom/svg/test/test_SVGPathSegList.xhtml delete mode 100644 dom/svg/test/test_pathLength.html delete mode 100644 dom/svg/test/test_pathSeg.xhtml delete mode 100644 layout/reftests/svg/path-03.svg delete mode 100644 layout/svg/crashtests/327709-1.svg diff --git a/dom/svg/crashtests/367357-1.xhtml b/dom/svg/crashtests/367357-1.xhtml deleted file mode 100644 index 207e2daee32a..000000000000 --- a/dom/svg/crashtests/367357-1.xhtml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/dom/svg/crashtests/369249-1.svg b/dom/svg/crashtests/369249-1.svg deleted file mode 100644 index 64d55869b1fe..000000000000 --- a/dom/svg/crashtests/369249-1.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - -function boom() -{ - try { - document.getElementById("path").pathSegList.getItem(-10000000); - } catch(e) { - } -} - - - - - - diff --git a/dom/svg/crashtests/372046-1.svg b/dom/svg/crashtests/372046-1.svg deleted file mode 100644 index e18660c24c58..000000000000 --- a/dom/svg/crashtests/372046-1.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - diff --git a/dom/svg/crashtests/372046-2.svg b/dom/svg/crashtests/372046-2.svg deleted file mode 100644 index e18660c24c58..000000000000 --- a/dom/svg/crashtests/372046-2.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - diff --git a/dom/svg/crashtests/435209-1.svg b/dom/svg/crashtests/435209-1.svg deleted file mode 100644 index d674d50ed637..000000000000 --- a/dom/svg/crashtests/435209-1.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - \ No newline at end of file diff --git a/dom/svg/crashtests/crashtests.list b/dom/svg/crashtests/crashtests.list index 10f9654995be..667704058b21 100644 --- a/dom/svg/crashtests/crashtests.list +++ b/dom/svg/crashtests/crashtests.list @@ -4,14 +4,10 @@ load 336994-1.html load 344888-1.svg load 345445-1.svg load 360836-1.svg -load 367357-1.xhtml load 369051-1.svg -load 369249-1.svg load 369291-1.svg load 369291-2.svg load 369568-1.svg -load 372046-1.svg -load 372046-2.svg load 374882-1.svg load 380101-1.svg load 381777-1.svg @@ -41,7 +37,6 @@ load 414188-1.svg load 427325-1.svg load 428228-1.svg load 428841-1.svg -load 435209-1.svg load 436418-mpathRoot-1.svg load 448244-1.svg load 466576-1.xhtml diff --git a/dom/svg/test/mochitest.ini b/dom/svg/test/mochitest.ini index a5885bdbaf14..e257087af5db 100644 --- a/dom/svg/test/mochitest.ini +++ b/dom/svg/test/mochitest.ini @@ -55,8 +55,7 @@ skip-if = true # disabled-for-intermittent-failures--bug-701060 [test_object-delayed-intrinsic-size.html] [test_onerror.xhtml] [test_pathAnimInterpolation.xhtml] -[test_pathLength.html] -[test_pathSeg.xhtml] +skip-if = true # We need to polyfill the SVG DOM for path data [test_pointAtLength.xhtml] [test_pointer-events-1a.xhtml] [test_pointer-events-1b.xhtml] @@ -77,7 +76,6 @@ skip-if = android_version == '18' # bug 1147994 [test_SVGMatrix.xhtml] [test_SVG_namespace_ids.html] [test_SVGNumberList.xhtml] -[test_SVGPathSegList.xhtml] [test_SVGPointList.xhtml] [test_SVGStringList.xhtml] [test_SVGStyleElement.xhtml] diff --git a/dom/svg/test/test_SVGPathSegList.xhtml b/dom/svg/test/test_SVGPathSegList.xhtml deleted file mode 100644 index d6f060f33f99..000000000000 --- a/dom/svg/test/test_SVGPathSegList.xhtml +++ /dev/null @@ -1,128 +0,0 @@ - - - - Generic tests for SVG animated length lists - - - - - -Mozilla Bug 611138 -

- -
-
-
- - diff --git a/dom/svg/test/test_SVGxxxList.xhtml b/dom/svg/test/test_SVGxxxList.xhtml index 6c40c8ebdb54..a59595b4a749 100644 --- a/dom/svg/test/test_SVGxxxList.xhtml +++ b/dom/svg/test/test_SVGxxxList.xhtml @@ -222,61 +222,6 @@ var tests = [ is(itemA.y, itemB.y, message); } }, - { - // SVGPathSegList test: - target_element_id: 'path', - attr_name: 'd', - prop_name: null, // SVGAnimatedPathData is an inherited interface! - bv_name: 'pathSegList', - av_name: 'animatedPathSegList', - el_type: 'SVGPathElement', - prop_type: null, - list_type: 'SVGPathSegList', - item_type: 'SVGPathSeg', - attr_val_3a: 'M 10,10 L 50,50 L 90,10', - attr_val_3b: 'M 10,50 L 50,10 L 90,50', - attr_val_4 : 'M 10,10 L 50,50 L 90,10 M 200,100', - attr_val_5a: 'M 10,10 L 50,50 L 90,10 L 130,50 L 170,10', - attr_val_5b: 'M 50,10 L 50,10 L 90,50 L 130,10 L 170,50', - attr_val_5b_firstItem_x3_constructor: function(constructor) { - var expected = constructor(); - is(expected.pathSegTypeAsLetter, "M", - "test error -- expected constructor to generate a segment of type M"); - expected.x = 150; - expected.y = 30; - return expected; - }, - item_constructor: function() { - // XXX return different values each time - return document.getElementById('path').createSVGPathSegMovetoAbs(1, 1); - }, - item_is: function(itemA, itemB, message) { - ok(typeof(itemA.pathSegTypeAsLetter) != 'undefined' && - typeof(itemB.pathSegTypeAsLetter) != 'undefined', - 'expecting pathSegTypeAsLetter property'); - - // First: are we dealing with the same type of segment? - is(itemA.pathSegTypeAsLetter, itemB.pathSegTypeAsLetter, message); - if (itemA.pathSegTypeAsLetter != itemB.pathSegTypeAsLetter) - return; // The rest of this function is nonsense if types don't match. - - // Make sure property-counts match (so we can iterate across itemA's - // properties and not worry about itemB having extra properties that - // we might be skipping over). - is(keys(itemA).length, keys(itemB).length, - 'expecting same property-count when comparing path segs of same type.'); - - // Compare the properties, skipping the constant properties inherited - // from 'SVGPathSeg', and skipping the pathSegTypeAsLetter field since we - // already checked that above. - for (var prop in itemA) { - if (!SVGPathSeg.hasOwnProperty(prop) && - prop != 'pathSegTypeAsLetter') { - is(itemA[prop], itemB[prop], message); - } - } - } - }, { // SVGStringList test: target_element_id: 'g', @@ -1170,14 +1115,12 @@ function run_animation_timeline_tests() 'in the '+t.list_type+' for '+t.bv_path+' to 5.'); // TODO - if (t.list_type != 'SVGPathSegList') { ok(t.animVal.getItem(3) === t.old_animVal_items[3], 'When affected by SMIL animation, list items in the '+t.list_type+ ' for '+t.bv_path+' that are at indexes that existed prior to the '+ 'start of the animation should be the exact same objects as the '+ 'objects that were at those indexes prior to the start of the '+ 'animation.'); - } t.old_animVal_items = get_array_of_list_items(t.animVal); diff --git a/dom/svg/test/test_SVGxxxListIndexing.xhtml b/dom/svg/test/test_SVGxxxListIndexing.xhtml index 4ba2e737ae98..e0b87bacb1e0 100644 --- a/dom/svg/test/test_SVGxxxListIndexing.xhtml +++ b/dom/svg/test/test_SVGxxxListIndexing.xhtml @@ -48,13 +48,6 @@ var tests = [ subtests: [ { values: null, length: 3 }, { values: "10", length: 1 }, { values: "1 2 3 4 5", length: 5 } ] }, - { element: path, - attribute: "d", - listProperty: "pathSegList", - type: "SVGPathSegList", - subtests: [ { values: null, length: 2 }, - { values: "M50,50", length: 1 }, - { values: "M0,0 h10 v20 h30 v40", length: 5 } ] }, { element: poly, attribute: "points", listProperty: "animatedPoints", diff --git a/dom/svg/test/test_pathLength.html b/dom/svg/test/test_pathLength.html deleted file mode 100644 index 169e7dca54d8..000000000000 --- a/dom/svg/test/test_pathLength.html +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - Test path length changes when manipulated - - - - -Mozilla Bug 1024926 -

- -
-
-
- - diff --git a/dom/svg/test/test_pathSeg.xhtml b/dom/svg/test/test_pathSeg.xhtml deleted file mode 100644 index d7fbc49fad35..000000000000 --- a/dom/svg/test/test_pathSeg.xhtml +++ /dev/null @@ -1,142 +0,0 @@ - - - - - Test for Bug 459953 - - - - -Mozilla Bug 459953 -

- -
-
-
- - diff --git a/dom/tests/mochitest/general/test_interfaces.js b/dom/tests/mochitest/general/test_interfaces.js index fd652782cfa5..bdd6f803b46f 100644 --- a/dom/tests/mochitest/general/test_interfaces.js +++ b/dom/tests/mochitest/general/test_interfaces.js @@ -1026,48 +1026,8 @@ var interfaceNamesInGlobalScope = {name: "SVGNumberList", insecureContext: true}, // IMPORTANT: Do not change this list without review from a DOM peer! {name: "SVGPathElement", insecureContext: true}, -// IMPORTANT: Do not change this list without review from a DOM peer! - {name: "SVGPathSeg", insecureContext: true}, -// IMPORTANT: Do not change this list without review from a DOM peer! - {name: "SVGPathSegArcAbs", insecureContext: true}, -// IMPORTANT: Do not change this list without review from a DOM peer! - {name: "SVGPathSegArcRel", insecureContext: true}, -// IMPORTANT: Do not change this list without review from a DOM peer! - {name: "SVGPathSegClosePath", insecureContext: true}, -// IMPORTANT: Do not change this list without review from a DOM peer! - {name: "SVGPathSegCurvetoCubicAbs", insecureContext: true}, -// IMPORTANT: Do not change this list without review from a DOM peer! - {name: "SVGPathSegCurvetoCubicRel", insecureContext: true}, -// IMPORTANT: Do not change this list without review from a DOM peer! - {name: "SVGPathSegCurvetoCubicSmoothAbs", insecureContext: true}, -// IMPORTANT: Do not change this list without review from a DOM peer! - {name: "SVGPathSegCurvetoCubicSmoothRel", insecureContext: true}, -// IMPORTANT: Do not change this list without review from a DOM peer! - {name: "SVGPathSegCurvetoQuadraticAbs", insecureContext: true}, -// IMPORTANT: Do not change this list without review from a DOM peer! - {name: "SVGPathSegCurvetoQuadraticRel", insecureContext: true}, -// IMPORTANT: Do not change this list without review from a DOM peer! - {name: "SVGPathSegCurvetoQuadraticSmoothAbs", insecureContext: true}, -// IMPORTANT: Do not change this list without review from a DOM peer! - {name: "SVGPathSegCurvetoQuadraticSmoothRel", insecureContext: true}, -// IMPORTANT: Do not change this list without review from a DOM peer! - {name: "SVGPathSegLinetoAbs", insecureContext: true}, -// IMPORTANT: Do not change this list without review from a DOM peer! - {name: "SVGPathSegLinetoHorizontalAbs", insecureContext: true}, -// IMPORTANT: Do not change this list without review from a DOM peer! - {name: "SVGPathSegLinetoHorizontalRel", insecureContext: true}, -// IMPORTANT: Do not change this list without review from a DOM peer! - {name: "SVGPathSegLinetoRel", insecureContext: true}, -// IMPORTANT: Do not change this list without review from a DOM peer! - {name: "SVGPathSegLinetoVerticalAbs", insecureContext: true}, -// IMPORTANT: Do not change this list without review from a DOM peer! - {name: "SVGPathSegLinetoVerticalRel", insecureContext: true}, // IMPORTANT: Do not change this list without review from a DOM peer! {name: "SVGPathSegList", insecureContext: true}, -// IMPORTANT: Do not change this list without review from a DOM peer! - {name: "SVGPathSegMovetoAbs", insecureContext: true}, -// IMPORTANT: Do not change this list without review from a DOM peer! - {name: "SVGPathSegMovetoRel", insecureContext: true}, // IMPORTANT: Do not change this list without review from a DOM peer! {name: "SVGPatternElement", insecureContext: true}, // IMPORTANT: Do not change this list without review from a DOM peer! diff --git a/layout/reftests/svg/path-03.svg b/layout/reftests/svg/path-03.svg deleted file mode 100644 index f3f8c57df088..000000000000 --- a/layout/reftests/svg/path-03.svg +++ /dev/null @@ -1,29 +0,0 @@ - - - - Testcase for invalid path - - - - - - - - - - - - - diff --git a/layout/reftests/svg/reftest.list b/layout/reftests/svg/reftest.list index f8939cedc72a..f212ad5a5e50 100644 --- a/layout/reftests/svg/reftest.list +++ b/layout/reftests/svg/reftest.list @@ -340,7 +340,6 @@ pref(svg.paint-order.enabled,true) == paint-order-03.svg paint-order-03-ref.svg #fuzzy(23,60) fails-if(d2d) == path-01.svg path-01-ref.svg == path-02.svg pass.svg -== path-03.svg pass.svg == path-04.svg pass.svg == path-05.svg pass.svg fuzzy-if(skiaContent,1,400) == path-06.svg path-06-ref.svg diff --git a/layout/svg/crashtests/327709-1.svg b/layout/svg/crashtests/327709-1.svg deleted file mode 100644 index ce0711427275..000000000000 --- a/layout/svg/crashtests/327709-1.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - diff --git a/layout/svg/crashtests/crashtests.list b/layout/svg/crashtests/crashtests.list index 892505482e34..dd059b263241 100644 --- a/layout/svg/crashtests/crashtests.list +++ b/layout/svg/crashtests/crashtests.list @@ -15,7 +15,6 @@ load 325427-1.svg load 326495-1.svg load 326974-1.svg load 327706-1.svg -load 327709-1.svg load 327711-1.svg load 328137-1.svg load 329848-1.svg diff --git a/testing/web-platform/meta/svg/historical.html.ini b/testing/web-platform/meta/svg/historical.html.ini index d8718814e53a..6d66f5575efc 100644 --- a/testing/web-platform/meta/svg/historical.html.ini +++ b/testing/web-platform/meta/svg/historical.html.ini @@ -1,7 +1,4 @@ [historical.html] - [SVGPathSeg interface must be removed] - expected: FAIL - [SVGUnitTypes mixin interface must not be exposed] expected: FAIL