Bug 1280425 part 1: Remove support for deprecated value "defer" in SVG preserveAspectRatio. r=dholbert

MozReview-Commit-ID: I74zfSuwsKH

--HG--
extra : rebase_source : 189fd634cc2c7a1bc99804e05c99b1e0fd3e3f9e

dom/svg/SVGAnimatedPreserveAspectRatio.cpp

@@ -146,16 +146,7 @@ ToPreserveAspectRatio(const nsAString &aString,
   nsresult rv;
   SVGPreserveAspectRatio val;
 
-  val.SetDefer(token.EqualsLiteral("defer"));
-
-  if (val.GetDefer()) {
-    if (!tokenizer.hasMoreTokens()) {
-      return NS_ERROR_DOM_SYNTAX_ERR;
-    }
-    rv = val.SetAlign(GetAlignForString(tokenizer.nextToken()));
-  } else {
-    rv = val.SetAlign(GetAlignForString(token));
-  }
+  rv = val.SetAlign(GetAlignForString(token));
 
   if (NS_FAILED(rv)) {
     return NS_ERROR_DOM_SYNTAX_ERR;
@@ -216,10 +207,6 @@ SVGAnimatedPreserveAspectRatio::GetBaseValueString(
 
   aValueAsString.Truncate();
 
-  if (mBaseVal.mDefer) {
-    aValueAsString.AppendLiteral("defer ");
-  }
-
   GetAlignString(tmpString, mBaseVal.mAlign);
   aValueAsString.Append(tmpString);
 

layout/reftests/svg/as-image/defer-unsupported-1-helper.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="100" height="100"
+     viewBox="0 0 50 50" preserveAspectRatio="xMaxYMax">
+
+  <rect width="100" height="100" fill="lime"/>
+</svg>

layout/reftests/svg/as-image/defer-unsupported-1-ref.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink">
+
+  <rect width="100" height="100" fill="blue"/>
+  <image xlink:href="defer-unsupported-1-helper.svg" width="200" height="100"/>
+</svg>

layout/reftests/svg/as-image/defer-unsupported-1.svg

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink">
+
+  <rect width="100" height="100" fill="blue"/>
+  <image xlink:href="defer-unsupported-1-helper.svg" width="200" height="100"
+         preserveAspectRatio="defer xMinYMin"/>
+</svg>

layout/reftests/svg/as-image/reftest.list

@@ -240,3 +240,6 @@ skip-if(B2G||Mulet) fuzzy(2,1) == svg-border-image-repaint-1.html svg-border-ima
 != nonuniform-scale-3d.html?0.3&1.0&0.3  nonuniform-scale-3d.html?1.0&1.0&1.0
 != nonuniform-scale-3d.html?1.0&0.3&0.3  nonuniform-scale-3d.html?0.3&0.3&0.3
 != nonuniform-scale-3d.html?1.0&0.3&0.3  nonuniform-scale-3d.html?1.0&1.0&1.0
+
+# Test for preserveAspectRatio with no-longer-supported "defer" keyword
+== defer-unsupported-1.svg  defer-unsupported-1-ref.svg