Bug 1294360 - Remove mozCurrentTransform. r=emilio

Differential Revision: https://phabricator.services.mozilla.com/D160998

dom/base/nsDeprecatedOperationList.h

@@ -60,6 +60,4 @@ DEPRECATED_OPERATION(DocumentReleaseCapture)
 DEPRECATED_OPERATION(OffscreenCanvasToBlob)
 DEPRECATED_OPERATION(IDBDatabaseCreateMutableFile)
 DEPRECATED_OPERATION(IDBMutableFileOpen)
-DEPRECATED_OPERATION(MozCurrentTransform)
-DEPRECATED_OPERATION(MozCurrentTransformInverse)
 DEPRECATED_OPERATION(MozPreservesPitchDeprecatedPrefix)

dom/canvas/CanvasRenderingContext2D.cpp

@@ -2062,67 +2062,6 @@ static bool ObjectToMatrix(JSContext* aCx, JS::Handle<JSObject*> aObj,
   return true;
 }
 
-void CanvasRenderingContext2D::SetMozCurrentTransform(
-    JSContext* aCx, JS::Handle<JSObject*> aCurrentTransform,
-    ErrorResult& aError) {
-  EnsureTarget();
-  if (!IsTargetValid()) {
-    aError.Throw(NS_ERROR_FAILURE);
-    return;
-  }
-
-  Matrix newCTM;
-  if (ObjectToMatrix(aCx, aCurrentTransform, newCTM, aError) &&
-      newCTM.IsFinite()) {
-    mTarget->SetTransform(newCTM);
-  }
-}
-
-void CanvasRenderingContext2D::GetMozCurrentTransform(
-    JSContext* aCx, JS::MutableHandle<JSObject*> aResult, ErrorResult& aError) {
-  EnsureTarget();
-
-  MatrixToJSObject(aCx, mTarget ? mTarget->GetTransform() : Matrix(), aResult,
-                   aError);
-}
-
-void CanvasRenderingContext2D::SetMozCurrentTransformInverse(
-    JSContext* aCx, JS::Handle<JSObject*> aCurrentTransform,
-    ErrorResult& aError) {
-  EnsureTarget();
-  if (!IsTargetValid()) {
-    aError.Throw(NS_ERROR_FAILURE);
-    return;
-  }
-
-  Matrix newCTMInverse;
-  if (ObjectToMatrix(aCx, aCurrentTransform, newCTMInverse, aError)) {
-    // XXX ERRMSG we need to report an error to developers here! (bug 329026)
-    if (newCTMInverse.Invert() && newCTMInverse.IsFinite()) {
-      mTarget->SetTransform(newCTMInverse);
-    }
-  }
-}
-
-void CanvasRenderingContext2D::GetMozCurrentTransformInverse(
-    JSContext* aCx, JS::MutableHandle<JSObject*> aResult, ErrorResult& aError) {
-  EnsureTarget();
-
-  if (!mTarget) {
-    MatrixToJSObject(aCx, Matrix(), aResult, aError);
-    return;
-  }
-
-  Matrix ctm = mTarget->GetTransform();
-
-  if (!ctm.Invert()) {
-    double NaN = JS::GenericNaN();
-    ctm = Matrix(NaN, NaN, NaN, NaN, NaN, NaN);
-  }
-
-  MatrixToJSObject(aCx, ctm, aResult, aError);
-}
-
 //
 // colors
 //

dom/canvas/CanvasRenderingContext2D.h

@@ -372,18 +372,6 @@ class CanvasRenderingContext2D : public nsICanvasRenderingContextInternal,
                double aRotation, double aStartAngle, double aEndAngle,
                bool aAnticlockwise, ErrorResult& aError) override;
 
-  void GetMozCurrentTransform(JSContext* aCx,
-                              JS::MutableHandle<JSObject*> aResult,
-                              mozilla::ErrorResult& aError);
-  void SetMozCurrentTransform(JSContext* aCx,
-                              JS::Handle<JSObject*> aCurrentTransform,
-                              mozilla::ErrorResult& aError);
-  void GetMozCurrentTransformInverse(JSContext* aCx,
-                                     JS::MutableHandle<JSObject*> aResult,
-                                     mozilla::ErrorResult& aError);
-  void SetMozCurrentTransformInverse(JSContext* aCx,
-                                     JS::Handle<JSObject*> aCurrentTransform,
-                                     mozilla::ErrorResult& aError);
   void GetFillRule(nsAString& aFillRule);
   void SetFillRule(const nsAString& aFillRule);
 

dom/locales/en-US/chrome/dom/dom.properties

