From c4391552bc8a4e650a6d4ce2b209ee9adc0ad738 Mon Sep 17 00:00:00 2001 From: Robert Longson Date: Tue, 6 Feb 2018 21:35:34 +0000 Subject: [PATCH] Bug 1435568 - Remove SVGUnitTypes values from elements r=jwatt r=bkelly (DOM Peer) --- dom/svg/test/mochitest.ini | 1 - dom/svg/test/test_SVGUnitTypes.html | 41 ------------------- dom/webidl/SVGClipPathElement.webidl | 2 - dom/webidl/SVGFilterElement.webidl | 1 - dom/webidl/SVGGradientElement.webidl | 1 - dom/webidl/SVGMaskElement.webidl | 2 - dom/webidl/SVGPatternElement.webidl | 1 - dom/webidl/SVGUnitTypeValues.webidl | 19 --------- dom/webidl/SVGUnitTypes.webidl | 5 ++- dom/webidl/moz.build | 1 - .../web-platform/meta/svg/historical.html.ini | 15 ------- 11 files changed, 4 insertions(+), 85 deletions(-) delete mode 100644 dom/svg/test/test_SVGUnitTypes.html delete mode 100644 dom/webidl/SVGUnitTypeValues.webidl diff --git a/dom/svg/test/mochitest.ini b/dom/svg/test/mochitest.ini index ddc0e4b4725c..a5885bdbaf14 100644 --- a/dom/svg/test/mochitest.ini +++ b/dom/svg/test/mochitest.ini @@ -83,7 +83,6 @@ skip-if = android_version == '18' # bug 1147994 [test_SVGStyleElement.xhtml] [test_SVGTransformListAddition.xhtml] [test_SVGTransformList.xhtml] -[test_SVGUnitTypes.html] [test_SVGxxxListIndexing.xhtml] [test_SVGxxxList.xhtml] [test_switch.xhtml] diff --git a/dom/svg/test/test_SVGUnitTypes.html b/dom/svg/test/test_SVGUnitTypes.html deleted file mode 100644 index 8f9281e9dde8..000000000000 --- a/dom/svg/test/test_SVGUnitTypes.html +++ /dev/null @@ -1,41 +0,0 @@ - - - - -Test for Bug 842201 - - - - -Mozilla Bug 842201 -

