Bug 825004 - Part 1: Unprefix CSS3 Text Decoration. r=dbaron

This commit is contained in:
Tooru Fujisawa 2014-11-18 19:23:09 +09:00
parent 9b80c2a75a
commit 1bf9e20256
85 changed files with 170 additions and 170 deletions

View File

@ -709,12 +709,12 @@
</p>
<p id="area17">
<span style="-moz-text-decoration-line: underline;">underline
</span><span style="text-decoration: underline; -moz-text-decoration-color: blue;">blue
</span><span style="text-decoration: underline; -moz-text-decoration-style: dotted;">dotted
</span><span style="-moz-text-decoration-line: line-through;">linethrough
</span><span style="text-decoration: line-through; -moz-text-decoration-color: blue;">blue
</span><span style="text-decoration: line-through; -moz-text-decoration-style: wavy;">wavy
<span style="text-decoration-line: underline;">underline
</span><span style="text-decoration: underline; text-decoration-color: blue;">blue
</span><span style="text-decoration: underline; text-decoration-style: dotted;">dotted
</span><span style="text-decoration-line: line-through;">linethrough
</span><span style="text-decoration: line-through; text-decoration-color: blue;">blue
</span><span style="text-decoration: line-through; text-decoration-style: wavy;">wavy
</span>
</p>

View File

