diff --git a/layout/reftests/w3c-css/submitted/masking/mask-image-3b.html b/layout/reftests/w3c-css/submitted/masking/mask-image-3b.html index 50cc1666d79b..3d4d646e7c57 100644 --- a/layout/reftests/w3c-css/submitted/masking/mask-image-3b.html +++ b/layout/reftests/w3c-css/submitted/masking/mask-image-3b.html @@ -18,6 +18,7 @@ background-color: purple; mask-image: url(support/50x50-opaque-blue.svg), url(#mask1); mask-repeat: no-repeat, repeat; + mask-position: 0 0, 0 0; width: 100px; height: 100px; } diff --git a/layout/reftests/w3c-css/submitted/masking/mask-image-3c.html b/layout/reftests/w3c-css/submitted/masking/mask-image-3c.html index e129fa9e9f80..88f808c6f5a6 100644 --- a/layout/reftests/w3c-css/submitted/masking/mask-image-3c.html +++ b/layout/reftests/w3c-css/submitted/masking/mask-image-3c.html @@ -18,6 +18,7 @@ background-color: purple; mask-image: url(#mask1), url(support/50x50-opaque-blue.svg); mask-repeat: repeat-x, no-repeat; + mask-position: 0 0, 0 0; width: 100px; height: 100px; } diff --git a/layout/reftests/w3c-css/submitted/masking/mask-image-3d.html b/layout/reftests/w3c-css/submitted/masking/mask-image-3d.html index e0330d1a644e..140431697de5 100644 --- a/layout/reftests/w3c-css/submitted/masking/mask-image-3d.html +++ b/layout/reftests/w3c-css/submitted/masking/mask-image-3d.html @@ -18,6 +18,7 @@ background-color: purple; mask: url(#mask1), url(support/50x50-opaque-blue.svg); mask-repeat: no-repeat, no-repeat; + mask-position: 0 0, 0 0; width: 100px; height: 100px; } diff --git a/layout/reftests/w3c-css/submitted/masking/mask-image-3e.html b/layout/reftests/w3c-css/submitted/masking/mask-image-3e.html index f2bd4ed993dc..207ca117a34a 100644 --- a/layout/reftests/w3c-css/submitted/masking/mask-image-3e.html +++ b/layout/reftests/w3c-css/submitted/masking/mask-image-3e.html @@ -25,6 +25,7 @@ background-color: purple; mask-image: url(support/50x50-opaque-blue.svg), url(#mask1); mask-repeat: no-repeat, repeat; + mask-position: 0 0, 0 0; /*mask: url(#mask1);*/ width: 100px; height: 100px; diff --git a/layout/reftests/w3c-css/submitted/masking/mask-repeat-1.html b/layout/reftests/w3c-css/submitted/masking/mask-repeat-1.html index af9225daae7d..a7fc586fd530 100644 --- a/layout/reftests/w3c-css/submitted/masking/mask-repeat-1.html +++ b/layout/reftests/w3c-css/submitted/masking/mask-repeat-1.html @@ -21,6 +21,7 @@ div.inner { background-color: purple; mask-image: url(support/50x50-opaque-blue.svg); + mask-position: left top; } #no-repeat { diff --git a/layout/reftests/w3c-css/submitted/masking/mask-repeat-2.html b/layout/reftests/w3c-css/submitted/masking/mask-repeat-2.html index 65eb2a43afa0..e349239fbfcb 100644 --- a/layout/reftests/w3c-css/submitted/masking/mask-repeat-2.html +++ b/layout/reftests/w3c-css/submitted/masking/mask-repeat-2.html @@ -21,6 +21,7 @@ div.inner { background-color: purple; mask-image: url(support/50x50-opaque-blue.svg); + mask-position: left top; } #space { diff --git a/layout/reftests/w3c-css/submitted/masking/mask-repeat-3.html b/layout/reftests/w3c-css/submitted/masking/mask-repeat-3.html index 540e47c69b05..cb950d4f2c4e 100644 --- a/layout/reftests/w3c-css/submitted/masking/mask-repeat-3.html +++ b/layout/reftests/w3c-css/submitted/masking/mask-repeat-3.html @@ -21,6 +21,7 @@ div.inner { background-color: purple; mask-image: url(support/50x50-opaque-blue.svg); + mask-position: left top; } #round { diff --git a/layout/reftests/w3c-css/submitted/masking/mask-size-auto-auto.html b/layout/reftests/w3c-css/submitted/masking/mask-size-auto-auto.html index cf69930e064f..01d55f96298f 100644 --- a/layout/reftests/w3c-css/submitted/masking/mask-size-auto-auto.html +++ b/layout/reftests/w3c-css/submitted/masking/mask-size-auto-auto.html @@ -22,6 +22,7 @@ background-color: purple; mask-image: url(support/50x50-opaque-blue.svg); mask-repeat: no-repeat; + mask-position: left top; mask-size: auto auto; } diff --git a/layout/reftests/w3c-css/submitted/masking/mask-size-auto-length.html b/layout/reftests/w3c-css/submitted/masking/mask-size-auto-length.html index 10602567d494..5ef49cc612f6 100644 --- a/layout/reftests/w3c-css/submitted/masking/mask-size-auto-length.html +++ b/layout/reftests/w3c-css/submitted/masking/mask-size-auto-length.html @@ -21,6 +21,7 @@ background-color: purple; mask-image: url(support/50x50-opaque-blue.svg); mask-repeat: no-repeat; + mask-position: left top; mask-size: auto 20px; } diff --git a/layout/reftests/w3c-css/submitted/masking/mask-size-auto-percent.html b/layout/reftests/w3c-css/submitted/masking/mask-size-auto-percent.html index 5f613ec4b51c..f2644bb1b018 100644 --- a/layout/reftests/w3c-css/submitted/masking/mask-size-auto-percent.html +++ b/layout/reftests/w3c-css/submitted/masking/mask-size-auto-percent.html @@ -21,6 +21,7 @@ background-color: purple; mask-image: url(support/50x50-opaque-blue.svg); mask-repeat: no-repeat; + mask-position: left top; mask-size: auto 15.625%; } diff --git a/layout/reftests/w3c-css/submitted/masking/mask-size-auto.html b/layout/reftests/w3c-css/submitted/masking/mask-size-auto.html index 19ff1369e6fe..6560a81ee3de 100644 --- a/layout/reftests/w3c-css/submitted/masking/mask-size-auto.html +++ b/layout/reftests/w3c-css/submitted/masking/mask-size-auto.html @@ -22,6 +22,7 @@ background-color: purple; mask-image: url(support/50x50-opaque-blue.svg); mask-repeat: no-repeat; + mask-position: left top; mask-size: auto; } diff --git a/layout/reftests/w3c-css/submitted/masking/mask-size-contain-clip-border.html b/layout/reftests/w3c-css/submitted/masking/mask-size-contain-clip-border.html index af87520d2fda..a04557639a72 100644 --- a/layout/reftests/w3c-css/submitted/masking/mask-size-contain-clip-border.html +++ b/layout/reftests/w3c-css/submitted/masking/mask-size-contain-clip-border.html @@ -22,6 +22,7 @@ background-color: purple; mask-image: url(support/50x50-opaque-blue.svg); mask-repeat: no-repeat; + mask-position: left top; mask-clip: border-box; mask-origin: border-box; mask-size: contain; diff --git a/layout/reftests/w3c-css/submitted/masking/mask-size-contain-clip-padding.html b/layout/reftests/w3c-css/submitted/masking/mask-size-contain-clip-padding.html index dc093d94d0c8..4f321d9c58f6 100644 --- a/layout/reftests/w3c-css/submitted/masking/mask-size-contain-clip-padding.html +++ b/layout/reftests/w3c-css/submitted/masking/mask-size-contain-clip-padding.html @@ -22,6 +22,7 @@ height: 88px; mask-image: url(support/50x50-opaque-blue.svg); mask-repeat: no-repeat; + mask-position: left top; mask-clip: padding-box; mask-origin: padding-box; mask-size: contain; diff --git a/layout/reftests/w3c-css/submitted/masking/mask-size-contain-position-fifty-fifty.html b/layout/reftests/w3c-css/submitted/masking/mask-size-contain-position-fifty-fifty.html index 2be2428a7b13..fcae5ba0ed29 100644 --- a/layout/reftests/w3c-css/submitted/masking/mask-size-contain-position-fifty-fifty.html +++ b/layout/reftests/w3c-css/submitted/masking/mask-size-contain-position-fifty-fifty.html @@ -22,6 +22,7 @@ background-color: purple; mask-image: url(support/50x50-opaque-blue.svg); mask-repeat: no-repeat; + mask-position: left top; mask-size: contain; mask-position: 50% 50%; } diff --git a/layout/reftests/w3c-css/submitted/masking/mask-size-contain.html b/layout/reftests/w3c-css/submitted/masking/mask-size-contain.html index f4b8cef7933d..19fc42d6ec51 100644 --- a/layout/reftests/w3c-css/submitted/masking/mask-size-contain.html +++ b/layout/reftests/w3c-css/submitted/masking/mask-size-contain.html @@ -22,6 +22,7 @@ background-color: purple; mask-image: url(support/50x50-opaque-blue.svg); mask-repeat: no-repeat; + mask-position: left top; mask-size: contain; } diff --git a/layout/reftests/w3c-css/submitted/masking/mask-size-cover.html b/layout/reftests/w3c-css/submitted/masking/mask-size-cover.html index 9329ea70b76b..171e11805b3b 100644 --- a/layout/reftests/w3c-css/submitted/masking/mask-size-cover.html +++ b/layout/reftests/w3c-css/submitted/masking/mask-size-cover.html @@ -16,6 +16,7 @@ background-color: purple; mask-image: url(support/50x50-opaque-blue.svg); mask-repeat: no-repeat; + mask-position: left top; mask-origin: content-box; mask-clip: content-box; mask-size: cover; diff --git a/layout/reftests/w3c-css/submitted/masking/mask-size-length-auto.html b/layout/reftests/w3c-css/submitted/masking/mask-size-length-auto.html index 2fcc74c08407..7152f6ff954f 100644 --- a/layout/reftests/w3c-css/submitted/masking/mask-size-length-auto.html +++ b/layout/reftests/w3c-css/submitted/masking/mask-size-length-auto.html @@ -22,6 +22,7 @@ background-color: purple; mask-image: url(support/50x100-opaque-blue.svg); mask-repeat: no-repeat; + mask-position: left top; mask-size: 32px auto; } diff --git a/layout/reftests/w3c-css/submitted/masking/mask-size-length-length.html b/layout/reftests/w3c-css/submitted/masking/mask-size-length-length.html index 9ef76bcd6625..f9cf2cb6bcb9 100644 --- a/layout/reftests/w3c-css/submitted/masking/mask-size-length-length.html +++ b/layout/reftests/w3c-css/submitted/masking/mask-size-length-length.html @@ -22,6 +22,7 @@ background-color: purple; mask-image: url(support/50x100-opaque-blue.svg); mask-repeat: no-repeat; + mask-position: left top; mask-size: 32px 64px; } diff --git a/layout/reftests/w3c-css/submitted/masking/mask-size-length-percent.html b/layout/reftests/w3c-css/submitted/masking/mask-size-length-percent.html index 592e593870cb..ba5bbbc55c50 100644 --- a/layout/reftests/w3c-css/submitted/masking/mask-size-length-percent.html +++ b/layout/reftests/w3c-css/submitted/masking/mask-size-length-percent.html @@ -22,6 +22,7 @@ background-color: purple; mask-image: url(support/50x100-opaque-blue.svg); mask-repeat: no-repeat; + mask-position: left top; mask-size: 16px 25%; } diff --git a/layout/reftests/w3c-css/submitted/masking/mask-size-length.html b/layout/reftests/w3c-css/submitted/masking/mask-size-length.html index 76563e3329f7..961357e12f7e 100644 --- a/layout/reftests/w3c-css/submitted/masking/mask-size-length.html +++ b/layout/reftests/w3c-css/submitted/masking/mask-size-length.html @@ -22,6 +22,7 @@ background-color: purple; mask-image: url(support/50x100-opaque-blue.svg); mask-repeat: no-repeat; + mask-position: left top; mask-size: 32px; } diff --git a/layout/reftests/w3c-css/submitted/masking/mask-size-percent-auto.html b/layout/reftests/w3c-css/submitted/masking/mask-size-percent-auto.html index d81cbcc02b90..603346d6e6b9 100644 --- a/layout/reftests/w3c-css/submitted/masking/mask-size-percent-auto.html +++ b/layout/reftests/w3c-css/submitted/masking/mask-size-percent-auto.html @@ -22,6 +22,7 @@ background-color: purple; mask-image: url(support/50x50-opaque-blue.svg); mask-repeat: no-repeat; + mask-position: left top; mask-size: 50% auto; } diff --git a/layout/reftests/w3c-css/submitted/masking/mask-size-percent-length.html b/layout/reftests/w3c-css/submitted/masking/mask-size-percent-length.html index 25c341b3d245..4ac9c8e81fdd 100644 --- a/layout/reftests/w3c-css/submitted/masking/mask-size-percent-length.html +++ b/layout/reftests/w3c-css/submitted/masking/mask-size-percent-length.html @@ -22,6 +22,7 @@ background-color: purple; mask-image: url(support/50x50-opaque-blue.svg); mask-repeat: no-repeat; + mask-position: left top; mask-size: 50% 32px; } diff --git a/layout/reftests/w3c-css/submitted/masking/mask-size-percent-percent-stretch.html b/layout/reftests/w3c-css/submitted/masking/mask-size-percent-percent-stretch.html index 5309b379a5a0..69f89b8a984f 100644 --- a/layout/reftests/w3c-css/submitted/masking/mask-size-percent-percent-stretch.html +++ b/layout/reftests/w3c-css/submitted/masking/mask-size-percent-percent-stretch.html @@ -22,6 +22,7 @@ background-color: purple; mask-image: url(support/transparent-100x50-blue-100x50.svg); mask-repeat: no-repeat; + mask-position: left top; mask-size: 100% 100%; } diff --git a/layout/reftests/w3c-css/submitted/masking/mask-size-percent-percent.html b/layout/reftests/w3c-css/submitted/masking/mask-size-percent-percent.html index d9138f75ad09..7b04d9b6d546 100644 --- a/layout/reftests/w3c-css/submitted/masking/mask-size-percent-percent.html +++ b/layout/reftests/w3c-css/submitted/masking/mask-size-percent-percent.html @@ -22,6 +22,7 @@ background-color: purple; mask-image: url(support/50x50-opaque-blue.svg); mask-repeat: no-repeat; + mask-position: left top; mask-size: 50% 25%; } diff --git a/layout/reftests/w3c-css/submitted/masking/mask-size-percent.html b/layout/reftests/w3c-css/submitted/masking/mask-size-percent.html index 4c0837b81541..2e056df5217b 100644 --- a/layout/reftests/w3c-css/submitted/masking/mask-size-percent.html +++ b/layout/reftests/w3c-css/submitted/masking/mask-size-percent.html @@ -22,6 +22,7 @@ background-color: purple; mask-image: url(support/50x50-opaque-blue.svg); mask-repeat: no-repeat; + mask-position: left top; mask-size: 50%; } diff --git a/layout/reftests/w3c-css/submitted/masking/reftest.list b/layout/reftests/w3c-css/submitted/masking/reftest.list index beb43d7e49b1..1a1ea0a4c1ac 100644 --- a/layout/reftests/w3c-css/submitted/masking/reftest.list +++ b/layout/reftests/w3c-css/submitted/masking/reftest.list @@ -1,81 +1,79 @@ -# All mask properties test cases are meant to be failed -# until bug 1251161 is fixed, which means enabling mask shorthand. -# To enable it in compile time, refer to bug 1243734 +# For those test items with failure type fuzzy-if added, please refer to bug 1231643#c10. # mask-composite test cases -fails == mask-composite-1a.html mask-composite-1-ref.html -fails == mask-composite-1b.html mask-composite-1-ref.html -fails == mask-composite-1c.html mask-composite-1-ref.html -fails == mask-composite-2a.html mask-composite-2-ref.html -fails == mask-composite-2b.html mask-composite-2-ref.html -fails == mask-composite-2c.html mask-composite-2-ref.html +== mask-composite-1a.html mask-composite-1-ref.html +fuzzy-if(skiaContent,64,200) == mask-composite-1b.html mask-composite-1-ref.html +== mask-composite-1c.html mask-composite-1-ref.html +fuzzy-if(skiaContent||winWidget,1,5000) == mask-composite-2a.html mask-composite-2-ref.html +fuzzy-if(skiaContent||winWidget,64,5200) == mask-composite-2b.html mask-composite-2-ref.html +== mask-composite-2c.html mask-composite-2-ref.html # mask-mode test cases -fails == mask-mode-a.html mask-mode-ref.html -fails == mask-mode-b.html mask-mode-ref.html -fails == mask-mode-to-mask-type.html mask-mode-to-mask-type-ref.html +fuzzy-if(skiaContent,1,30000) == mask-mode-a.html mask-mode-ref.html +fuzzy-if(skiaContent,1,30000) == mask-mode-b.html mask-mode-ref.html +fuzzy-if(skiaContent,1,30000) == mask-mode-to-mask-type.html mask-mode-to-mask-type-ref.html # mask-image test cases -fails == mask-image-1a.html mask-image-1-ref.html -fails == mask-image-1b.html mask-image-1-ref.html -fails == mask-image-1c.html mask-image-1-ref.html +== mask-image-1a.html mask-image-1-ref.html +== mask-image-1b.html mask-image-1-ref.html +== mask-image-1c.html mask-image-1-ref.html == mask-image-1d.html mask-image-1-ref.html -fails == mask-image-2.html mask-image-2-ref.html -fails == mask-image-3a.html mask-image-3-ref.html -fails == mask-image-3b.html mask-image-3-ref.html -fails == mask-image-3c.html mask-image-3-ref.html -fails == mask-image-3d.html mask-image-3-ref.html -fails == mask-image-3e.html mask-image-3-ref.html -fails == mask-image-3f.html mask-image-3-ref.html -fails == mask-image-3g.html mask-image-3-ref.html -fails == mask-image-4a.html blank.html -fails == mask-image-4b.html blank.html +fuzzy-if(skiaContent||winWidget,1,20000) == mask-image-2.html mask-image-2-ref.html +== mask-image-3a.html mask-image-3-ref.html +== mask-image-3b.html mask-image-3-ref.html +fuzzy-if(skiaContent||winWidget,1,43) == mask-image-3c.html mask-image-3-ref.html +fuzzy-if(skiaContent||winWidget,1,43) == mask-image-3d.html mask-image-3-ref.html +== mask-image-3e.html mask-image-3-ref.html +fuzzy-if(skiaContent,50,50) == mask-image-3f.html mask-image-3-ref.html +== mask-image-3g.html mask-image-3-ref.html +== mask-image-4a.html blank.html +== mask-image-4b.html blank.html == mask-image-5.html mask-image-5-ref.html # mask-clip test cases -fails == mask-clip-1.html mask-clip-1-ref.html +== mask-clip-1.html mask-clip-1-ref.html # mask-position test cases -fails == mask-position-1a.html mask-position-1-ref.html -fails == mask-position-1b.html mask-position-1-ref.html -fails == mask-position-1c.html mask-position-1-ref.html -fails == mask-position-2a.html mask-position-2-ref.html -fails == mask-position-2b.html mask-position-2-ref.html -fails == mask-position-3a.html mask-position-3-ref.html -fails == mask-position-3b.html mask-position-3-ref.html -fails == mask-position-4a.html mask-position-4-ref.html -fails == mask-position-4b.html mask-position-4-ref.html -fails == mask-position-4c.html mask-position-4-ref.html -fails == mask-position-4d.html mask-position-4-ref.html -fails == mask-position-5.html mask-position-5-ref.html -fails == mask-position-6.html mask-position-6-ref.html -fails == mask-position-7.html mask-position-7-ref.html +== mask-position-1a.html mask-position-1-ref.html +== mask-position-1b.html mask-position-1-ref.html +== mask-position-1c.html mask-position-1-ref.html +== mask-position-2a.html mask-position-2-ref.html +== mask-position-2b.html mask-position-2-ref.html +== mask-position-3a.html mask-position-3-ref.html +== mask-position-3b.html mask-position-3-ref.html +== mask-position-4a.html mask-position-4-ref.html +== mask-position-4b.html mask-position-4-ref.html +== mask-position-4c.html mask-position-4-ref.html +== mask-position-4d.html mask-position-4-ref.html +== mask-position-5.html mask-position-5-ref.html +== mask-position-6.html mask-position-6-ref.html +== mask-position-7.html mask-position-7-ref.html # mask-repeat test cases -fails == mask-repeat-1.html mask-repeat-1-ref.html # bug 1258623 -fails == mask-repeat-2.html mask-repeat-2-ref.html # bug 1258626 -fails == mask-repeat-3.html mask-repeat-3-ref.html # bug 1258626 +== mask-repeat-1.html mask-repeat-1-ref.html +== mask-repeat-2.html mask-repeat-2-ref.html +== mask-repeat-3.html mask-repeat-3-ref.html # mask-origin test cases -fails == mask-origin-1.html mask-origin-1-ref.html # bug 1258286 +== mask-origin-1.html mask-origin-1-ref.html fails == mask-origin-2.html mask-origin-2-ref.html # bug 1260094 # mask-size test cases -fails == mask-size-auto.html mask-size-auto-ref.html -fails == mask-size-auto-auto.html mask-size-auto-ref.html -fails == mask-size-auto-length.html mask-size-auto-length-ref.html -fails == mask-size-auto-percent.html mask-size-auto-length-ref.html -fails == mask-size-contain-clip-border.html mask-size-contain-clip-border-ref.html -fails == mask-size-contain-clip-padding.html mask-size-contain-clip-padding-ref.html -fails == mask-size-contain-position-fifty-fifty.html mask-size-contain-position-fifty-fifty-ref.html -fails == mask-size-contain.html mask-size-contain-ref.html -fails == mask-size-cover.html mask-size-cover-ref.html -fails == mask-size-length.html mask-size-length-length-ref.html -fails == mask-size-length-auto.html mask-size-length-length-ref.html -fails == mask-size-length-length.html mask-size-length-length-ref.html -fails == mask-size-length-percent.html mask-size-length-percent-ref.html -fails == mask-size-percent.html mask-size-percent-percent-ref.html -fails == mask-size-percent-auto.html mask-size-percent-percent-ref.html -fails == mask-size-percent-length.html mask-size-percent-percent-ref.html -fails == mask-size-percent-percent.html mask-size-percent-percent-ref.html -fails == mask-size-percent-percent-stretch.html mask-size-percent-percent-stretch-ref.html +== mask-size-auto.html mask-size-auto-ref.html +== mask-size-auto-auto.html mask-size-auto-ref.html +== mask-size-auto-length.html mask-size-auto-length-ref.html +== mask-size-auto-percent.html mask-size-auto-length-ref.html +== mask-size-contain-clip-border.html mask-size-contain-clip-border-ref.html +== mask-size-contain-clip-padding.html mask-size-contain-clip-padding-ref.html +== mask-size-contain-position-fifty-fifty.html mask-size-contain-position-fifty-fifty-ref.html +== mask-size-contain.html mask-size-contain-ref.html +== mask-size-cover.html mask-size-cover-ref.html +== mask-size-length.html mask-size-length-length-ref.html +== mask-size-length-auto.html mask-size-length-length-ref.html +== mask-size-length-length.html mask-size-length-length-ref.html +== mask-size-length-percent.html mask-size-length-percent-ref.html +== mask-size-percent.html mask-size-percent-percent-ref.html +== mask-size-percent-auto.html mask-size-percent-percent-ref.html +== mask-size-percent-length.html mask-size-percent-percent-ref.html +== mask-size-percent-percent.html mask-size-percent-percent-ref.html +== mask-size-percent-percent-stretch.html mask-size-percent-percent-stretch-ref.html