Bug 1308963 - Part 2. Correct initial value of mask-repeat in property_database.js. r=xidorn

MozReview-Commit-ID: KJOZppT48xS

--HG--
extra : rebase_source : de70784ba77ccc8efd4d255d3a7fc7c97f39ac59
This commit is contained in:
cku 2016-10-13 23:04:55 +08:00
parent 412846baa6
commit 97f3d4a519
3 changed files with 26 additions and 27 deletions

View File

@ -34,9 +34,7 @@
</style>
</head>
<body>
<div class="outer">
<div class="color" id="default"></div>
</div>
<div class="outer color"></div>
<div class="outer">
<div class="color" id="default"></div>
</div>

View File

@ -7021,21 +7021,21 @@ if (SupportsMaskShorthand()) {
type: CSS_TYPE_SHORTHAND_AND_LONGHAND,
/* FIXME: All mask-border-* should be added when we implement them. */
subproperties: ["mask-clip", "mask-image", "mask-mode", "mask-origin", "mask-position-x", "mask-position-y", "mask-repeat", "mask-size" , "mask-composite"],
initial_values: [ "match-source", "none", "no-repeat", "add", "50% 50%", "center center", "50% 50% / auto", "center / auto", "center center / auto", "50% 50% / auto auto",
initial_values: [ "match-source", "none", "repeat", "add", "50% 50%", "center center", "50% 50% / auto", "center / auto", "center center / auto", "50% 50% / auto auto",
"center none", "center center none", "none center", "none center center", "none 50% 50%", "center / auto none",
"center center / auto auto none",
"match-source none no-repeat add center center", "center center no-repeat none add", "none no-repeat add center center / auto", "center center / auto no-repeat none add match-source", "none no-repeat add 50% 50% / auto auto match-source",
"match-source none repeat add center center", "center center repeat none add", "none repeat add center center / auto", "center center / auto repeat none add match-source", "none repeat add 50% 50% / auto auto match-source",
"border-box", "border-box border-box" ],
other_values: [
"none alpha no-repeat add center",
"none alpha repeat add center",
"url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAKElEQVR42u3NQQ0AAAgEoNP+nTWFDzcoQE1udQQCgUAgEAgEAsGTYAGjxAE/G/Q2tQAAAABJRU5ErkJggg==)",
"no-repeat url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAKElEQVR42u3NQQ0AAAgEoNP+nTWFDzcoQE1udQQCgUAgEAgEAsGTYAGjxAE/G/Q2tQAAAABJRU5ErkJggg==') alpha center add",
"repeat-x",
"repeat-y",
"repeat",
"no-repeat",
"none repeat-y alpha add 50% 50%",
"subtract",
"50% center subtract alpha no-repeat none",
"50% center subtract alpha repeat none",
"top",
"left",
"0% 0%",
@ -7049,16 +7049,16 @@ if (SupportsMaskShorthand()) {
"center center / 100px auto",
"center center / 100px 10%",
"center center / 100px calc(20px)",
"bottom right add none alpha no-repeat",
"bottom right add none alpha repeat",
"0% alpha",
"alpha 0%",
"0%",
"url(#mymask)",
"-moz-radial-gradient(10% bottom, #ffffff, black) add repeat",
"-moz-linear-gradient(10px 10px -45deg, red, blue) no-repeat",
"-moz-linear-gradient(10px 10px -0.125turn, red, blue) no-repeat",
"-moz-repeating-radial-gradient(10% bottom, #ffffff, black) add repeat",
"-moz-repeating-linear-gradient(10px 10px -45deg, red, blue) no-repeat",
"-moz-radial-gradient(10% bottom, #ffffff, black) add no-repeat",
"-moz-linear-gradient(10px 10px -45deg, red, blue) repeat",
"-moz-linear-gradient(10px 10px -0.125turn, red, blue) repeat",
"-moz-repeating-radial-gradient(10% bottom, #ffffff, black) add no-repeat",
"-moz-repeating-linear-gradient(10px 10px -45deg, red, blue) repeat",
"-moz-element(#test) alpha",
/* multiple mask-image */
"url(404.png), url(404.png)",
@ -7079,10 +7079,10 @@ if (SupportsMaskShorthand()) {
/* mixes with keywords have to be in correct order */
"50% left", "top 50%",
/* no quirks mode colors */
"-moz-radial-gradient(10% bottom, ffffff, black) add repeat",
"-moz-radial-gradient(10% bottom, ffffff, black) add no-repeat",
/* no quirks mode lengths */
"-moz-linear-gradient(10 10px -45deg, red, blue) no-repeat",
"-moz-linear-gradient(10px 10 -45deg, red, blue) no-repeat",
"-moz-linear-gradient(10 10px -45deg, red, blue) repeat",
"-moz-linear-gradient(10px 10 -45deg, red, blue) repeat",
"linear-gradient(red -99, yellow, green, blue 120%)",
/* bug 258080: don't accept background-position separated */
"left url(404.png) top", "top url(404.png) left",
@ -7243,15 +7243,16 @@ if (SupportsMaskShorthand()) {
domProp: "maskRepeat",
inherited: false,
type: CSS_TYPE_LONGHAND,
initial_values: [ "no-repeat", "no-repeat no-repeat" ],
other_values: [ "repeat-x", "repeat-y", "repeat",
initial_values: [ "repeat", "repeat repeat" ],
other_values: [ "repeat-x", "repeat-y", "no-repeat",
"repeat-x, repeat-x",
"no-repeat, repeat",
"repeat-y, repeat, repeat-y",
"no-repeat, no-repeat, no-repeat",
"no-repeat repeat",
"repeat, no-repeat",
"repeat-y, no-repeat, repeat-y",
"repeat, repeat, repeat",
"repeat no-repeat",
"no-repeat repeat",
"no-repeat no-repeat",
"repeat no-repeat",
"repeat repeat",
"no-repeat no-repeat, no-repeat no-repeat",
],
invalid_values: [ "repeat repeat repeat",

View File

@ -282,9 +282,9 @@ var noframe_container = document.getElementById("content");
"mask-position": [
"left", "right", "top", "bottom", "0%", "100%"
],
// any mask-repeat value other then "no-repeat" "no-repeat no-repeat".
// any mask-repeat value other then "repeat" "repeat repeat".
"mask-repeat": [
"repeat-x", "repeat-y", "repeat", "space", "round"
"repeat-x", "repeat-y", "no-repeat", "space", "round"
],
// any mask-size value other then "auto" "auto auto".
"mask-size": [
@ -313,7 +313,7 @@ var noframe_container = document.getElementById("content");
"50%", "50% 50%", "center"
],
"mask-repeat": [
"no-repeat", "no-repeat no-repeat"
"repeat", "repeat repeat"
],
"mask-size": [
"auto", "auto auto"