@@ -439,10 +439,5 @@ InstallTriggerDeprecatedWarning=InstallTrigger is deprecated and will be removed
 # LOCALIZATION NOTE: Do not translate "InstallTrigger.install()"
 InstallTriggerInstallDeprecatedWarning=InstallTrigger.install() is deprecated and will be removed in the future. For more help https://extensionworkshop.com/documentation/publish/self-distribution/
 
-# LOCALIZATION NOTE: Do not translate "mozCurrentTransform", "CanvasRenderingContext2D.getTransform()", and "CanvasRenderingContext2D.setTransform()".
-MozCurrentTransformWarning=mozCurrentTransform is deprecated and will be removed in the future. Use CanvasRenderingContext2D.getTransform() or CanvasRenderingContext2D.setTransform() instead.
-# LOCALIZATION NOTE: Do not translate "mozCurrentTransformInverse", "CanvasRenderingContext2D.getTransform()", and "CanvasRenderingContext2D.setTransform()".
-MozCurrentTransformInverseWarning=mozCurrentTransformInverse is deprecated and will be removed in the future. Use CanvasRenderingContext2D.getTransform() or CanvasRenderingContext2D.setTransform() instead.
-
 # LOCALIZATION NOTE: Do not translate "HTMLOptionsCollection.length". %1$S is the invalid value, %2$S is the current limit.
 SelectOptionsLengthAssignmentWarning=Refused to expand <select> option list via assignment to HTMLOptionsCollection.length (value %1$S). The maximum supported size is %2$S.

dom/webidl/CanvasRenderingContext2D.webidl

@@ -43,16 +43,6 @@ interface CanvasRenderingContext2D {
   // associated with a canvas.
   readonly attribute HTMLCanvasElement? canvas;
 
-  // Mozilla-specific stuff
-  [Deprecated="MozCurrentTransform",
-   Pref="dom.mozCurrentTransform.enabled",
-   Throws]
-  attribute object mozCurrentTransform; // [ m11, m12, m21, m22, dx, dy ], i.e. row major
-  [Deprecated="MozCurrentTransformInverse",
-   Pref="dom.mozCurrentTransform.enabled",
-   Throws]
-  attribute object mozCurrentTransformInverse;
-
   [SetterThrows]
   attribute UTF8String mozTextStyle;
 

layout/reftests/canvas/ctm-1-ref.html

@@ -1,18 +0,0 @@
-<html>
-<head>
-  <script type="text/javascript">
-window.onload = function() {
-    var ctx = document.getElementById("c1").getContext("2d");
-    
-    ctx.setTransform(10, 0, 0, 1, 0, 0);
-    ctx.fillRect(1, 1, 10, 10);
-
-    ctx.setTransform(1, 0, 0, 10, 0, 0);
-    ctx.fillRect(150, 1, 10, 10);
-}
-  </script>
-</head>
-<body style="padding: 0px; margin: 0px;">
-  <div><canvas id="c1" width="300" height="300"></canvas></div>
-</body>
-</html>

layout/reftests/canvas/ctm-1.html

@@ -1,18 +0,0 @@
-<html>
-<head>
-  <script type="text/javascript">
-window.onload = function() {
-    var ctx = document.getElementById("c1").getContext("2d");
-    
-    ctx.mozCurrentTransform = [ 10, 0, 0, 1, 0, 0 ];
-    ctx.fillRect(1, 1, 10, 10);
-
-    ctx.mozCurrentTransformInverse = [ 1, 0, 0, .1, 0, 0 ];
-    ctx.fillRect(150, 1, 10, 10);
-}
-  </script>
-</head>
-<body style="padding: 0px; margin: 0px;">
-  <div><canvas id="c1" width="300" height="300"></canvas></div>
-</body>
-</html>

layout/reftests/canvas/reftest.list

@@ -77,7 +77,6 @@ fuzzy(0-9,0-470) random-if(Android) == dash-1.html dash-1-ref.svg # Bug 668412 (
 
 == ctm-sanity.html data:text/html,<body>Pass
 == ctm-singular-sanity.html data:text/html,<body>Pass
-pref(dom.mozCurrentTransform.enabled,true) fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),0-1,0-45) == ctm-1.html ctm-1-ref.html
 
 == 672646-alpha-radial-gradient.html 672646-alpha-radial-gradient-ref.html
 fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),0-1,0-45) == 674003-alpha-radial-gradient-superlum.html 674003-alpha-radial-gradient-superlum-ref.html

modules/libpref/init/StaticPrefList.yaml

@@ -2074,12 +2074,6 @@
 # Prefs starting with "dom."
 #---------------------------------------------------------------------------
 
-# Whether CanvasRenderingContext2D.mozCurrentTransform is enabled.
-- name: dom.mozCurrentTransform.enabled
-  type: bool
-  value: false
-  mirror: always
-
 # Allow cut/copy
 - name: dom.allow_cut_copy
   type: bool