@ -103,7 +103,7 @@
.cm-s-mozilla .cm-unused-line {
text-decoration: line-through;
-moz-text-decoration-color: #5f88b0;
text-decoration-color: #5f88b0;
}
.cm-s-mozilla .cm-executed-line {

View File

@ -76,7 +76,7 @@
.cm-s-mozilla .cm-unused-line {
text-decoration: line-through;
-moz-text-decoration-color: #5f88b0;
text-decoration-color: #5f88b0;
}
.cm-s-mozilla .cm-executed-line {

View File

@ -198,7 +198,7 @@
}
.theme-light .ruleview-overridden {
-moz-text-decoration-color: #667380; /* Content (Text) - Dark Grey */
text-decoration-color: #667380; /* Content (Text) - Dark Grey */
}
.styleinspector-propertyeditor {

View File

@ -1973,9 +1973,9 @@ function isSimpleModifiableElement(node) {
&& (node.style.length == 1
|| (node.style.length == 4
&& "MozTextBlink" in node.style
&& "MozTextDecorationColor" in node.style
&& "MozTextDecorationLine" in node.style
&& "MozTextDecorationStyle" in node.style)
&& "textDecorationColor" in node.style
&& "textDecorationLine" in node.style
&& "textDecorationStyle" in node.style)
)
&& (node.style.textDecoration == "line-through"
|| node.style.textDecoration == "underline"

View File

@ -32,8 +32,8 @@ function init(aTest)
target.style.fontFamily = aTest.font.family;
target.style.fontSize = aTest.font.defaultSize;
decoration.style.MozTextDecorationStyle = aTest.decoration.styleName;
decoration.style.MozTextDecorationColor = aTest.selection.decorationColor;
decoration.style.textDecorationStyle = aTest.decoration.styleName;
decoration.style.textDecorationColor = aTest.selection.decorationColor;
document.documentElement.removeAttribute("class");
setTimeout(function () {

View File

@ -4,13 +4,13 @@ p {
padding-left: 11px;
}
p.dotted span {
-moz-text-decoration-style: dotted;
text-decoration-style: dotted;
}
p.dashed span {
-moz-text-decoration-style: dashed;
text-decoration-style: dashed;
}
p.wavy span {
-moz-text-decoration-style: wavy;
text-decoration-style: wavy;
}
span {
text-decoration: underline line-through overline;

View File

@ -4,13 +4,13 @@ p {
padding-left: 11px;
}
p.dotted span {
-moz-text-decoration-style: dotted;
text-decoration-style: dotted;
}
p.dashed span {
-moz-text-decoration-style: dashed;
text-decoration-style: dashed;
}
p.wavy span {
-moz-text-decoration-style: wavy;
text-decoration-style: wavy;
}
span {
text-decoration: underline line-through overline;

View File

@ -5,13 +5,13 @@ p {
padding-left: 11px;
}
p.dotted span {
-moz-text-decoration-style: dotted;
text-decoration-style: dotted;
}
p.dashed span {
-moz-text-decoration-style: dashed;
text-decoration-style: dashed;
}
p.wavy span {
-moz-text-decoration-style: wavy;
text-decoration-style: wavy;
}
span {
text-decoration: underline line-through overline;

View File

@ -5,13 +5,13 @@ p {
padding-left: 11px;
}
p.dotted span {
-moz-text-decoration-style: dotted;
text-decoration-style: dotted;
}
p.dashed span {
-moz-text-decoration-style: dashed;
text-decoration-style: dashed;
}
p.wavy span {
-moz-text-decoration-style: wavy;
text-decoration-style: wavy;
}
span {
text-decoration: underline line-through overline;

View File

@ -50,7 +50,7 @@
<span style="font-size:2em;
color: red;
text-decoration: underline line-through overline;
-moz-text-decoration-color: blue;">
text-decoration-color: blue;">
here is red text with blue decoration lines</span>,
and here is blue text without decoration lines.
</p>
@ -59,7 +59,7 @@
<span style="font-size:2em;
color: red;
text-decoration: underline line-through overline;
-moz-text-decoration-color: green;">
text-decoration-color: green;">
here is red text with green decoration lines</span>,
and here is blue text without decoration lines.
</p>

View File

@ -1,21 +1,21 @@
<p style="color: blue;
text-decoration: underline line-through overline;
-moz-text-decoration-color: green;">
text-decoration-color: green;">
This blue text has green decoration lines
</p>
<p style="color: #ff0000;
text-decoration: underline line-through overline;
-moz-text-decoration-color: #ffff00;">
text-decoration-color: #ffff00;">
This red text has yellow decoration lines
</p>
<p style="color: rgb(0%, 0%, 100%);
text-decoration: underline line-through overline;
-moz-text-decoration-color: rgb(100%, 0%, 0%);">
text-decoration-color: rgb(100%, 0%, 0%);">
This blue text has red lines
</p>
<p style="color: orange;
text-decoration: underline line-through overline;
-moz-text-decoration-color: transparent;">
text-decoration-color: transparent;">
This orange text has transparent lines
</p>
<p>
@ -23,7 +23,7 @@
<span style="font-size: 2em;
color: blue;
text-decoration: underline line-through overline;
-moz-text-decoration-color: green;">
text-decoration-color: green;">
this blue text has green decoration lines</span>,
and here is no decoration lines too.
</p>
@ -31,7 +31,7 @@
This is red paragraph and here is no decoration lines, but
<span style="font-size: 2em;
text-decoration: underline line-through overline;
-moz-text-decoration-color: green;">
text-decoration-color: green;">
here are green decoration lines</span>,
and here is no decoration lines too.
</p>
@ -40,7 +40,7 @@
This is purple paragraph and here are decoration lines of current color, but
<span style="font-size: 2em;
text-decoration: underline line-through overline;
-moz-text-decoration-color: red;">
text-decoration-color: red;">
here are red decoration lines</span>,
and here are current color decoration lines.
</p>
@ -48,7 +48,7 @@
text-decoration: underline line-through overline;">
This is green paragraph and here are decoration lines of current color, and
<span style="font-size: 2em;
-moz-text-decoration-color: red;">
text-decoration-color: red;">
here is specified red decoration color but has current color lines</span>,
and here are current color decoration lines.
</p>
@ -57,22 +57,22 @@
<span style="font-size:2em;
color: red;
text-decoration: underline line-through overline;
-moz-text-decoration-color: inherit;">
text-decoration-color: inherit;">
here is red text with blue decoration lines</span>,
and here is blue text without decoration lines.
</p>
<p style="color: blue;
-moz-text-decoration-color: green;">
text-decoration-color: green;">
This is blue paragraph and decoration color is specified as green,
<span style="font-size:2em;
color: red;
text-decoration: underline line-through overline;
-moz-text-decoration-color: inherit;">
text-decoration-color: inherit;">
here is red text with green decoration lines</span>,
and here is blue text without decoration lines.
</p>
<p style="color: blue;
-moz-text-decoration-color: red;
text-decoration-color: red;
text-decoration: underline line-through overline;">
Here has blue decoration lines even though its color is specified as red
before text-decoration.

View File

@ -52,7 +52,7 @@
<span style="font-size:2em;
color: red;
text-decoration: underline line-through overline;
-moz-text-decoration-color: blue;">
text-decoration-color: blue;">
here is red text with blue decoration lines</span>,
and here is blue text without decoration lines.
</p>
@ -61,7 +61,7 @@
<span style="font-size:2em;
color: red;
text-decoration: underline line-through overline;
-moz-text-decoration-color: green;">
text-decoration-color: green;">
here is red text with green decoration lines</span>,
and here is blue text without decoration lines.
</p>

View File

@ -1,29 +1,29 @@
<!DOCTYPE html>
<p style="color: blue;
text-decoration: underline line-through overline;
-moz-text-decoration-color: green;">
text-decoration-color: green;">
This blue text has green decoration lines
</p>
<p style="color: #ff0000;
text-decoration: underline line-through overline;
-moz-text-decoration-color: #ffff00;">
text-decoration-color: #ffff00;">
This red text has yellow decoration lines
</p>
<p style="color: rgb(0%, 0%, 100%);
text-decoration: underline line-through overline;
-moz-text-decoration-color: rgb(100%, 0%, 0%);">
text-decoration-color: rgb(100%, 0%, 0%);">
This blue text has red lines
</p>
<p style="color: orange;
text-decoration: underline line-through overline;
-moz-text-decoration-color: transparent;">
text-decoration-color: transparent;">
This orange text has transparent lines
</p>
<p>
Here is no decoration lines, but
<span style="font-size: 2em; color: blue;
text-decoration: underline line-through overline;
-moz-text-decoration-color: green;">
text-decoration-color: green;">
this blue text has green decoration lines</span>,
and here is no decoration lines too.
</p>
@ -31,7 +31,7 @@
This is red paragraph and here is no decoration lines, but
<span style="font-size: 2em;
text-decoration: underline line-through overline;
-moz-text-decoration-color: green;">
text-decoration-color: green;">
here are green decoration lines</span>,
and here is no decoration lines too.</p>
<p style="color: purple;
@ -39,7 +39,7 @@
This is purple paragraph and here are decoration lines of current color, but
<span style="font-size: 2em;
text-decoration: underline line-through overline;
-moz-text-decoration-color: red;">
text-decoration-color: red;">
here are red decoration lines</span>,
and here are current color decoration lines.
</p>
@ -47,7 +47,7 @@
text-decoration: underline line-through overline;">
This is green paragraph and here are decoration lines of current color, and
<span style="font-size: 2em;
-moz-text-decoration-color: red;">
text-decoration-color: red;">
here is specified red decoration color but has current color lines</span>,
and here are current color decoration lines.
</p>
@ -56,22 +56,22 @@
<span style="font-size:2em;
color: red;
text-decoration: underline line-through overline;
-moz-text-decoration-color: inherit;">
text-decoration-color: inherit;">
here is red text with blue decoration lines</span>,
and here is blue text without decoration lines.
</p>
<p style="color: blue;
-moz-text-decoration-color: green;">
text-decoration-color: green;">
This is blue paragraph and decoration color is specified as green,
<span style="font-size:2em;
color: red;
text-decoration: underline line-through overline;
-moz-text-decoration-color: inherit;">
text-decoration-color: inherit;">
here is red text with green decoration lines</span>,
and here is blue text without decoration lines.
</p>
<p style="color: blue;
-moz-text-decoration-color: red;
text-decoration-color: red;
text-decoration: underline line-through overline;">
Here has blue decoration lines even though its color is specified as red
before text-decoration.

View File

@ -3,7 +3,7 @@
however,
<span style="font-size: 2em;
text-decoration: underline line-through overline;
-moz-text-decoration: solid;">
text-decoration: solid;">
here has solid decoration lines</span>,
and here has no decoration lines.
</p>
@ -12,32 +12,32 @@
however,
<span style="font-size: 2em;
text-decoration: underline line-through overline;
-moz-text-decoration-style: dashed;">
text-decoration-style: dashed;">
here has inherited decoration lines</span>,
and here has no decoration lines.
</p>
<p>
<span style="text-decoration: underline line-through overline;
-moz-text-decoration-style: dotted;">
text-decoration-style: dotted;">
Here has dotted decoration lines,
</span><span style="text-decoration: underline line-through overline;
-moz-text-decoration-style: dotted">
text-decoration-style: dotted">
<span style="font-size: 2em;
text-decoration: underline line-through overline;
-moz-text-decoration-style: wavy;">
text-decoration-style: wavy;">
here has wavy decoration
lines</span></span><span style="text-decoration: underline line-through overline;
-moz-text-decoration-style: dotted;">,
text-decoration-style: dotted;">,
and here has dotted decoration lines.</span>
</p>
<p>
<span style="text-decoration: underline line-through overline;
-moz-text-decoration-style: double;">
text-decoration-style: double;">
Here has double decoration lines,
<span style="font-size: 2em;">
here is specified as dashed decoration lines but should be
ignored</span><span style="text-decoration: underline line-through overline;
-moz-text-decoration-style: double;">,
text-decoration-style: double;">,
and here has double decoration lines.</span></span>
</p>
<p>

View File

@ -1,41 +1,41 @@
<p style="-moz-text-decoration-style: dotted;">
<p style="text-decoration-style: dotted;">
Here is specified the decoration style as dotted but no decoration lines, however,
<span style="font-size: 2em;
text-decoration: underline line-through overline;">
here has solid decoration lines</span>,
and here has no decoration lines.
</p>
<p style="-moz-text-decoration-style: dashed;">
<p style="text-decoration-style: dashed;">
Here is specified the decoration style as dashed but no decoration lines,
however,
<span style="font-size: 2em;
text-decoration: underline line-through overline;
-moz-text-decoration-style: inherit;">
text-decoration-style: inherit;">
here has inherited decoration lines</span>,
and here has no decoration lines.
</p>
<p style="text-decoration: underline line-through overline;
-moz-text-decoration-style: dotted;">
text-decoration-style: dotted;">
Here has dotted decoration lines,
<span style="font-size: 2em;
text-decoration: underline line-through overline;
-moz-text-decoration-style: wavy;">
text-decoration-style: wavy;">
here has wavy decoration lines</span>,
and here has dotted decoration lines.
</p>
<p style="text-decoration: underline line-through overline;
-moz-text-decoration-style: double;">
text-decoration-style: double;">
Here has double decoration lines,
<span style="font-size: 2em;
-moz-text-decoration-style: dashed;">
text-decoration-style: dashed;">
here is specified as dashed decoration lines but should be ignored</span>,
and here has double decoration lines.
</p>
<p style="text-decoration: underline line-through overline;
-moz-text-decoration-style: -moz-none;">
text-decoration-style: -moz-none;">
Here is specified the decoration style as -moz-none.
</p>
<p style="-moz-text-decoration-style: dotted;
<p style="text-decoration-style: dotted;
text-decoration: underline line-through overline;">
Here has solid decoration lines even if its style is specified as dotted
before text-decoration.

View File

@ -4,7 +4,7 @@
however,
<span style="font-size: 2em;
text-decoration: underline line-through overline;
-moz-text-decoration: solid;">
text-decoration: solid;">
here has solid decoration lines</span>,
and here has no decoration lines.
</p>
@ -13,12 +13,12 @@
however,
<span style="font-size: 2em;
text-decoration: underline line-through overline;
-moz-text-decoration-style: dashed;">
text-decoration-style: dashed;">
here has inherited decoration lines</span>,
and here has no decoration lines.
</p>
<p style="text-decoration: underline line-through overline;
-moz-text-decoration-style: double;">
text-decoration-style: double;">
Here has double decoration lines,
<span style="font-size: 2em;
text-decoration: none;">

View File

@ -1,33 +1,33 @@
<!DOCTYPE html>
<p style="-moz-text-decoration-style: dotted;">
<p style="text-decoration-style: dotted;">
Here is specified the decoration style as dotted but no decoration lines,
however,
<span style="font-size: 2em;
text-decoration: underline line-through overline;">
here has solid decoration lines</span>, and here has no decoration lines.
</p>
<p style="-moz-text-decoration-style: dashed;">
<p style="text-decoration-style: dashed;">
Here is specified the decoration style as dashed but no decoration lines,
however,
<span style="font-size: 2em;
text-decoration: underline line-through overline;
-moz-text-decoration-style: inherit;">
text-decoration-style: inherit;">
here has inherited decoration lines</span>,
and here has no decoration lines.
</p>
<p style="text-decoration: underline line-through overline;
-moz-text-decoration-style: double;">
text-decoration-style: double;">
Here has double decoration lines,
<span style="font-size: 2em;
-moz-text-decoration-style: dashed;">
text-decoration-style: dashed;">
here is specified as dashed decoration lines but should be ignored</span>,
and here has double decoration lines.
</p>
<p style="text-decoration: underline line-through overline;
-moz-text-decoration-style: -moz-none;">
text-decoration-style: -moz-none;">
Here is specified the decoration style as -moz-none.
</p>
<p style="-moz-text-decoration-style: dotted;
<p style="text-decoration-style: dotted;
text-decoration: underline line-through overline;">
Here has solid decoration lines even if its style is specified as dotted
before text-decoration.

View File

@ -1 +1 @@
<p style="text-decoration: line-through; -moz-text-decoration-style: dashed;">This paragraph has line-through</p>
<p style="text-decoration: line-through; text-decoration-style: dashed;">This paragraph has line-through</p>

View File

@ -1,2 +1,2 @@
<!DOCTYPE html>
<p style="text-decoration: line-through; -moz-text-decoration-style: dashed;">This paragraph has line-through</p>
<p style="text-decoration: line-through; text-decoration-style: dashed;">This paragraph has line-through</p>

View File

@ -1 +1 @@
<p style="text-decoration: line-through; -moz-text-decoration-style: dotted;">This paragraph has line-through</p>
<p style="text-decoration: line-through; text-decoration-style: dotted;">This paragraph has line-through</p>

View File

@ -1,2 +1,2 @@
<!DOCTYPE html>
<p style="text-decoration: line-through; -moz-text-decoration-style: dotted;">This paragraph has line-through</p>
<p style="text-decoration: line-through; text-decoration-style: dotted;">This paragraph has line-through</p>

View File

@ -1 +1 @@
<p style="text-decoration: line-through; -moz-text-decoration-style: double;">This paragraph has line-through</p>
<p style="text-decoration: line-through; text-decoration-style: double;">This paragraph has line-through</p>

View File

@ -1,2 +1,2 @@
<!DOCTYPE html>
<p style="text-decoration: line-through; -moz-text-decoration-style: double;">This paragraph has line-through</p>
<p style="text-decoration: line-through; text-decoration-style: double;">This paragraph has line-through</p>

View File

@ -1 +1 @@
<p style="text-decoration: line-through; -moz-text-decoration-style: solid;">This paragraph has line-through</p>
<p style="text-decoration: line-through; text-decoration-style: solid;">This paragraph has line-through</p>

View File

@ -1,2 +1,2 @@
<!DOCTYPE html>
<p style="text-decoration: line-through; -moz-text-decoration-style: solid;">This paragraph has line-through</p>
<p style="text-decoration: line-through; text-decoration-style: solid;">This paragraph has line-through</p>

View File

@ -1 +1 @@
<p style="text-decoration: line-through; -moz-text-decoration-style: wavy;">This paragraph has line-through</p>
<p style="text-decoration: line-through; text-decoration-style: wavy;">This paragraph has line-through</p>

View File

@ -1,2 +1,2 @@
<!DOCTYPE html>
<p style="text-decoration: line-through; -moz-text-decoration-style: wavy;">This paragraph has line-through</p>
<p style="text-decoration: line-through; text-decoration-style: wavy;">This paragraph has line-through</p>

View File

@ -1 +1 @@
<p>This paragraph has no decoration lines, but <span style="text-decoration: line-through; -moz-text-decoration-style: dashed;">here has line-through</span>, and here has no decoration lines.</p>
<p>This paragraph has no decoration lines, but <span style="text-decoration: line-through; text-decoration-style: dashed;">here has line-through</span>, and here has no decoration lines.</p>

View File

@ -1,2 +1,2 @@
<!DOCTYPE html>
<p>This paragraph has no decoration lines, but <span style="text-decoration: line-through; -moz-text-decoration-style: dashed;">here has line-through</span>, and here has no decoration lines.</p>
<p>This paragraph has no decoration lines, but <span style="text-decoration: line-through; text-decoration-style: dashed;">here has line-through</span>, and here has no decoration lines.</p>

View File

@ -1 +1 @@
<p>This paragraph has no decoration lines, but <span style="text-decoration: line-through; -moz-text-decoration-style: dotted;">here has line-through</span>, and here has no decoration lines.</p>
<p>This paragraph has no decoration lines, but <span style="text-decoration: line-through; text-decoration-style: dotted;">here has line-through</span>, and here has no decoration lines.</p>

View File

@ -1,2 +1,2 @@
<!DOCTYPE html>
<p>This paragraph has no decoration lines, but <span style="text-decoration: line-through; -moz-text-decoration-style: dotted;">here has line-through</span>, and here has no decoration lines.</p>
<p>This paragraph has no decoration lines, but <span style="text-decoration: line-through; text-decoration-style: dotted;">here has line-through</span>, and here has no decoration lines.</p>

View File

@ -1 +1 @@
<p>This paragraph has no decoration lines, but <span style="text-decoration: line-through; -moz-text-decoration-style: double;">here has line-through</span>, and here has no decoration lines.</p>
<p>This paragraph has no decoration lines, but <span style="text-decoration: line-through; text-decoration-style: double;">here has line-through</span>, and here has no decoration lines.</p>

View File

@ -1,2 +1,2 @@
<!DOCTYPE html>
<p>This paragraph has no decoration lines, but <span style="text-decoration: line-through; -moz-text-decoration-style: double;">here has line-through</span>, and here has no decoration lines.</p>
<p>This paragraph has no decoration lines, but <span style="text-decoration: line-through; text-decoration-style: double;">here has line-through</span>, and here has no decoration lines.</p>

View File

@ -1 +1 @@
<p>This paragraph has no decoration lines, but <span style="text-decoration: line-through; -moz-text-decoration-style: solid;">here has line-through</span>, and here has no decoration lines.</p>
<p>This paragraph has no decoration lines, but <span style="text-decoration: line-through; text-decoration-style: solid;">here has line-through</span>, and here has no decoration lines.</p>

View File

@ -1,2 +1,2 @@
<!DOCTYPE html>
<p>This paragraph has no decoration lines, but <span style="text-decoration: line-through; -moz-text-decoration-style: solid;">here has line-through</span>, and here has no decoration lines.</p>
<p>This paragraph has no decoration lines, but <span style="text-decoration: line-through; text-decoration-style: solid;">here has line-through</span>, and here has no decoration lines.</p>

View File

@ -1 +1 @@
<p>This paragraph has no decoration lines, but <span style="text-decoration: line-through; -moz-text-decoration-style: wavy;">here has line-through</span>, and here has no decoration lines.</p>
<p>This paragraph has no decoration lines, but <span style="text-decoration: line-through; text-decoration-style: wavy;">here has line-through</span>, and here has no decoration lines.</p>

View File

@ -1,2 +1,2 @@
<!DOCTYPE html>
<p>This paragraph has no decoration lines, but <span style="text-decoration: line-through; -moz-text-decoration-style: wavy;">here has line-through</span>, and here has no decoration lines.</p>
<p>This paragraph has no decoration lines, but <span style="text-decoration: line-through; text-decoration-style: wavy;">here has line-through</span>, and here has no decoration lines.</p>

View File

@ -1 +1 @@
<p style="text-decoration: overline; -moz-text-decoration-style: dashed;">This paragraph has overline</p>
<p style="text-decoration: overline; text-decoration-style: dashed;">This paragraph has overline</p>

View File

@ -1,2 +1,2 @@
<!DOCTYPE html>
<p style="text-decoration: overline; -moz-text-decoration-style: dashed;">This paragraph has overline</p>
<p style="text-decoration: overline; text-decoration-style: dashed;">This paragraph has overline</p>

View File

@ -1 +1 @@
<p style="text-decoration: overline; -moz-text-decoration-style: dotted;">This paragraph has overline</p>
<p style="text-decoration: overline; text-decoration-style: dotted;">This paragraph has overline</p>

View File

@ -1,2 +1,2 @@
<!DOCTYPE html>
<p style="text-decoration: overline; -moz-text-decoration-style: dotted;">This paragraph has overline</p>
<p style="text-decoration: overline; text-decoration-style: dotted;">This paragraph has overline</p>

View File

@ -1 +1 @@
<p style="text-decoration: overline; -moz-text-decoration-style: double;">This paragraph has overline</p>
<p style="text-decoration: overline; text-decoration-style: double;">This paragraph has overline</p>

View File

@ -1,2 +1,2 @@
<!DOCTYPE html>
<p style="text-decoration: overline; -moz-text-decoration-style: double;">This paragraph has overline</p>
<p style="text-decoration: overline; text-decoration-style: double;">This paragraph has overline</p>

View File

@ -1 +1 @@
<p style="text-decoration: overline; -moz-text-decoration-style: solid;">This paragraph has overline</p>
<p style="text-decoration: overline; text-decoration-style: solid;">This paragraph has overline</p>

View File

@ -1,2 +1,2 @@
<!DOCTYPE html>
<p style="text-decoration: overline; -moz-text-decoration-style: solid;">This paragraph has overline</p>
<p style="text-decoration: overline; text-decoration-style: solid;">This paragraph has overline</p>

View File

@ -1 +1 @@
<p style="text-decoration: overline; -moz-text-decoration-style: wavy;">This paragraph has overline</p>
<p style="text-decoration: overline; text-decoration-style: wavy;">This paragraph has overline</p>

View File

@ -1,2 +1,2 @@
<!DOCTYPE html>
<p style="text-decoration: overline; -moz-text-decoration-style: wavy;">This paragraph has overline</p>
<p style="text-decoration: overline; text-decoration-style: wavy;">This paragraph has overline</p>

View File

@ -1 +1 @@
<p>This paragraph has no decoration lines, but <span style="text-decoration: overline; -moz-text-decoration-style: dashed;">here has overline</span>, and here has no decoration lines.</p>
<p>This paragraph has no decoration lines, but <span style="text-decoration: overline; text-decoration-style: dashed;">here has overline</span>, and here has no decoration lines.</p>

View File

@ -1,2 +1,2 @@
<!DOCTYPE html>
<p>This paragraph has no decoration lines, but <span style="text-decoration: overline; -moz-text-decoration-style: dashed;">here has overline</span>, and here has no decoration lines.</p>
<p>This paragraph has no decoration lines, but <span style="text-decoration: overline; text-decoration-style: dashed;">here has overline</span>, and here has no decoration lines.</p>

View File

@ -1 +1 @@
<p>This paragraph has no decoration lines, but <span style="text-decoration: overline; -moz-text-decoration-style: dotted;">here has overline</span>, and here has no decoration lines.</p>
<p>This paragraph has no decoration lines, but <span style="text-decoration: overline; text-decoration-style: dotted;">here has overline</span>, and here has no decoration lines.</p>

View File

@ -1,2 +1,2 @@
<!DOCTYPE html>
<p>This paragraph has no decoration lines, but <span style="text-decoration: overline; -moz-text-decoration-style: dotted;">here has overline</span>, and here has no decoration lines.</p>
<p>This paragraph has no decoration lines, but <span style="text-decoration: overline; text-decoration-style: dotted;">here has overline</span>, and here has no decoration lines.</p>

View File

@ -1 +1 @@
<p>This paragraph has no decoration lines, but <span style="text-decoration: overline; -moz-text-decoration-style: double;">here has overline</span>, and here has no decoration lines.</p>
<p>This paragraph has no decoration lines, but <span style="text-decoration: overline; text-decoration-style: double;">here has overline</span>, and here has no decoration lines.</p>

View File

@ -1,2 +1,2 @@
<!DOCTYPE html>
<p>This paragraph has no decoration lines, but <span style="text-decoration: overline; -moz-text-decoration-style: double;">here has overline</span>, and here has no decoration lines.</p>
<p>This paragraph has no decoration lines, but <span style="text-decoration: overline; text-decoration-style: double;">here has overline</span>, and here has no decoration lines.</p>

View File

@ -1 +1 @@
<p>This paragraph has no decoration lines, but <span style="text-decoration: overline; -moz-text-decoration-style: solid;">here has overline</span>, and here has no decoration lines.</p>
<p>This paragraph has no decoration lines, but <span style="text-decoration: overline; text-decoration-style: solid;">here has overline</span>, and here has no decoration lines.</p>

View File

@ -1,2 +1,2 @@
<!DOCTYPE html>
<p>This paragraph has no decoration lines, but <span style="text-decoration: overline; -moz-text-decoration-style: solid;">here has overline</span>, and here has no decoration lines.</p>
<p>This paragraph has no decoration lines, but <span style="text-decoration: overline; text-decoration-style: solid;">here has overline</span>, and here has no decoration lines.</p>

View File

@ -1 +1 @@
<p>This paragraph has no decoration lines, but <span style="text-decoration: overline; -moz-text-decoration-style: wavy;">here has overline</span>, and here has no decoration lines.</p>
<p>This paragraph has no decoration lines, but <span style="text-decoration: overline; text-decoration-style: wavy;">here has overline</span>, and here has no decoration lines.</p>

View File

@ -1,2 +1,2 @@
<!DOCTYPE html>
<p>This paragraph has no decoration lines, but <span style="text-decoration: overline; -moz-text-decoration-style: wavy;">here has overline</span>, and here has no decoration lines.</p>
<p>This paragraph has no decoration lines, but <span style="text-decoration: overline; text-decoration-style: wavy;">here has overline</span>, and here has no decoration lines.</p>

View File

@ -1 +1 @@
<p style="text-decoration: underline; -moz-text-decoration-style: dashed;">This paragraph has underline</p>
<p style="text-decoration: underline; text-decoration-style: dashed;">This paragraph has underline</p>

View File

@ -1,2 +1,2 @@
<!DOCTYPE html>
<p style="text-decoration: underline; -moz-text-decoration-style: dashed;">This paragraph has underline</p>
<p style="text-decoration: underline; text-decoration-style: dashed;">This paragraph has underline</p>

View File

@ -1 +1 @@
<p style="text-decoration: underline; -moz-text-decoration-style: dotted;">This paragraph has underline</p>
<p style="text-decoration: underline; text-decoration-style: dotted;">This paragraph has underline</p>

View File

@ -1,2 +1,2 @@
<!DOCTYPE html>
<p style="text-decoration: underline; -moz-text-decoration-style: dotted;">This paragraph has underline</p>
<p style="text-decoration: underline; text-decoration-style: dotted;">This paragraph has underline</p>

View File

@ -1 +1 @@
<p style="text-decoration: underline; -moz-text-decoration-style: double;">This paragraph has underline</p>
<p style="text-decoration: underline; text-decoration-style: double;">This paragraph has underline</p>

View File

@ -1,2 +1,2 @@
<!DOCTYPE html>
<p style="text-decoration: underline; -moz-text-decoration-style: double;">This paragraph has underline</p>
<p style="text-decoration: underline; text-decoration-style: double;">This paragraph has underline</p>

View File

@ -1 +1 @@
<p style="text-decoration: underline; -moz-text-decoration-style: solid;">This paragraph has underline</p>
<p style="text-decoration: underline; text-decoration-style: solid;">This paragraph has underline</p>

View File

@ -1,2 +1,2 @@
<!DOCTYPE html>
<p style="text-decoration: underline; -moz-text-decoration-style: solid;">This paragraph has underline</p>
<p style="text-decoration: underline; text-decoration-style: solid;">This paragraph has underline</p>

View File

@ -1 +1 @@
<p style="text-decoration: underline; -moz-text-decoration-style: wavy;">This paragraph has underline</p>
<p style="text-decoration: underline; text-decoration-style: wavy;">This paragraph has underline</p>

View File

@ -1,2 +1,2 @@
<!DOCTYPE html>
<p style="text-decoration: underline; -moz-text-decoration-style: wavy;">This paragraph has underline</p>
<p style="text-decoration: underline; text-decoration-style: wavy;">This paragraph has underline</p>

View File

@ -1 +1 @@
<p>This paragraph has no decoration lines, but <span style="text-decoration: underline; -moz-text-decoration-style: dashed;">here has underline</span>, and here has no decoration lines.</p>
<p>This paragraph has no decoration lines, but <span style="text-decoration: underline; text-decoration-style: dashed;">here has underline</span>, and here has no decoration lines.</p>

View File

@ -1,2 +1,2 @@
<!DOCTYPE html>
<p>This paragraph has no decoration lines, but <span style="text-decoration: underline; -moz-text-decoration-style: dashed;">here has underline</span>, and here has no decoration lines.</p>
<p>This paragraph has no decoration lines, but <span style="text-decoration: underline; text-decoration-style: dashed;">here has underline</span>, and here has no decoration lines.</p>

View File

@ -1 +1 @@
<p>This paragraph has no decoration lines, but <span style="text-decoration: underline; -moz-text-decoration-style: dotted;">here has underline</span>, and here has no decoration lines.</p>
<p>This paragraph has no decoration lines, but <span style="text-decoration: underline; text-decoration-style: dotted;">here has underline</span>, and here has no decoration lines.</p>

View File

@ -1,2 +1,2 @@
<!DOCTYPE html>
<p>This paragraph has no decoration lines, but <span style="text-decoration: underline; -moz-text-decoration-style: dotted;">here has underline</span>, and here has no decoration lines.</p>
<p>This paragraph has no decoration lines, but <span style="text-decoration: underline; text-decoration-style: dotted;">here has underline</span>, and here has no decoration lines.</p>

View File

@ -1 +1 @@
<p>This paragraph has no decoration lines, but <span style="text-decoration: underline; -moz-text-decoration-style: double;">here has underline</span>, and here has no decoration lines.</p>
<p>This paragraph has no decoration lines, but <span style="text-decoration: underline; text-decoration-style: double;">here has underline</span>, and here has no decoration lines.</p>

View File

@ -1,2 +1,2 @@
<!DOCTYPE html>
<p>This paragraph has no decoration lines, but <span style="text-decoration: underline; -moz-text-decoration-style: double;">here has underline</span>, and here has no decoration lines.</p>
<p>This paragraph has no decoration lines, but <span style="text-decoration: underline; text-decoration-style: double;">here has underline</span>, and here has no decoration lines.</p>

View File

@ -1 +1 @@
<p>This paragraph has no decoration lines, but <span style="text-decoration: underline; -moz-text-decoration-style: solid;">here has underline</span>, and here has no decoration lines.</p>
<p>This paragraph has no decoration lines, but <span style="text-decoration: underline; text-decoration-style: solid;">here has underline</span>, and here has no decoration lines.</p>

View File

@ -1,2 +1,2 @@
<!DOCTYPE html>
<p>This paragraph has no decoration lines, but <span style="text-decoration: underline; -moz-text-decoration-style: solid;">here has underline</span>, and here has no decoration lines.</p>
<p>This paragraph has no decoration lines, but <span style="text-decoration: underline; text-decoration-style: solid;">here has underline</span>, and here has no decoration lines.</p>

View File

@ -1 +1 @@
<p>This paragraph has no decoration lines, but <span style="text-decoration: underline; -moz-text-decoration-style: wavy;">here has underline</span>, and here has no decoration lines.</p>
<p>This paragraph has no decoration lines, but <span style="text-decoration: underline; text-decoration-style: wavy;">here has underline</span>, and here has no decoration lines.</p>

View File

@ -1,2 +1,2 @@
<!DOCTYPE html>
<p>This paragraph has no decoration lines, but <span style="text-decoration: underline; -moz-text-decoration-style: wavy;">here has underline</span>, and here has no decoration lines.</p>
<p>This paragraph has no decoration lines, but <span style="text-decoration: underline; text-decoration-style: wavy;">here has underline</span>, and here has no decoration lines.</p>

View File

@ -132,8 +132,8 @@ textarea::-moz-placeholder {
padding: inherit !important;
margin: 0px;
text-decoration: inherit;
-moz-text-decoration-color: inherit;
-moz-text-decoration-style: inherit;
text-decoration-color: inherit;
text-decoration-style: inherit;
display: inline-block;
ime-mode: inherit;
resize: inherit;

View File

@ -3045,9 +3045,9 @@ CSS_PROP_TEXT(
offsetof(nsStyleText, mTextCombineUpright),
eStyleAnimType_EnumU8)
CSS_PROP_TEXTRESET(
-moz-text-decoration-color,
text-decoration-color,
text_decoration_color,
CSS_PROP_DOMPROP_PREFIXED(TextDecorationColor),
TextDecorationColor,
CSS_PROPERTY_PARSE_VALUE |
CSS_PROPERTY_APPLIES_TO_FIRST_LETTER_AND_FIRST_LINE |
CSS_PROPERTY_APPLIES_TO_PLACEHOLDER |
@ -3058,9 +3058,9 @@ CSS_PROP_TEXTRESET(
CSS_PROP_NO_OFFSET,
eStyleAnimType_Custom)
CSS_PROP_TEXTRESET(
-moz-text-decoration-line,
text-decoration-line,
text_decoration_line,
CSS_PROP_DOMPROP_PREFIXED(TextDecorationLine),
TextDecorationLine,
CSS_PROPERTY_PARSE_VALUE |
CSS_PROPERTY_VALUE_PARSER_FUNCTION |
CSS_PROPERTY_APPLIES_TO_FIRST_LETTER_AND_FIRST_LINE |
@ -3071,9 +3071,9 @@ CSS_PROP_TEXTRESET(
offsetof(nsStyleTextReset, mTextDecorationLine),
eStyleAnimType_EnumU8)
CSS_PROP_TEXTRESET(
-moz-text-decoration-style,
text-decoration-style,
text_decoration_style,
CSS_PROP_DOMPROP_PREFIXED(TextDecorationStyle),
TextDecorationStyle,
CSS_PROPERTY_PARSE_VALUE |
CSS_PROPERTY_APPLIES_TO_FIRST_LETTER_AND_FIRST_LINE |
CSS_PROPERTY_APPLIES_TO_PLACEHOLDER,

View File

@ -203,6 +203,9 @@ COMPUTED_STYLE_PROP(table_layout, TableLayout)
COMPUTED_STYLE_PROP(text_align, TextAlign)
COMPUTED_STYLE_PROP(text_combine_upright, TextCombineUpright)
COMPUTED_STYLE_PROP(text_decoration, TextDecoration)
COMPUTED_STYLE_PROP(text_decoration_color, TextDecorationColor)
COMPUTED_STYLE_PROP(text_decoration_line, TextDecorationLine)
COMPUTED_STYLE_PROP(text_decoration_style, TextDecorationStyle)
COMPUTED_STYLE_PROP(text_indent, TextIndent)
COMPUTED_STYLE_PROP(text_orientation, TextOrientation)
COMPUTED_STYLE_PROP(text_overflow, TextOverflow)
@ -268,9 +271,6 @@ COMPUTED_STYLE_PROP(_moz_outline_radius_topRight, OutlineRadiusTopRight)
COMPUTED_STYLE_PROP(stack_sizing, StackSizing)
COMPUTED_STYLE_PROP(_moz_tab_size, TabSize)
COMPUTED_STYLE_PROP(text_align_last, TextAlignLast)
COMPUTED_STYLE_PROP(text_decoration_color, TextDecorationColor)
COMPUTED_STYLE_PROP(text_decoration_line, TextDecorationLine)
COMPUTED_STYLE_PROP(text_decoration_style, TextDecorationStyle)
COMPUTED_STYLE_PROP(text_size_adjust, TextSizeAdjust)
COMPUTED_STYLE_PROP(user_focus, UserFocus)
COMPUTED_STYLE_PROP(user_input, UserInput)

View File

@ -3284,14 +3284,14 @@ var gCSSProperties = {
domProp: "textDecoration",
inherited: false,
type: CSS_TYPE_SHORTHAND_AND_LONGHAND,
subproperties: [ "-moz-text-decoration-color", "-moz-text-decoration-line", "-moz-text-decoration-style" ],
subproperties: [ "text-decoration-color", "text-decoration-line", "text-decoration-style" ],
initial_values: [ "none" ],
other_values: [ "underline", "overline", "line-through", "blink", "blink line-through underline", "underline overline line-through blink", "-moz-anchor-decoration", "blink -moz-anchor-decoration" ],
invalid_values: [ "none none", "underline none", "none underline", "blink none", "none blink", "line-through blink line-through", "underline overline line-through blink none", "underline overline line-throuh blink blink",
"underline red solid", "underline #ff0000", "solid underline", "red underline", "#ff0000 underline" ]
},
"-moz-text-decoration-color": {
domProp: "MozTextDecorationColor",
"text-decoration-color": {
domProp: "textDecorationColor",
inherited: false,
type: CSS_TYPE_LONGHAND,
prerequisites: { "color": "black" },
@ -3299,16 +3299,16 @@ var gCSSProperties = {
other_values: [ "green", "rgba(255,128,0,0.5)", "transparent" ],
invalid_values: [ "#0", "#00", "#0000", "#00000", "#0000000", "#00000000", "#000000000", "000000", "ff00ff" ]
},
"-moz-text-decoration-line": {
domProp: "MozTextDecorationLine",
"text-decoration-line": {
domProp: "textDecorationLine",
inherited: false,
type: CSS_TYPE_LONGHAND,
initial_values: [ "none" ],
other_values: [ "underline", "overline", "line-through", "blink", "blink line-through underline", "underline overline line-through blink", "-moz-anchor-decoration", "blink -moz-anchor-decoration" ],
invalid_values: [ "none none", "underline none", "none underline", "line-through blink line-through", "underline overline line-through blink none", "underline overline line-throuh blink blink" ]
},
"-moz-text-decoration-style": {
domProp: "MozTextDecorationStyle",
"text-decoration-style": {
domProp: "textDecorationStyle",
inherited: false,
type: CSS_TYPE_LONGHAND,
initial_values: [ "solid" ],

View File

@ -140,13 +140,13 @@ function makeDeclaration(aTest)
str += "text-decoration: " + aTest.decoration + "; ";
}
if (aTest.color) {
str += "-moz-text-decoration-color: " + aTest.color + "; ";
str += "text-decoration-color: " + aTest.color + "; ";
}
if (aTest.line) {
str += "-moz-text-decoration-line: " + aTest.line + "; ";
str += "text-decoration-line: " + aTest.line + "; ";
}
if (aTest.style) {
str += "-moz-text-decoration-style: " + aTest.style + "; ";
str += "text-decoration-style: " + aTest.style + "; ";
}
return str;
}
@ -162,13 +162,13 @@ for (var i = 0; i < tests.length; ++i) {
$('t').style.textDecoration = test.decoration;
}
if (test.color) {
$('t').style.MozTextDecorationColor = test.color;
$('t').style.textDecorationColor = test.color;
}
if (test.line) {
$('t').style.MozTextDecorationLine = test.line;
$('t').style.textDecorationLine = test.line;
}
if (test.style) {
$('t').style.MozTextDecorationStyle = test.style;
$('t').style.textDecorationStyle = test.style;
}
var dec = makeDeclaration(test);

View File

@ -20,7 +20,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=531585
transition: 500ms color;
border-color: black; /* don't derive from color */
-moz-column-rule-color: black; /* don't derive from color */
-moz-text-decoration-color: black; /* don't derive from color */
text-decoration-color: black; /* don't derive from color */
}
#four {
@ -177,9 +177,9 @@ $("one").addEventListener("transitionend",
got_one_target_columnrule = true;
event.stopPropagation();
break;
case "-moz-text-decoration-color":
case "text-decoration-color":
ok(!got_one_target_textdecorationcolor,
"transitionend on one on target (-moz-text-decoration-color)");
"transitionend on one on target (text-decoration-color)");
got_one_target_textdecorationcolor = true;
event.stopPropagation();
break;

View File

@ -82,8 +82,6 @@ var supported_properties = {
"-moz-outline-radius-bottomright": [ test_radius_transition ],
"-moz-outline-radius-topleft": [ test_radius_transition ],
"-moz-outline-radius-topright": [ test_radius_transition ],
"-moz-text-decoration-color": [ test_color_transition,
test_border_color_transition ],
"background-color": [ test_color_transition ],
"background-position": [ test_background_position_transition,
// FIXME: We don't currently test clamping,
@ -231,6 +229,8 @@ var supported_properties = {
// test_length_percent_calc_transition.
"stroke-width": [ test_length_transition_svg, test_percent_transition,
test_length_clamped_svg, test_percent_clamped ],
"text-decoration-color": [ test_color_transition,
test_border_color_transition ],
"text-indent": [ test_length_transition, test_percent_transition,
test_length_percent_calc_transition,
test_length_unclamped, test_percent_unclamped ],