mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1874064 - Make deprecated system color ThreeDFace same as css-color-4 system color ButtonFace. r=morgan,emilio 

Map `ThreeDFace` to the `ButtonFace` 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/D198311
This commit is contained in:
Anna Yeddi 2024-01-22 18:40:56 +00:00
Родитель 818eb3bea4
Коммит 215d50dab8
3 изменённых файлов: 6 добавлений и 7 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
dom/canvas/test/test_bug232227.html
Просмотреть файл

@ -31,18 +31,18 @@ function runTest(testCanvasColors) {
[ "MenuText", 0x00, 0x00, 0x00 ], // deprecated, same as CanvasText/WindowText (bug 1873951) [ "MenuText", 0x00, 0x00, 0x00 ], // deprecated, same as CanvasText/WindowText (bug 1873951)
[ "Scrollbar", 0xFF, 0xFF, 0xFF ], // deprecated, same as Canvas/Window (bug 1803930) [ "Scrollbar", 0xFF, 0xFF, 0xFF ], // deprecated, same as Canvas/Window (bug 1803930)
[ "ThreeDDarkShadow", 0x69, 0x69, 0x69 ], [ "ThreeDDarkShadow", 0x69, 0x69, 0x69 ],
[ "ThreeDFace", 0xF0, 0xF0, 0xF0 ], [ "ThreeDFace", 0xE9, 0xE9, 0xED ], // deprecated, same as ButtonFace (bug 1874064)
[ "ThreeDHighlight", 0xFF, 0xFF, 0xFF ], [ "ThreeDHighlight", 0xFF, 0xFF, 0xFF ],
[ "ThreeDLightShadow", 0xE3, 0xE3, 0xE3 ], [ "ThreeDLightShadow", 0xE3, 0xE3, 0xE3 ],
[ "ThreeDShadow", 0xA0, 0xA0, 0xA0 ], [ "ThreeDShadow", 0xA0, 0xA0, 0xA0 ],
[ "Window", 0xFF, 0xFF, 0xFF ], [ "Window", 0xFF, 0xFF, 0xFF ],
[ "WindowFrame", 0x64, 0x64, 0x64 ], [ "WindowFrame", 0x64, 0x64, 0x64 ],
[ "WindowText", 0x00, 0x00, 0x00 ], [ "WindowText", 0x00, 0x00, 0x00 ],
[ "-moz-ButtonHoverFace", 0xd0, 0xd0, 0xd7 ], [ "-moz-ButtonHoverFace", 0xD0, 0xD0, 0xD7 ],
[ "-moz-ButtonHoverText", 0x00, 0x00, 0x00 ], [ "-moz-ButtonHoverText", 0x00, 0x00, 0x00 ],
[ "-moz-CellHighlight", 0xF0, 0xF0, 0xF0 ], [ "-moz-CellHighlight", 0xF0, 0xF0, 0xF0 ],
[ "-moz-CellHighlightText", 0x00, 0x00, 0x00 ], [ "-moz-CellHighlightText", 0x00, 0x00, 0x00 ],
[ "-moz-Combobox", 0xe9, 0xe9, 0xed], [ "-moz-Combobox", 0xE9, 0xE9, 0xED ],
[ "-moz-ComboboxText", 0x00, 0x00, 0x00 ], [ "-moz-ComboboxText", 0x00, 0x00, 0x00 ],
[ "-moz-Dialog", 0xF0, 0xF0, 0xF0 ], [ "-moz-Dialog", 0xF0, 0xF0, 0xF0 ],
[ "-moz-DialogText", 0x00, 0x00, 0x00 ], [ "-moz-DialogText", 0x00, 0x00, 0x00 ],

2
testing/web-platform/meta/css/css-color/deprecated-sameas-017.html.ini
Просмотреть файл

@ -1,2 +0,0 @@
[deprecated-sameas-017.html]
expected: FAIL

5
widget/nsXPLookAndFeel.cpp
Просмотреть файл

@ -668,7 +668,8 @@ nscolor nsXPLookAndFeel::GetStandinForNativeColor(ColorID aID,
// deprecated in CSS Color Level 4, same as Canvas/Window: // deprecated in CSS Color Level 4, same as Canvas/Window:
COLOR(Scrollbar, 0xFF, 0xFF, 0xFF) COLOR(Scrollbar, 0xFF, 0xFF, 0xFF)
COLOR(Threeddarkshadow, 0x69, 0x69, 0x69) COLOR(Threeddarkshadow, 0x69, 0x69, 0x69)
COLOR(Threedface, 0xF0, 0xF0, 0xF0) // deprecated in CSS Color Level 4, same as Buttonface:
COLOR(Threedface, 0xE9, 0xE9, 0xED)
COLOR(Threedhighlight, 0xFF, 0xFF, 0xFF) COLOR(Threedhighlight, 0xFF, 0xFF, 0xFF)
COLOR(Threedlightshadow, 0xE3, 0xE3, 0xE3) COLOR(Threedlightshadow, 0xE3, 0xE3, 0xE3)
COLOR(Threedshadow, 0xA0, 0xA0, 0xA0) COLOR(Threedshadow, 0xA0, 0xA0, 0xA0)
@ -1275,7 +1276,7 @@ static constexpr std::bitset<size_t(ColorID::End)> sNonNativeThemeStandinColors{
// Per spec, the following colors are deprecated, see // Per spec, the following colors are deprecated, see
// https://drafts.csswg.org/css-color-4/#deprecated-system-colors // https://drafts.csswg.org/css-color-4/#deprecated-system-colors
// should match ButtonFace: // should match ButtonFace:
BIT_FOR(Buttonhighlight) | BIT_FOR(Buttonshadow) | BIT_FOR(Buttonhighlight) | BIT_FOR(Buttonshadow) | BIT_FOR(Threedface) |
// should match GrayText: // should match GrayText:
BIT_FOR(Inactivecaptiontext) | BIT_FOR(Inactivecaptiontext) |
// should match Canvas/Window: // should match Canvas/Window: