Bug 1280425 part 1: Remove support for deprecated value "defer" in SVG preserveAspectRatio. r?dholbert
MozReview-Commit-ID: I74zfSuwsKH
--- a/dom/svg/SVGAnimatedPreserveAspectRatio.cpp
+++ b/dom/svg/SVGAnimatedPreserveAspectRatio.cpp
@@ -141,26 +141,17 @@ ToPreserveAspectRatio(const nsAString &a
!tokenizer.hasMoreTokens()) {
return NS_ERROR_DOM_SYNTAX_ERR;
}
const nsAString &token = tokenizer.nextToken();
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;
}
if (tokenizer.hasMoreTokens()) {
rv = val.SetMeetOrSlice(GetMeetOrSliceForString(tokenizer.nextToken()));
if (NS_FAILED(rv)) {
@@ -211,20 +202,16 @@ SVGAnimatedPreserveAspectRatio::SetBaseV
void
SVGAnimatedPreserveAspectRatio::GetBaseValueString(
nsAString& aValueAsString) const
{
nsAutoString tmpString;
aValueAsString.Truncate();
- if (mBaseVal.mDefer) {
- aValueAsString.AppendLiteral("defer ");
- }
-
GetAlignString(tmpString, mBaseVal.mAlign);
aValueAsString.Append(tmpString);
if (mBaseVal.mAlign != uint8_t(SVG_PRESERVEASPECTRATIO_NONE)) {
aValueAsString.Append(' ');
GetMeetOrSliceString(tmpString, mBaseVal.mMeetOrSlice);
aValueAsString.Append(tmpString);
new file mode 100644
--- /dev/null
+++ b/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>
new file mode 100644
--- /dev/null
+++ b/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>
new file mode 100644
--- /dev/null
+++ b/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>
--- a/layout/reftests/svg/as-image/reftest.list
+++ b/layout/reftests/svg/as-image/reftest.list
@@ -235,8 +235,11 @@ skip-if(B2G||Mulet) fuzzy(2,1) == svg-bo
!= nonuniform-scale-2d.html?0.3&1.0 nonuniform-scale-2d.html?0.3&0.3
!= nonuniform-scale-2d.html?0.3&1.0 nonuniform-scale-2d.html?1.0&1.0
!= nonuniform-scale-2d.html?1.0&0.3 nonuniform-scale-2d.html?0.3&0.3
!= nonuniform-scale-2d.html?1.0&0.3 nonuniform-scale-2d.html?1.0&1.0
!= nonuniform-scale-3d.html?0.3&1.0&0.3 nonuniform-scale-3d.html?0.3&0.3&0.3
!= 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