зеркало из https://github.com/mozilla/gecko-dev.git
Bug 652486 Computed value of text-decoration should be empty when its style or color is not initial value r=dbaron
This commit is contained in:
Masayuki Nakano
Родитель
a787a8ca8a
Коммит
ab166f238e
|
|
@ -2280,12 +2280,32 @@ nsComputedDOMStyle::DoGetTextDecoration()
|
|||
{
|
||||
nsROCSSPrimitiveValue* val = GetROCSSPrimitiveValue();
|
||||
|
||||
PRUint8 line = GetStyleTextReset()->mTextDecorationLine;
|
||||
const nsStyleTextReset* textReset = GetStyleTextReset();
|
||||
|
||||
// If decoration style or color wasn't initial value, the author knew the
|
||||
// text-decoration is a shorthand property in CSS 3.
|
||||
// Return NULL in such cases.
|
||||
if (textReset->GetDecorationStyle() != NS_STYLE_TEXT_DECORATION_STYLE_SOLID) {
|
||||
return nsnull;
|
||||
}
|
||||
|
||||
nscolor color;
|
||||
PRBool isForegroundColor;
|
||||
textReset->GetDecorationColor(color, isForegroundColor);
|
||||
if (!isForegroundColor) {
|
||||
return nsnull;
|
||||
}
|
||||
|
||||
// Otherwise, the web pages may have been written for CSS 2.1 or earlier,
|
||||
// i.e., text-decoration was assumed as a longhand property. In that case,
|
||||
// we should return computed value same as CSS 2.1 for backward compatibility.
|
||||
|
||||
PRUint8 line = textReset->mTextDecorationLine;
|
||||
// Clear the -moz-anchor-decoration bit and the OVERRIDE_ALL bits -- we
|
||||
// don't want these to appear in the computed style.
|
||||
line &= ~(NS_STYLE_TEXT_DECORATION_LINE_PREF_ANCHORS |
|
||||
NS_STYLE_TEXT_DECORATION_LINE_OVERRIDE_ALL);
|
||||
PRUint8 blink = GetStyleTextReset()->mTextBlink;
|
||||
PRUint8 blink = textReset->mTextBlink;
|
||||
|
||||
if (blink == NS_STYLE_TEXT_BLINK_NONE &&
|
||||
line == NS_STYLE_TEXT_DECORATION_LINE_NONE) {
|
||||
|
|
|
|||
|
|
@ -3429,6 +3429,10 @@ nsRuleNode::ComputeTextResetData(void* aStartStruct,
|
|||
text->SetDecorationColorToForeground();
|
||||
}
|
||||
}
|
||||
else if (eCSSUnit_EnumColor == decorationColorValue->GetUnit() &&
|
||||
decorationColorValue->GetIntValue() == NS_COLOR_CURRENTCOLOR) {
|
||||
text->SetDecorationColorToForeground();
|
||||
}
|
||||
else if (SetColor(*decorationColorValue, 0, mPresContext, aContext,
|
||||
decorationColor, canStoreInRuleTree)) {
|
||||
text->SetDecorationColor(decorationColor);
|
||||
|
|
@ -3441,9 +3445,6 @@ nsRuleNode::ComputeTextResetData(void* aStartStruct,
|
|||
"unexpected enumerated value");
|
||||
text->SetDecorationColorToForeground();
|
||||
}
|
||||
else if (eCSSUnit_Initial == decorationColorValue->GetUnit()) {
|
||||
text->SetDecorationColorToForeground();
|
||||
}
|
||||
|
||||
// text-decoration-style: enum, inherit, initial
|
||||
const nsCSSValue* decorationStyleValue =
|
||||
|
|
|
|||
|
|
@ -136,6 +136,7 @@ _TEST_FILES = test_acid3_test46.html \
|
|||
test_bug573255.html \
|
||||
test_bug580685.html \
|
||||
test_bug635286.html \
|
||||
test_bug652486.html \
|
||||
test_cascade.html \
|
||||
test_compute_data_with_start_struct.html \
|
||||
test_computed_style.html \
|
||||
|
|
|
|||
|
|
@ -0,0 +1,204 @@
|
|||
<!DOCTYPE HTML>
|
||||
<html>
|
||||
<!--
|
||||
https://bugzilla.mozilla.org/show_bug.cgi?id=652486
|
||||
-->
|
||||
<head>
|
||||
<title>Test for Bug 652486</title>
|
||||
<script type="text/javascript" src="/MochiKit/packed.js"></script>
|
||||
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
|
||||
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
|
||||
</head>
|
||||
<body>
|
||||
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=652486">Mozilla Bug 652486</a>
|
||||
|
||||
<p id="display"></p>
|
||||
<div id="content" style="display: none">
|
||||
<div id="t"></div>
|
||||
</div>
|
||||
<pre id="test">
|
||||
<script class="testbody" type="text/javascript">
|
||||
|
||||
/** Test for Bug 652486 **/
|
||||
|
||||
function c() {
|
||||
return document.defaultView.getComputedStyle($('t'), "").
|
||||
getPropertyValue("text-decoration");
|
||||
}
|
||||
|
||||
function cval() {
|
||||
var val = document.defaultView.getComputedStyle($('t'), "").
|
||||
getPropertyCSSValue("text-decoration");
|
||||
return val ? val.getStringValue() : val;
|
||||
}
|
||||
|
||||
var tests = [
|
||||
// When only text-decoration was specified, text-decoration should look like
|
||||
// a longhand property.
|
||||
{ decoration: "none",
|
||||
blink: null, line: null, color: null, style: null,
|
||||
expectedValue: "none", expectedCSSValue: "none" },
|
||||
{ decoration: "underline",
|
||||
blink: null, line: null, color: null, style: null,
|
||||
expectedValue: "underline", expectedCSSValue: "underline" },
|
||||
{ decoration: "overline",
|
||||
blink: null, line: null, color: null, style: null,
|
||||
expectedValue: "overline", expectedCSSValue: "overline" },
|
||||
{ decoration: "line-through",
|
||||
blink: null, line: null, color: null, style: null,
|
||||
expectedValue: "line-through", expectedCSSValue: "line-through" },
|
||||
{ decoration: "blink",
|
||||
blink: null, line: null, color: null, style: null,
|
||||
expectedValue: "blink", expectedCSSValue: "blink" },
|
||||
{ decoration: "underline overline",
|
||||
blink: null, line: null, color: null, style: null,
|
||||
expectedValue: "underline overline",
|
||||
expectedCSSValue: "underline overline" },
|
||||
{ decoration: "underline line-through",
|
||||
blink: null, line: null, color: null, style: null,
|
||||
expectedValue: "underline line-through",
|
||||
expectedCSSValue: "underline line-through" },
|
||||
{ decoration: "blink underline",
|
||||
blink: null, line: null, color: null, style: null,
|
||||
expectedValue: "underline blink",
|
||||
expectedCSSValue: "underline blink" },
|
||||
{ decoration: "underline blink",
|
||||
blink: null, line: null, color: null, style: null,
|
||||
expectedValue: "underline blink",
|
||||
expectedCSSValue: "underline blink" },
|
||||
|
||||
// When only text-decoration-line or text-blink was specified,
|
||||
// text-decoration should look like a longhand property.
|
||||
{ decoration: null,
|
||||
blink: "blink", line: null, color: null, style: null,
|
||||
expectedValue: "blink", expectedCSSValue: "blink" },
|
||||
{ decoration: null,
|
||||
blink: null, line: "underline", color: null, style: null,
|
||||
expectedValue: "underline", expectedCSSValue: "underline" },
|
||||
{ decoration: null,
|
||||
blink: null, line: "overline", color: null, style: null,
|
||||
expectedValue: "overline", expectedCSSValue: "overline" },
|
||||
{ decoration: null,
|
||||
blink: null, line: "line-through", color: null, style: null,
|
||||
expectedValue: "line-through", expectedCSSValue: "line-through" },
|
||||
{ decoration: null,
|
||||
blink: "blink", line: "underline", color: null, style: null,
|
||||
expectedValue: "underline blink", expectedCSSValue: "underline blink" },
|
||||
{ decoration: null,
|
||||
blink: "none", line: "underline", color: null, style: null,
|
||||
expectedValue: "underline", expectedCSSValue: "underline" },
|
||||
{ decoration: null,
|
||||
blink: "blink", line: "none", color: null, style: null,
|
||||
expectedValue: "blink", expectedCSSValue: "blink" },
|
||||
|
||||
// When text-decoration-color isn't its initial value,
|
||||
// text-decoration should be a shorthand property.
|
||||
{ decoration: "blink",
|
||||
blink: null, line: null, color: "rgb(0, 0, 0)", style: null,
|
||||
expectedValue: "", expectedCSSValue: null },
|
||||
{ decoration: "underline",
|
||||
blink: null, line: null, color: "black", style: null,
|
||||
expectedValue: "", expectedCSSValue: null },
|
||||
{ decoration: "overline",
|
||||
blink: null, line: null, color: "#ff0000", style: null,
|
||||
expectedValue: "", expectedCSSValue: null },
|
||||
{ decoration: "line-through",
|
||||
blink: null, line: null, color: "-moz-initial", style: null,
|
||||
expectedValue: "line-through", expectedCSSValue: "line-through" },
|
||||
{ decoration: "blink underline",
|
||||
blink: null, line: null, color: "currentColor", style: null,
|
||||
expectedValue: "underline blink", expectedCSSValue: "underline blink" },
|
||||
{ decoration: "underline line-through",
|
||||
blink: null, line: null, color: "-moz-use-text-color", style: null,
|
||||
expectedValue: "underline line-through",
|
||||
expectedCSSValue: "underline line-through" },
|
||||
|
||||
// When text-decoration-style isn't its initial value,
|
||||
// text-decoration should be a shorthand property.
|
||||
{ decoration: "blink",
|
||||
blink: null, line: null, color: null, style: "-moz-none",
|
||||
expectedValue: "", expectedCSSValue: null },
|
||||
{ decoration: "underline",
|
||||
blink: null, line: null, color: null, style: "dotted",
|
||||
expectedValue: "", expectedCSSValue: null },
|
||||
{ decoration: "overline",
|
||||
blink: null, line: null, color: null, style: "dashed",
|
||||
expectedValue: "", expectedCSSValue: null },
|
||||
{ decoration: "line-through",
|
||||
blink: null, line: null, color: null, style: "double",
|
||||
expectedValue: "", expectedCSSValue: null },
|
||||
{ decoration: "blink underline",
|
||||
blink: null, line: null, color: null, style: "wavy",
|
||||
expectedValue: "", expectedCSSValue: null },
|
||||
{ decoration: "underline blink overline line-through",
|
||||
blink: null, line: null, color: null, style: "solid",
|
||||
expectedValue: "underline overline line-through blink",
|
||||
expectedCSSValue: "underline overline line-through blink" },
|
||||
{ decoration: "line-through overline underline",
|
||||
blink: null, line: null, color: null, style: "-moz-initial",
|
||||
expectedValue: "underline overline line-through",
|
||||
expectedCSSValue: "underline overline line-through" }
|
||||
];
|
||||
|
||||
function makeDeclaration(aTest)
|
||||
{
|
||||
var str = "";
|
||||
if (aTest.decoration) {
|
||||
str += "text-decoration: " + aTest.decoration + "; ";
|
||||
}
|
||||
if (aTest.blink) {
|
||||
str += "-moz-text-blink: " + aTest.blink + "; ";
|
||||
}
|
||||
if (aTest.color) {
|
||||
str += "-moz-text-decoration-color: " + aTest.color + "; ";
|
||||
}
|
||||
if (aTest.line) {
|
||||
str += "-moz-text-decoration-line: " + aTest.line + "; ";
|
||||
}
|
||||
if (aTest.style) {
|
||||
str += "-moz-text-decoration-style: " + aTest.style + "; ";
|
||||
}
|
||||
return str;
|
||||
}
|
||||
|
||||
function clearStyleObject()
|
||||
{
|
||||
$('t').style.textDecoration = null;
|
||||
}
|
||||
|
||||
for (var i = 0; i < tests.length; ++i) {
|
||||
var test = tests[i];
|
||||
if (test.decoration) {
|
||||
$('t').style.textDecoration = test.decoration;
|
||||
}
|
||||
if (test.blink) {
|
||||
$('t').style.MozTextBlink = test.blink;
|
||||
}
|
||||
if (test.color) {
|
||||
$('t').style.MozTextDecorationColor = test.color;
|
||||
}
|
||||
if (test.line) {
|
||||
$('t').style.MozTextDecorationLine = test.line;
|
||||
}
|
||||
if (test.style) {
|
||||
$('t').style.MozTextDecorationStyle = test.style;
|
||||
}
|
||||
|
||||
var dec = makeDeclaration(test);
|
||||
is(c(), test.expectedValue, "Test1 (computed value): " + dec);
|
||||
is(cval(), test.expectedCSSValue, "Test1 (CSS value): " + dec);
|
||||
|
||||
clearStyleObject();
|
||||
|
||||
$('t').setAttribute("style", dec);
|
||||
|
||||
is(c(), test.expectedValue, "Test2 (computed value): " + dec);
|
||||
is(cval(), test.expectedCSSValue, "Test2 (CSS value): " + dec);
|
||||
|
||||
$('t').removeAttribute("style");
|
||||
}
|
||||
|
||||
</script>
|
||||
</pre>
|
||||
</body>
|
||||
</html>
|
||||
Загрузка…
Ссылка в новой задаче