- - -
-
-
- - diff --git a/dom/webidl/SVGClipPathElement.webidl b/dom/webidl/SVGClipPathElement.webidl index b6c5081e4f60..e1421430d61c 100644 --- a/dom/webidl/SVGClipPathElement.webidl +++ b/dom/webidl/SVGClipPathElement.webidl @@ -17,5 +17,3 @@ interface SVGClipPathElement : SVGElement { readonly attribute SVGAnimatedTransformList transform; }; -SVGClipPathElement implements SVGUnitTypeValues; - diff --git a/dom/webidl/SVGFilterElement.webidl b/dom/webidl/SVGFilterElement.webidl index aa4d4d196b49..bbea6841f7a5 100644 --- a/dom/webidl/SVGFilterElement.webidl +++ b/dom/webidl/SVGFilterElement.webidl @@ -28,5 +28,4 @@ interface SVGFilterElement : SVGElement { }; SVGFilterElement implements SVGURIReference; -SVGFilterElement implements SVGUnitTypeValues; diff --git a/dom/webidl/SVGGradientElement.webidl b/dom/webidl/SVGGradientElement.webidl index e1e969061c5a..8eb75b107141 100644 --- a/dom/webidl/SVGGradientElement.webidl +++ b/dom/webidl/SVGGradientElement.webidl @@ -27,4 +27,3 @@ interface SVGGradientElement : SVGElement { }; SVGGradientElement implements SVGURIReference; -SVGGradientElement implements SVGUnitTypeValues; diff --git a/dom/webidl/SVGMaskElement.webidl b/dom/webidl/SVGMaskElement.webidl index 3b00b0d55c88..ad5096b69003 100644 --- a/dom/webidl/SVGMaskElement.webidl +++ b/dom/webidl/SVGMaskElement.webidl @@ -30,5 +30,3 @@ interface SVGMaskElement : SVGElement { readonly attribute SVGAnimatedLength height; }; -SVGMaskElement implements SVGUnitTypeValues; - diff --git a/dom/webidl/SVGPatternElement.webidl b/dom/webidl/SVGPatternElement.webidl index 2a549799e02a..c1d9af9b7d61 100644 --- a/dom/webidl/SVGPatternElement.webidl +++ b/dom/webidl/SVGPatternElement.webidl @@ -29,4 +29,3 @@ interface SVGPatternElement : SVGElement { SVGPatternElement implements SVGFitToViewBox; SVGPatternElement implements SVGURIReference; -SVGPatternElement implements SVGUnitTypeValues; diff --git a/dom/webidl/SVGUnitTypeValues.webidl b/dom/webidl/SVGUnitTypeValues.webidl deleted file mode 100644 index 6a1a33e61d4b..000000000000 --- a/dom/webidl/SVGUnitTypeValues.webidl +++ /dev/null @@ -1,19 +0,0 @@ -/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. - * - * The origin of this IDL file is - * https://svgwg.org/svg2-draft/ - * - * Copyright © 2012 W3C® (MIT, ERCIM, Keio), All Rights Reserved. W3C - * liability, trademark and document use rules apply. - */ - -[NoInterfaceObject] -interface SVGUnitTypeValues { - // Unit Types - const unsigned short SVG_UNIT_TYPE_UNKNOWN = 0; - const unsigned short SVG_UNIT_TYPE_USERSPACEONUSE = 1; - const unsigned short SVG_UNIT_TYPE_OBJECTBOUNDINGBOX = 2; -}; diff --git a/dom/webidl/SVGUnitTypes.webidl b/dom/webidl/SVGUnitTypes.webidl index fc12c11888b1..d02e7019bcd4 100644 --- a/dom/webidl/SVGUnitTypes.webidl +++ b/dom/webidl/SVGUnitTypes.webidl @@ -11,6 +11,9 @@ */ interface SVGUnitTypes { + // Unit Types + const unsigned short SVG_UNIT_TYPE_UNKNOWN = 0; + const unsigned short SVG_UNIT_TYPE_USERSPACEONUSE = 1; + const unsigned short SVG_UNIT_TYPE_OBJECTBOUNDINGBOX = 2; }; -SVGUnitTypes implements SVGUnitTypeValues; diff --git a/dom/webidl/moz.build b/dom/webidl/moz.build index 02aadfc85751..19c4a973729a 100644 --- a/dom/webidl/moz.build +++ b/dom/webidl/moz.build @@ -883,7 +883,6 @@ WEBIDL_FILES = [ 'SVGTransformList.webidl', 'SVGTSpanElement.webidl', 'SVGUnitTypes.webidl', - 'SVGUnitTypeValues.webidl', 'SVGURIReference.webidl', 'SVGUseElement.webidl', 'SVGViewElement.webidl', diff --git a/testing/web-platform/meta/svg/historical.html.ini b/testing/web-platform/meta/svg/historical.html.ini index 11c1edc61114..d8718814e53a 100644 --- a/testing/web-platform/meta/svg/historical.html.ini +++ b/testing/web-platform/meta/svg/historical.html.ini @@ -23,21 +23,6 @@ [SVGViewElement.prototype.viewTarget must be removed] expected: FAIL - [SVGClipPathElement must not implement SVGUnitTypes] - expected: FAIL - - [SVGFilterElement must not implement SVGUnitTypes] - expected: FAIL - - [SVGGradientElement must not implement SVGUnitTypes] - expected: FAIL - - [SVGMaskElement must not implement SVGUnitTypes] - expected: FAIL - - [SVGPatternElement must not implement SVGUnitTypes] - expected: FAIL - [SVGSVGElement.prototype.pixelUnitToMillimeterX must be removed] expected: FAIL