зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1803933 - Make deprecated system colors ActiveBorder, InactiveBorder, ThreeDDarkShadow, ThreeDHighlight, ThreeDShadow, WindowFrame same as css-color-4 system color ButtonBorder. r=morgan,emilio
Map: 1. `ActiveBorder`, 1. `InactiveBorder`, 1. `ThreeDDarkShadow`, 1. `ThreeDHighlight`, 1. `ThreeDShadow`, 1. `WindowFrame` to the `ButtonBorder` to conform with [css-color-4 Appendix A: Deprecated CSS System Colors](https://www.w3.org/TR/css-color-4/#deprecated-system-colors) and update expected WPT and dom/canvas test results. Differential Revision: https://phabricator.services.mozilla.com/D198313
This commit is contained in:
Родитель
215d50dab8
Коммит
d51a6fb944
|
@ -30,13 +30,13 @@ function runTest(testCanvasColors) {
|
|||
[ "Menu", 0xFF, 0xFF, 0xFF ], // deprecated, same as Canvas/Window (bug 1803930)
|
||||
[ "MenuText", 0x00, 0x00, 0x00 ], // deprecated, same as CanvasText/WindowText (bug 1873951)
|
||||
[ "Scrollbar", 0xFF, 0xFF, 0xFF ], // deprecated, same as Canvas/Window (bug 1803930)
|
||||
[ "ThreeDDarkShadow", 0x69, 0x69, 0x69 ],
|
||||
[ "ThreeDDarkShadow", 0xE3, 0xE3, 0xE3 ], // deprecated, same as ButtonBorder (bug 1803933)
|
||||
[ "ThreeDFace", 0xE9, 0xE9, 0xED ], // deprecated, same as ButtonFace (bug 1874064)
|
||||
[ "ThreeDHighlight", 0xFF, 0xFF, 0xFF ],
|
||||
[ "ThreeDHighlight", 0xE3, 0xE3, 0xE3 ], // deprecated, same as ButtonBorder (bug 1803933)
|
||||
[ "ThreeDLightShadow", 0xE3, 0xE3, 0xE3 ],
|
||||
[ "ThreeDShadow", 0xA0, 0xA0, 0xA0 ],
|
||||
[ "ThreeDShadow", 0xE3, 0xE3, 0xE3 ], // deprecated, same as ButtonBorder (bug 1803933)
|
||||
[ "Window", 0xFF, 0xFF, 0xFF ],
|
||||
[ "WindowFrame", 0x64, 0x64, 0x64 ],
|
||||
[ "WindowFrame", 0xE3, 0xE3, 0xE3 ], // deprecated, same as ButtonBorder (bug 1803933)
|
||||
[ "WindowText", 0x00, 0x00, 0x00 ],
|
||||
[ "-moz-ButtonHoverFace", 0xD0, 0xD0, 0xD7 ],
|
||||
[ "-moz-ButtonHoverText", 0x00, 0x00, 0x00 ],
|
||||
|
|
|
@ -1,2 +0,0 @@
|
|||
[deprecated-sameas-001.html]
|
||||
expected: FAIL
|
|
@ -1,2 +0,0 @@
|
|||
[deprecated-sameas-008.html]
|
||||
expected: FAIL
|
|
@ -1,2 +0,0 @@
|
|||
[deprecated-sameas-016.html]
|
||||
expected: FAIL
|
|
@ -1,2 +0,0 @@
|
|||
[deprecated-sameas-018.html]
|
||||
expected: FAIL
|
|
@ -1,2 +0,0 @@
|
|||
[deprecated-sameas-020.html]
|
||||
expected: FAIL
|
|
@ -1,2 +0,0 @@
|
|||
[deprecated-sameas-022.html]
|
||||
expected: FAIL
|
|
@ -623,8 +623,10 @@ nscolor nsXPLookAndFeel::GetStandinForNativeColor(ColorID aID,
|
|||
COLOR(TextSelectDisabledBackground, 0xAA, 0xAA, 0xAA)
|
||||
|
||||
// Titlebar colors
|
||||
COLOR(Activeborder, 0xB4, 0xB4, 0xB4)
|
||||
COLOR(Inactiveborder, 0xB4, 0xB4, 0xB4)
|
||||
// deprecated in CSS Color Level 4, same as Buttonborder:
|
||||
COLOR(Activeborder, 0xE3, 0xE3, 0xE3)
|
||||
// deprecated in CSS Color Level 4, same as Buttonborder:
|
||||
COLOR(Inactiveborder, 0xE3, 0xE3, 0xE3)
|
||||
// deprecated in CSS Color Level 4, same as Canvas/Window:
|
||||
COLOR(Activecaption, 0xFF, 0xFF, 0xFF)
|
||||
// deprecated in CSS Color Level 4, same as Canvas/Window:
|
||||
|
@ -667,17 +669,21 @@ nscolor nsXPLookAndFeel::GetStandinForNativeColor(ColorID aID,
|
|||
COLOR(Menutext, 0x00, 0x00, 0x00)
|
||||
// deprecated in CSS Color Level 4, same as Canvas/Window:
|
||||
COLOR(Scrollbar, 0xFF, 0xFF, 0xFF)
|
||||
COLOR(Threeddarkshadow, 0x69, 0x69, 0x69)
|
||||
// deprecated in CSS Color Level 4, same as Buttonborder:
|
||||
COLOR(Threeddarkshadow, 0xE3, 0xE3, 0xE3)
|
||||
// deprecated in CSS Color Level 4, same as Buttonface:
|
||||
COLOR(Threedface, 0xE9, 0xE9, 0xED)
|
||||
COLOR(Threedhighlight, 0xFF, 0xFF, 0xFF)
|
||||
// deprecated in CSS Color Level 4, same as Buttonborder:
|
||||
COLOR(Threedhighlight, 0xE3, 0xE3, 0xE3)
|
||||
COLOR(Threedlightshadow, 0xE3, 0xE3, 0xE3)
|
||||
COLOR(Threedshadow, 0xA0, 0xA0, 0xA0)
|
||||
// deprecated in CSS Color Level 4, same as Buttonborder:
|
||||
COLOR(Threedshadow, 0xE3, 0xE3, 0xE3)
|
||||
COLOR(Buttonborder, 0xE3, 0xE3, 0xE3)
|
||||
COLOR(Mark, 0xFF, 0xFF, 0x00)
|
||||
COLOR(Marktext, 0x00, 0x00, 0x00)
|
||||
COLOR(Window, 0xFF, 0xFF, 0xFF)
|
||||
COLOR(Windowframe, 0x64, 0x64, 0x64)
|
||||
// deprecated in CSS Color Level 4, same as Buttonborder:
|
||||
COLOR(Windowframe, 0xE3, 0xE3, 0xE3)
|
||||
COLOR(Windowtext, 0x00, 0x00, 0x00)
|
||||
COLOR(Field, 0xFF, 0xFF, 0xFF)
|
||||
COLORA(MozDisabledfield, 0xFF, 0xFF, 0xFF, 128)
|
||||
|
@ -1277,6 +1283,10 @@ static constexpr std::bitset<size_t(ColorID::End)> sNonNativeThemeStandinColors{
|
|||
// https://drafts.csswg.org/css-color-4/#deprecated-system-colors
|
||||
// should match ButtonFace:
|
||||
BIT_FOR(Buttonhighlight) | BIT_FOR(Buttonshadow) | BIT_FOR(Threedface) |
|
||||
// should match ButtonBorder:
|
||||
BIT_FOR(Activeborder) | BIT_FOR(Inactiveborder) |
|
||||
BIT_FOR(Threeddarkshadow) | BIT_FOR(Threedhighlight) |
|
||||
BIT_FOR(Threedshadow) | BIT_FOR(Windowframe) |
|
||||
// should match GrayText:
|
||||
BIT_FOR(Inactivecaptiontext) |
|
||||
// should match Canvas/Window:
|
||||
|
|
Загрузка…
Ссылка в новой задаче