Bug 1584852 - Convert SVGZoomAndPan to mixin r=bzbarsky
authorlongsonr <longsonr@gmail.com>
Mon, 30 Sep 2019 02:50:41 +0000
changeset 495522 9c0862974107c0667e11cd60eb92b9a53fc7d320
parent 495521 deafe9fd2d00fcb3c5d49f270ffeacfc0833d28f
child 495523 42d646d94f82811d2ec5202680513b470ad2eab1
push id96666
push userlongsonr@gmail.com
push dateMon, 30 Sep 2019 02:52:51 +0000
treeherderautoland@9c0862974107 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbzbarsky
bugs1584852
milestone71.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1584852 - Convert SVGZoomAndPan to mixin r=bzbarsky Differential Revision: https://phabricator.services.mozilla.com/D47561
dom/tests/mochitest/general/test_interfaces.js
dom/webidl/SVGSVGElement.webidl
dom/webidl/SVGViewElement.webidl
dom/webidl/SVGZoomAndPan.webidl
dom/webidl/SVGZoomAndPanValues.webidl
dom/webidl/moz.build
testing/web-platform/meta/svg/historical.html.ini
--- a/dom/tests/mochitest/general/test_interfaces.js
+++ b/dom/tests/mochitest/general/test_interfaces.js
@@ -1228,18 +1228,16 @@ var interfaceNamesInGlobalScope = [
   { name: "SVGTSpanElement", insecureContext: true },
   // IMPORTANT: Do not change this list without review from a DOM peer!
   { name: "SVGUnitTypes", insecureContext: true },
   // IMPORTANT: Do not change this list without review from a DOM peer!
   { name: "SVGUseElement", insecureContext: true },
   // IMPORTANT: Do not change this list without review from a DOM peer!
   { name: "SVGViewElement", insecureContext: true },
   // IMPORTANT: Do not change this list without review from a DOM peer!
-  { name: "SVGZoomAndPan", insecureContext: true },
-  // IMPORTANT: Do not change this list without review from a DOM peer!
   { name: "Text", insecureContext: true },
   // IMPORTANT: Do not change this list without review from a DOM peer!
   { name: "TextDecoder", insecureContext: true },
   // IMPORTANT: Do not change this list without review from a DOM peer!
   { name: "TextEncoder", insecureContext: true },
   // IMPORTANT: Do not change this list without review from a DOM peer!
   { name: "TextMetrics", insecureContext: true },
   // IMPORTANT: Do not change this list without review from a DOM peer!
--- a/dom/webidl/SVGSVGElement.webidl
+++ b/dom/webidl/SVGSVGElement.webidl
@@ -65,10 +65,10 @@ interface SVGSVGElement : SVGGraphicsEle
   SVGTransform createSVGTransform();
   [NewObject]
   SVGTransform createSVGTransformFromMatrix(SVGMatrix matrix);
   [UseCounter]
   Element? getElementById(DOMString elementId);
 };
 
 SVGSVGElement includes SVGFitToViewBox;
-SVGSVGElement includes SVGZoomAndPanValues;
+SVGSVGElement includes SVGZoomAndPan;
 
--- a/dom/webidl/SVGViewElement.webidl
+++ b/dom/webidl/SVGViewElement.webidl
@@ -10,10 +10,10 @@
  * liability, trademark and document use rules apply.
  */
 
 [Exposed=Window]
 interface SVGViewElement : SVGElement {
 };
 
 SVGViewElement includes SVGFitToViewBox;
-SVGViewElement includes SVGZoomAndPanValues;
+SVGViewElement includes SVGZoomAndPan;
 
--- a/dom/webidl/SVGZoomAndPan.webidl
+++ b/dom/webidl/SVGZoomAndPan.webidl
@@ -5,13 +5,17 @@
  *
  * The origin of this IDL file is
  * http://www.w3.org/TR/SVG2/
  *
  * Copyright © 2012 W3C® (MIT, ERCIM, Keio), All Rights Reserved. W3C
  * liability, trademark and document use rules apply.
  */
 
-[Exposed=Window]
-interface SVGZoomAndPan {
+interface mixin SVGZoomAndPan {
+  // Zoom and Pan Types
+  const unsigned short SVG_ZOOMANDPAN_UNKNOWN = 0;
+  const unsigned short SVG_ZOOMANDPAN_DISABLE = 1;
+  const unsigned short SVG_ZOOMANDPAN_MAGNIFY = 2;
+
+  [SetterThrows]
+  attribute unsigned short zoomAndPan;
 };
-
-SVGZoomAndPan includes SVGZoomAndPanValues;
deleted file mode 100644
--- a/dom/webidl/SVGZoomAndPanValues.webidl
+++ /dev/null
@@ -1,23 +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
- * http://www.w3.org/TR/SVG2/
- *
- * Copyright © 2012 W3C® (MIT, ERCIM, Keio), All Rights Reserved. W3C
- * liability, trademark and document use rules apply.
- */
-
-interface mixin SVGZoomAndPanValues {
-
-  // Zoom and Pan Types
-  const unsigned short SVG_ZOOMANDPAN_UNKNOWN = 0;
-  const unsigned short SVG_ZOOMANDPAN_DISABLE = 1;
-  const unsigned short SVG_ZOOMANDPAN_MAGNIFY = 2;
-
-  [SetterThrows]
-  attribute unsigned short zoomAndPan;
-};
-
--- a/dom/webidl/moz.build
+++ b/dom/webidl/moz.build
@@ -881,17 +881,16 @@ WEBIDL_FILES = [
     'SVGTransform.webidl',
     'SVGTransformList.webidl',
     'SVGTSpanElement.webidl',
     'SVGUnitTypes.webidl',
     'SVGURIReference.webidl',
     'SVGUseElement.webidl',
     'SVGViewElement.webidl',
     'SVGZoomAndPan.webidl',
-    'SVGZoomAndPanValues.webidl',
     'TCPServerSocket.webidl',
     'TCPServerSocketEvent.webidl',
     'TCPSocket.webidl',
     'TCPSocketErrorEvent.webidl',
     'TCPSocketEvent.webidl',
     'Text.webidl',
     'TextClause.webidl',
     'TextDecoder.webidl',
--- a/testing/web-platform/meta/svg/historical.html.ini
+++ b/testing/web-platform/meta/svg/historical.html.ini
@@ -1,13 +1,10 @@
 [historical.html]
   [SVGUnitTypes mixin interface must not be exposed]
     expected: FAIL
 
-  [SVGZoomAndPan mixin interface must not be exposed]
-    expected: FAIL
-
   [SVGGraphicsElement.prototype.getTransformToElement must be removed]
     expected: FAIL
 
   [SVGSVGElement.prototype.useCurrentView must be removed]
     expected: FAIL