зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1339394 - Don't serialize transparent color to transparent keyword when not necessary. r=heycam
MozReview-Commit-ID: 59cmaCoFJMR --HG-- extra : source : 134b15d99876fbd9b9f7022de20e3d215dc2c753 extra : amend_source : 94ba498834fae87577905fa473479a3d155e607d
This commit is contained in:
Xidorn Quan
Родитель
a1b5dae154
Коммит
27c6b9b2bf
|
|
@ -269,7 +269,7 @@ function buildDefaultTextAttrs(aID, aFontSize, aFontWeight, aFontFamily)
|
|||
{
|
||||
var elm = getNode(aID);
|
||||
var computedStyle = document.defaultView.getComputedStyle(elm);
|
||||
var bgColor = computedStyle.backgroundColor == "transparent" ?
|
||||
var bgColor = computedStyle.backgroundColor == "rgba(0, 0, 0, 0)" ?
|
||||
"rgb(255, 255, 255)" : computedStyle.backgroundColor;
|
||||
|
||||
var defAttrs = {
|
||||
|
|
|
|||
|
|
@ -90,9 +90,9 @@ const PAGECONTENT_COLORS =
|
|||
' <option value="One" style="color: #fff; background-color: #f00;">{"color": "rgb(255, 255, 255)", "backgroundColor": "rgb(255, 0, 0)"}</option>' +
|
||||
' <option value="Two" class="blue">{"color": "rgb(255, 255, 255)", "backgroundColor": "rgb(0, 0, 255)"}</option>' +
|
||||
' <option value="Three" class="green">{"color": "rgb(128, 0, 128)", "backgroundColor": "rgb(0, 128, 0)"}</option>' +
|
||||
' <option value="Four" class="defaultColor defaultBackground">{"color": "-moz-ComboboxText", "backgroundColor": "transparent", "unstyled": "true"}</option>' +
|
||||
' <option value="Five" class="defaultColor">{"color": "-moz-ComboboxText", "backgroundColor": "transparent", "unstyled": "true"}</option>' +
|
||||
' <option value="Six" class="defaultBackground">{"color": "-moz-ComboboxText", "backgroundColor": "transparent", "unstyled": "true"}</option>' +
|
||||
' <option value="Four" class="defaultColor defaultBackground">{"color": "-moz-ComboboxText", "backgroundColor": "rgba(0, 0, 0, 0)", "unstyled": "true"}</option>' +
|
||||
' <option value="Five" class="defaultColor">{"color": "-moz-ComboboxText", "backgroundColor": "rgba(0, 0, 0, 0)", "unstyled": "true"}</option>' +
|
||||
' <option value="Six" class="defaultBackground">{"color": "-moz-ComboboxText", "backgroundColor": "rgba(0, 0, 0, 0)", "unstyled": "true"}</option>' +
|
||||
' <option value="Seven" selected="true">{"unstyled": "true"}</option>' +
|
||||
"</select></body></html>";
|
||||
|
||||
|
|
@ -101,9 +101,9 @@ const PAGECONTENT_COLORS_ON_SELECT =
|
|||
" #one { background-color: #7E3A3A; color: #fff }" +
|
||||
"</style>" +
|
||||
"<body><select id='one'>" +
|
||||
' <option value="One">{"color": "rgb(255, 255, 255)", "backgroundColor": "transparent"}</option>' +
|
||||
' <option value="Two">{"color": "rgb(255, 255, 255)", "backgroundColor": "transparent"}</option>' +
|
||||
' <option value="Three">{"color": "rgb(255, 255, 255)", "backgroundColor": "transparent"}</option>' +
|
||||
' <option value="One">{"color": "rgb(255, 255, 255)", "backgroundColor": "rgba(0, 0, 0, 0)"}</option>' +
|
||||
' <option value="Two">{"color": "rgb(255, 255, 255)", "backgroundColor": "rgba(0, 0, 0, 0)"}</option>' +
|
||||
' <option value="Three">{"color": "rgb(255, 255, 255)", "backgroundColor": "rgba(0, 0, 0, 0)"}</option>' +
|
||||
' <option value="Four" selected="true">{"end": "true"}</option>' +
|
||||
"</select></body></html>";
|
||||
|
||||
|
|
|
|||
|
|
@ -46,10 +46,10 @@ function reallyRunTests() {
|
|||
|
||||
switch (colorChangeNotifications) {
|
||||
case 1:
|
||||
is(message.data.color, "transparent", "first window initial");
|
||||
is(message.data.color, "rgba(0, 0, 0, 0)", "first window initial");
|
||||
break;
|
||||
case 2:
|
||||
is(message.data.color, "transparent", "second window initial");
|
||||
is(message.data.color, "rgba(0, 0, 0, 0)", "second window initial");
|
||||
runOtherWindowTests();
|
||||
break;
|
||||
case 3:
|
||||
|
|
@ -61,17 +61,17 @@ function reallyRunTests() {
|
|||
otherWindow.close();
|
||||
break;
|
||||
case 5:
|
||||
is(message.data.color, "transparent", "first window raised");
|
||||
is(message.data.color, "rgba(0, 0, 0, 0)", "first window raised");
|
||||
break;
|
||||
case 6:
|
||||
is(message.data.color, "transparent", "second window raised");
|
||||
is(message.data.color, "rgba(0, 0, 0, 0)", "second window raised");
|
||||
gBrowser.selectedTab = tab2;
|
||||
break;
|
||||
case 7:
|
||||
is(message.data.color, "transparent", "first window after tab switch");
|
||||
is(message.data.color, "rgba(0, 0, 0, 0)", "first window after tab switch");
|
||||
break;
|
||||
case 8:
|
||||
is(message.data.color, "transparent", "second window after tab switch");
|
||||
is(message.data.color, "rgba(0, 0, 0, 0)", "second window after tab switch");
|
||||
finishTest();
|
||||
break;
|
||||
case 9:
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ add_task(function* testPageActionPopup() {
|
|||
"popup-a.js": function() {
|
||||
window.onload = () => {
|
||||
let background = window.getComputedStyle(document.body).backgroundColor;
|
||||
browser.test.assertEq("transparent", background);
|
||||
browser.test.assertEq("rgba(0, 0, 0, 0)", background);
|
||||
browser.runtime.sendMessage("from-popup-a");
|
||||
};
|
||||
browser.runtime.onMessage.addListener(msg => {
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ add_task(function* testExecuteScript() {
|
|||
async function background() {
|
||||
let tasks = [
|
||||
{
|
||||
background: "transparent",
|
||||
background: "rgba(0, 0, 0, 0)",
|
||||
foreground: "rgb(0, 113, 4)",
|
||||
promise: () => {
|
||||
return browser.tabs.insertCSS({
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ add_task(function* testExecuteScript() {
|
|||
let tasks = [
|
||||
// Insert CSS file.
|
||||
{
|
||||
background: "transparent",
|
||||
background: "rgba(0, 0, 0, 0)",
|
||||
foreground: "rgb(0, 113, 4)",
|
||||
promise: () => {
|
||||
return browser.tabs.insertCSS({
|
||||
|
|
@ -29,7 +29,7 @@ add_task(function* testExecuteScript() {
|
|||
},
|
||||
// Remove CSS code again.
|
||||
{
|
||||
background: "transparent",
|
||||
background: "rgba(0, 0, 0, 0)",
|
||||
foreground: "rgb(0, 113, 4)",
|
||||
promise: () => {
|
||||
return browser.tabs.removeCSS({
|
||||
|
|
@ -39,7 +39,7 @@ add_task(function* testExecuteScript() {
|
|||
},
|
||||
// Remove CSS file again.
|
||||
{
|
||||
background: "transparent",
|
||||
background: "rgba(0, 0, 0, 0)",
|
||||
foreground: "rgb(0, 0, 0)",
|
||||
promise: () => {
|
||||
return browser.tabs.removeCSS({
|
||||
|
|
@ -60,7 +60,7 @@ add_task(function* testExecuteScript() {
|
|||
},
|
||||
// Remove CSS code again.
|
||||
{
|
||||
background: "transparent",
|
||||
background: "rgba(0, 0, 0, 0)",
|
||||
foreground: "rgb(0, 0, 0)",
|
||||
promise: () => {
|
||||
return browser.tabs.removeCSS({
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ add_task(function* () {
|
|||
info("Disabling the first property too and checking the applied style");
|
||||
yield togglePropStatus(view, firstProp);
|
||||
|
||||
is((yield getValue("#testid", "background-color")), "transparent",
|
||||
is((yield getValue("#testid", "background-color")), "rgba(0, 0, 0, 0)",
|
||||
"After disabling both properties, value should be empty.");
|
||||
|
||||
info("Re-enabling the second propertyt and checking the applied style");
|
||||
|
|
|
|||
|
|
@ -100,7 +100,7 @@ function runTest2() {
|
|||
seenLoadEnd = true;
|
||||
ok(seenLoadStart, 'Load end after load start.');
|
||||
ok(seenLocationChange, 'Load end after location change.');
|
||||
is(e.detail.backgroundColor, 'transparent', 'Expected background color reported')
|
||||
is(e.detail.backgroundColor, 'rgba(0, 0, 0, 0)', 'Expected background color reported')
|
||||
});
|
||||
|
||||
iframe.src = browserElementTestHelpers.emptyPage2;
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ function checkResultsBlocked() {
|
|||
// stylesheet: default background color within FF is transparent
|
||||
var bgcolor = window.getComputedStyle(writemetacspframe.contentDocument.body)
|
||||
.getPropertyValue("background-color");
|
||||
is(bgcolor, "transparent", "inital background value in FF should be 'transparent'");
|
||||
is(bgcolor, "rgba(0, 0, 0, 0)", "inital background value in FF should be 'transparent'");
|
||||
|
||||
// image: make sure image is blocked
|
||||
var img = writemetacspframe.contentDocument.getElementById("testimage");
|
||||
|
|
|
|||
|
|
@ -44,9 +44,9 @@
|
|||
}},
|
||||
|
||||
testDisposesProperly: function() { with(this) {
|
||||
assertEqual("transparent", Element.getStyle('tobeedited','background-color'));
|
||||
assertEqual("rgba(0, 0, 0, 0)", Element.getStyle('tobeedited','background-color'));
|
||||
inPlaceEditor.dispose();
|
||||
assertEqual("transparent", Element.getStyle('tobeedited','background-color'));
|
||||
assertEqual("rgba(0, 0, 0, 0)", Element.getStyle('tobeedited','background-color'));
|
||||
assertVisible($('tobeedited'));
|
||||
Event.simulateMouse('tobeedited','click');
|
||||
assertVisible($('tobeedited'));
|
||||
|
|
@ -84,7 +84,7 @@
|
|||
testCantEditWhileSaving: function() { with(this) {
|
||||
inPlaceEditor.onLoading();
|
||||
Event.simulateMouse('tobeedited','mouseover');
|
||||
assertEqual("transparent", Element.getStyle('tobeedited','background-color'));
|
||||
assertEqual("rgba(0, 0, 0, 0)", Element.getStyle('tobeedited','background-color'));
|
||||
Event.simulateMouse('tobeedited','click');
|
||||
assertVisible($('tobeedited'));
|
||||
}},
|
||||
|
|
|
|||
|
|
@ -1660,38 +1660,31 @@ 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");
|
||||
// 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
|
||||
// use rgb().
|
||||
uint8_t a = NS_GET_A(color);
|
||||
bool showAlpha = (a != 255);
|
||||
|
||||
if (unit == eCSSUnit_RGBAColor && showAlpha) {
|
||||
aResult.AppendLiteral("rgba(");
|
||||
} 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
|
||||
// use rgb().
|
||||
uint8_t a = NS_GET_A(color);
|
||||
bool showAlpha = (a != 255);
|
||||
|
||||
if (unit == eCSSUnit_RGBAColor && showAlpha) {
|
||||
aResult.AppendLiteral("rgba(");
|
||||
} else {
|
||||
aResult.AppendLiteral("rgb(");
|
||||
}
|
||||
|
||||
NS_NAMED_LITERAL_STRING(comma, ", ");
|
||||
|
||||
aResult.AppendInt(NS_GET_R(color), 10);
|
||||
aResult.Append(comma);
|
||||
aResult.AppendInt(NS_GET_G(color), 10);
|
||||
aResult.Append(comma);
|
||||
aResult.AppendInt(NS_GET_B(color), 10);
|
||||
if (showAlpha) {
|
||||
aResult.Append(comma);
|
||||
aResult.AppendFloat(nsStyleUtil::ColorComponentToFloat(a));
|
||||
}
|
||||
aResult.Append(char16_t(')'));
|
||||
aResult.AppendLiteral("rgb(");
|
||||
}
|
||||
|
||||
NS_NAMED_LITERAL_STRING(comma, ", ");
|
||||
|
||||
aResult.AppendInt(NS_GET_R(color), 10);
|
||||
aResult.Append(comma);
|
||||
aResult.AppendInt(NS_GET_G(color), 10);
|
||||
aResult.Append(comma);
|
||||
aResult.AppendInt(NS_GET_B(color), 10);
|
||||
if (showAlpha) {
|
||||
aResult.Append(comma);
|
||||
aResult.AppendFloat(nsStyleUtil::ColorComponentToFloat(a));
|
||||
}
|
||||
aResult.Append(char16_t(')'));
|
||||
} else if (eCSSUnit_HexColor == unit ||
|
||||
eCSSUnit_HexColorAlpha == unit) {
|
||||
nscolor color = GetColorValue();
|
||||
|
|
|
|||
|
|
@ -1115,11 +1115,6 @@ 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;
|
||||
|
|
|
|||
|
|
@ -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, "transparent",
|
||||
is(getComputedStyle(divone.firstChild, "").backgroundColor, "rgba(0, 0, 0, 0)",
|
||||
":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, "transparent",
|
||||
is(getComputedStyle(divone, "").backgroundColor, "rgba(0, 0, 0, 0)",
|
||||
":hover does not apply");
|
||||
is(getComputedStyle(divone.firstChild, "").backgroundColor, "transparent",
|
||||
is(getComputedStyle(divone.firstChild, "").backgroundColor, "rgba(0, 0, 0, 0)",
|
||||
":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, "transparent",
|
||||
is(getComputedStyle(divtwo, "").backgroundColor, "rgba(0, 0, 0, 0)",
|
||||
":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, "transparent",
|
||||
is(getComputedStyle(divtwo, "").backgroundColor, "rgba(0, 0, 0, 0)",
|
||||
":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, "transparent",
|
||||
is(getComputedStyle(divtwo, "").backgroundColor, "rgba(0, 0, 0, 0)",
|
||||
":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, "transparent",
|
||||
is(getComputedStyle(divtwo, "").backgroundColor, "rgba(0, 0, 0, 0)",
|
||||
":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, "transparent",
|
||||
is(getComputedStyle(divtwo, "").backgroundColor, "rgba(0, 0, 0, 0)",
|
||||
":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, "transparent",
|
||||
is(getComputedStyle(divtwo, "").backgroundColor, "rgba(0, 0, 0, 0)",
|
||||
":hover does not apply");
|
||||
setTimeout(finish, 500); // time to detect oscillations if they exist
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2235,8 +2235,8 @@ var gCSSProperties = {
|
|||
domProp: "backgroundColor",
|
||||
inherited: false,
|
||||
type: CSS_TYPE_LONGHAND,
|
||||
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)" ],
|
||||
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)" ],
|
||||
invalid_values: [ "#0", "#00", "#00000", "#0000000", "#000000000", "rgb(100, 100%, 100)" ],
|
||||
quirks_values: { "000000": "#000000", "96ed2a": "#96ed2a" },
|
||||
},
|
||||
|
|
|
|||
|
|
@ -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'), 'transparent', firstType.type + " vs " + secondType.type + " 4");
|
||||
is(cs.getPropertyValue('background-color'), 'rgba(0, 0, 0, 0)', firstType.type + " vs " + secondType.type + " 4");
|
||||
}
|
||||
|
||||
// There are 8 cases. Regular against regular, regular against important, important
|
||||
|
|
|
|||
|
|
@ -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 = "transparent";
|
||||
const TRANSPARENT = "rgba(0, 0, 0, 0)";
|
||||
const WHITE = "rgb(255, 255, 255)";
|
||||
|
||||
function make_prev() {
|
||||
|
|
|
|||
|
|
@ -35,18 +35,12 @@ 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, "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");
|
||||
todo(style2.color == "rgba(0, 0, 0, 0)",
|
||||
"Rule style should round-trip black transparent color correctly");
|
||||
is(style1.color, "rgba(0, 0, 0, 0)",
|
||||
"Inline style should round-trip black transparent color correctly");
|
||||
is(style2.color, "rgba(0, 0, 0, 0)",
|
||||
"Rule style should round-trip black transparent color correctly");
|
||||
|
||||
for (var i = 0; i <= 100; ++i) {
|
||||
if (i == 70 || i == 90) {
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ window.addEventListener("load", function() {
|
|||
cases.forEach(function(aCase, aIndex) {
|
||||
is(window.getComputedStyle(aCase)
|
||||
.getPropertyValue("background-color"),
|
||||
"transparent",
|
||||
"rgba(0, 0, 0, 0)",
|
||||
aCase.textContent);
|
||||
});
|
||||
SimpleTest.finish();
|
||||
|
|
|
|||
|
|
@ -361,8 +361,8 @@ var noframe_container = document.getElementById("content");
|
|||
"markerEnd" : "",
|
||||
"clipPath" : "",
|
||||
"filter" : "",
|
||||
"fill" : " transparent",
|
||||
"stroke" : " transparent",
|
||||
"fill" : " rgba(0, 0, 0, 0)",
|
||||
"stroke" : " rgba(0, 0, 0, 0)",
|
||||
};
|
||||
|
||||
for (var prop in testStyles) {
|
||||
|
|
|
|||
|
|
@ -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, "transparent",
|
||||
is(cs_default.backgroundColor, "rgba(0, 0, 0, 0)",
|
||||
"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");
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ add_task(function* testExecuteScript() {
|
|||
async function background() {
|
||||
let tasks = [
|
||||
{
|
||||
background: "transparent",
|
||||
background: "rgba(0, 0, 0, 0)",
|
||||
foreground: "rgb(0, 113, 4)",
|
||||
promise: () => {
|
||||
return browser.tabs.insertCSS({
|
||||
|
|
|
|||
|
|
@ -20,4 +20,4 @@ class TestChromeElementCSS(MarionetteTestCase):
|
|||
element = self.marionette.find_element(By.ID, "identity-box")
|
||||
background_colour = element.value_of_css_property("background-color")
|
||||
|
||||
self.assertEqual("transparent", background_colour)
|
||||
self.assertEqual("rgba(0, 0, 0, 0)", background_colour)
|
||||
|
|
|
|||
|
|
@ -102,9 +102,6 @@
|
|||
[[["stylewithcss","false"\],["forecolor","rgb( 0 ,0 ,255)"\]\] "foo[bar\]baz" queryCommandValue("forecolor") after]
|
||||
expected: FAIL
|
||||
|
||||
[[["stylewithcss","true"\],["forecolor","rgba(0, 0, 255, 0.0)"\]\] "foo[bar\]baz" queryCommandValue("forecolor") after]
|
||||
expected: FAIL
|
||||
|
||||
[[["stylewithcss","false"\],["forecolor","rgba(0, 0, 255, 0.0)"\]\] "foo[bar\]baz" compare innerHTML]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -228,15 +225,9 @@
|
|||
[[["stylewithcss","false"\],["forecolor","#0000FF"\]\] "<span style=\\"color: rgb( 0 ,0 ,255)\\">[foo\]</span>" compare innerHTML]
|
||||
expected: FAIL
|
||||
|
||||
[[["stylewithcss","true"\],["forecolor","#0000FF"\]\] "<span style=\\"color: rgba(0, 0, 255, 0.0)\\">[foo\]</span>" queryCommandValue("forecolor") before]
|
||||
expected: FAIL
|
||||
|
||||
[[["stylewithcss","false"\],["forecolor","#0000FF"\]\] "<span style=\\"color: rgba(0, 0, 255, 0.0)\\">[foo\]</span>" compare innerHTML]
|
||||
expected: FAIL
|
||||
|
||||
[[["stylewithcss","false"\],["forecolor","#0000FF"\]\] "<span style=\\"color: rgba(0, 0, 255, 0.0)\\">[foo\]</span>" queryCommandValue("forecolor") before]
|
||||
expected: FAIL
|
||||
|
||||
[[["stylewithcss","false"\],["forecolor","#0000FF"\]\] "<span style=\\"color: rgb(15, -10, 375)\\">[foo\]</span>" compare innerHTML]
|
||||
expected: FAIL
|
||||
|
||||
|
|
|
|||
|
|
@ -309,9 +309,15 @@
|
|||
[[["stylewithcss","false"\],["hilitecolor","#00FFFF"\]\] "<span style=background-color:tan>fo[o<span style=background-color:transparent>b\]ar</span></span>" queryCommandValue("hilitecolor") after]
|
||||
expected: FAIL
|
||||
|
||||
[[["stylewithcss","true"\],["hilitecolor","#00FFFF"\]\] "<font size=6>[foo\]</font>" queryCommandValue("hilitecolor") after]
|
||||
expected: FAIL
|
||||
|
||||
[[["stylewithcss","false"\],["hilitecolor","#00FFFF"\]\] "<font size=6>[foo\]</font>" queryCommandValue("hilitecolor") after]
|
||||
expected: FAIL
|
||||
|
||||
[[["stylewithcss","true"\],["hilitecolor","#00FFFF"\]\] "<span style=font-size:xx-large>[foo\]</span>" queryCommandValue("hilitecolor") after]
|
||||
expected: FAIL
|
||||
|
||||
[[["stylewithcss","false"\],["hilitecolor","#00FFFF"\]\] "<span style=font-size:xx-large>[foo\]</span>" queryCommandValue("hilitecolor") after]
|
||||
expected: FAIL
|
||||
|
||||
|
|
|
|||
|
|
@ -103,7 +103,7 @@ add_task(function* test_contentscript_about_blank() {
|
|||
let a_b = win.document.getElementById("a_b");
|
||||
style = a_b.contentWindow.getComputedStyle(a_b.contentDocument.body);
|
||||
is(style.color, "rgb(255, 0, 0)", "about:blank iframe text color is red");
|
||||
is(style.backgroundColor, "transparent", "about:blank iframe background is transparent");
|
||||
is(style.backgroundColor, "rgba(0, 0, 0, 0)", "about:blank iframe background is transparent");
|
||||
is(style.textAlign, "right", "about:blank text is right-aligned");
|
||||
|
||||
is(count, 10, "exactly 7 more scripts ran");
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче