Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset ae26b4e4d59b (bug 1339394) for developer's request

Browse Source
This commit is contained in:
Iris Hsiao 2017-02-15 13:10:35 +08:00
parent 8cb50a383a
commit 2e2f2e35de
10 changed files with 59 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
layout/style/nsCSSValue.cpp
View File

@ -1660,6 +1660,12 @@ nsCSSValue::AppendToString(nsCSSPropertyID aProperty, nsAString& aResult,
unit == eCSSUnit_RGBColor ||
unit == eCSSUnit_RGBAColor) {
nscolor color = GetColorValue();
if (aSerialization == eNormalized &&
color == NS_RGBA(0, 0, 0, 0)) {
// Use the strictest match for 'transparent' so we do correct
// round-tripping of all other rgba() values.
aResult.AppendLiteral("transparent");
} else {
// For brevity, we omit the alpha component if it's equal to 255 (full
// opaque). Also, we try to preserve the author-specified function name,
// unless it's rgba() and we're omitting the alpha component - then we
@ -1685,6 +1691,7 @@ nsCSSValue::AppendToString(nsCSSPropertyID aProperty, nsAString& aResult,
aResult.AppendFloat(nsStyleUtil::ColorComponentToFloat(a));
}
aResult.Append(char16_t(')'));
}
} else if (eCSSUnit_HexColor == unit ||
eCSSUnit_HexColorAlpha == unit) {
nscolor color = GetColorValue();

5
layout/style/nsComputedDOMStyle.cpp
View File

@ -1115,6 +1115,11 @@ void
nsComputedDOMStyle::SetToRGBAColor(nsROCSSPrimitiveValue* aValue,
nscolor aColor)
{
if (NS_GET_A(aColor) == 0) {
aValue->SetIdent(eCSSKeyword_transparent);
return;
}
nsROCSSPrimitiveValue *red = new nsROCSSPrimitiveValue;
nsROCSSPrimitiveValue *green = new nsROCSSPrimitiveValue;
nsROCSSPrimitiveValue *blue = new nsROCSSPrimitiveValue;

18
layout/style/test/chrome/hover_helper.html
View File

@ -65,7 +65,7 @@ function step1() {
synthesizeMouse(divone, 5, 7, moveEvent, window);
is(getComputedStyle(divone, "").backgroundColor, "rgb(0, 0, 255)",
":hover applies");
is(getComputedStyle(divone.firstChild, "").backgroundColor, "rgba(0, 0, 0, 0)",
is(getComputedStyle(divone.firstChild, "").backgroundColor, "transparent",
":hover does not apply");
synthesizeMouse(divone, 5, 2, moveEvent, window);
is(getComputedStyle(divone, "").backgroundColor, "rgb(0, 0, 255)",
@ -73,9 +73,9 @@ function step1() {
is(getComputedStyle(divone.firstChild, "").backgroundColor, "rgb(255, 0, 0)",
":hover applies");
synthesizeMouse(divone, 15, 7, moveEvent, window);
is(getComputedStyle(divone, "").backgroundColor, "rgba(0, 0, 0, 0)",
is(getComputedStyle(divone, "").backgroundColor, "transparent",
":hover does not apply");
is(getComputedStyle(divone.firstChild, "").backgroundColor, "rgba(0, 0, 0, 0)",
is(getComputedStyle(divone.firstChild, "").backgroundColor, "transparent",
":hover does not apply");
synthesizeMouse(divone, 15, 2, moveEvent, window);
is(getComputedStyle(divone, "").backgroundColor, "rgb(0, 0, 255)",
@ -115,7 +115,7 @@ function step3() {
step4();
return;
}
is(getComputedStyle(divtwo, "").backgroundColor, "rgba(0, 0, 0, 0)",
is(getComputedStyle(divtwo, "").backgroundColor, "transparent",
":hover does not apply");
setResize("step4()");
/* expect to get a second resize from the oscillation */
@ -144,7 +144,7 @@ var step6called = false;
function step6() {
is(step6called, false, "step6 called only once");
step6called = true;
is(getComputedStyle(divtwo, "").backgroundColor, "rgba(0, 0, 0, 0)",
is(getComputedStyle(divtwo, "").backgroundColor, "transparent",
":hover does not apply");
synthesizeMouse(divtwoparent, 2, 5, moveEvent, window);
setTimeout(step7, 500); // time to detect oscillations if they exist
@ -156,7 +156,7 @@ function step7() {
if (step7called)
return;
step7called = true;
is(getComputedStyle(divtwo, "").backgroundColor, "rgba(0, 0, 0, 0)",
is(getComputedStyle(divtwo, "").backgroundColor, "transparent",
":hover does not apply");
setTimeout(step8, 500); // time to detect oscillations if they exist
}
@ -195,7 +195,7 @@ function step10() {
step11();
return;
}
is(getComputedStyle(divtwo, "").backgroundColor, "rgba(0, 0, 0, 0)",
is(getComputedStyle(divtwo, "").backgroundColor, "transparent",
":hover does not apply");
setResize("step11()");
/* expect to get a second resize from the oscillation */
@ -224,7 +224,7 @@ var step13called = false;
function step13() {
is(step13called, false, "step13 called only once");
step13called = true;
is(getComputedStyle(divtwo, "").backgroundColor, "rgba(0, 0, 0, 0)",
is(getComputedStyle(divtwo, "").backgroundColor, "transparent",
":hover does not apply");
setResize("step14()");
divtwoparent.scrollLeft = 0; /* mouse now over 2,5 */
@ -251,7 +251,7 @@ function step15() {
if (step15called)
return;
step15called = true;
is(getComputedStyle(divtwo, "").backgroundColor, "rgba(0, 0, 0, 0)",
is(getComputedStyle(divtwo, "").backgroundColor, "transparent",
":hover does not apply");
setTimeout(finish, 500); // time to detect oscillations if they exist
}

4
layout/style/test/property_database.js
View File

@ -2235,8 +2235,8 @@ var gCSSProperties = {
domProp: "backgroundColor",
inherited: false,
type: CSS_TYPE_LONGHAND,
initial_values: [ "transparent", "rgba(0, 0, 0, 0)" ],
other_values: [ "green", "rgb(255, 0, 128)", "#fc2", "#96ed2a", "black", "rgba(255,255,0,3)", "hsl(240, 50%, 50%)", "rgb(50%, 50%, 50%)", "-moz-default-background-color", "rgb(100, 100.0, 100)", "rgba(255, 127, 15, 0)", "hsla(240, 97%, 50%, 0.0)", "rgba(255,255,255,-3.7)" ],
initial_values: [ "transparent", "rgba(255, 127, 15, 0)", "hsla(240, 97%, 50%, 0.0)", "rgba(0, 0, 0, 0)", "rgba(255,255,255,-3.7)" ],
other_values: [ "green", "rgb(255, 0, 128)", "#fc2", "#96ed2a", "black", "rgba(255,255,0,3)", "hsl(240, 50%, 50%)", "rgb(50%, 50%, 50%)", "-moz-default-background-color", "rgb(100, 100.0, 100)" ],
invalid_values: [ "#0", "#00", "#00000", "#0000000", "#000000000", "rgb(100, 100%, 100)" ],
quirks_values: { "000000": "#000000", "96ed2a": "#96ed2a" },
},

2
layout/style/test/test_additional_sheets.html
View File

@ -205,7 +205,7 @@ function loadAndCheck(win, firstType, secondType, swap, result1, result2)
secondType.removeRules(win, secondStyle);
is(cs.getPropertyValue('color'), 'rgb(0, 0, 0)', firstType.type + " vs " + secondType.type + " 3");
is(cs.getPropertyValue('background-color'), 'rgba(0, 0, 0, 0)', firstType.type + " vs " + secondType.type + " 4");
is(cs.getPropertyValue('background-color'), 'transparent', firstType.type + " vs " + secondType.type + " 4");
}
// There are 8 cases. Regular against regular, regular against important, important

2
layout/style/test/test_bug229915.html
View File

@ -45,7 +45,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=229915
const GREEN = "rgb(0, 128, 0)";
const BLACK = "rgb(0, 0, 0)";
const TRANSPARENT = "rgba(0, 0, 0, 0)";
const TRANSPARENT = "transparent";
const WHITE = "rgb(255, 255, 255)";
function make_prev() {

10
layout/style/test/test_bug372770.html
View File

@ -35,11 +35,17 @@ for (i = 0; i < colors.length; ++i) {
is(style2.color, color, "Rule style color roundtripping failed at color " + i);
}
// This code is only here because of bug 372783. Once that's fixed, this test
// for "rgba(0, 0, 0, 0)" will fail.
style1.color = "rgba(0, 0, 0, 0)";
style2.color = "rgba(0, 0, 0, 0)";
is(style1.color, "rgba(0, 0, 0, 0)",
is(style1.color, "transparent",
"Inline style should give transparent for rgba(0,0,0,0)");
is(style2.color, "transparent",
"Rule style should give transparent for rgba(0,0,0,0)");
todo(style1.color == "rgba(0, 0, 0, 0)",
"Inline style should round-trip black transparent color correctly");
is(style2.color, "rgba(0, 0, 0, 0)",
todo(style2.color == "rgba(0, 0, 0, 0)",
"Rule style should round-trip black transparent color correctly");
for (var i = 0; i <= 100; ++i) {

2
layout/style/test/test_bug635286.html
View File

@ -36,7 +36,7 @@ window.addEventListener("load", function() {
cases.forEach(function(aCase, aIndex) {
is(window.getComputedStyle(aCase)
.getPropertyValue("background-color"),
"rgba(0, 0, 0, 0)",
"transparent",
aCase.textContent);
});
SimpleTest.finish();

4
layout/style/test/test_computed_style.html
View File

@ -361,8 +361,8 @@ var noframe_container = document.getElementById("content");
"markerEnd" : "",
"clipPath" : "",
"filter" : "",
"fill" : " rgba(0, 0, 0, 0)",
"stroke" : " rgba(0, 0, 0, 0)",
"fill" : " transparent",
"stroke" : " transparent",
};
for (var prop in testStyles) {

2
layout/style/test/test_default_computed_style.html
View File

@ -45,7 +45,7 @@ is(cs_pseudo.display, "block", "Our ::before is block");
// And now our actual tests
is(cs_default.display, "block", "We have block display by default");
is(cs_default.marginTop, "16px", "We have 16px margin by default");
is(cs_default.backgroundColor, "rgba(0, 0, 0, 0)",
is(cs_default.backgroundColor, "transparent",
"We have transparent background by default");
is(cs_default.color, "rgb(0, 0, 0)", "We have black text by default");
is(cs_default_pseudo.content, "none", "We have no content by default");