Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-02 22:37:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
MozReview-Commit-ID: I74zfSuwsKH

--HG--
extra : rebase_source : 189fd634cc2c7a1bc99804e05c99b1e0fd3e3f9e
This commit is contained in:
Fariskhi Vidyan 2016-06-30 17:28:33 -07:00
parent 4bcc463b44
commit ccd59b67bf
5 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dom/svg/SVGAnimatedPreserveAspectRatio.cpp
View File

@ -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);

5
layout/reftests/svg/as-image/defer-unsupported-1-helper.svg Normal file
View File

@ -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>
Side by Side

After

Width:  |  Height:  |  Size: 177 B

6
layout/reftests/svg/as-image/defer-unsupported-1-ref.svg Normal file
View File

@ -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>
Side by Side

After

Width:  |  Height:  |  Size: 224 B

7
layout/reftests/svg/as-image/defer-unsupported-1.svg Normal file
View File

@ -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>
Side by Side

After

Width:  |  Height:  |  Size: 270 B

3
layout/reftests/svg/as-image/reftest.list
View File

@ -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