Changeset 283159 in webkit


Ignore:
Timestamp:
Sep 27, 2021 11:45:49 PM (10 months ago)
Author:
mmaxfield@apple.com
Message:

override-color has been renamed to override-colors
​https://bugs.webkit.org/show_bug.cgi?id=230789
<rdar://problem/83529354>

Reviewed by Devin Rousso.

LayoutTests/imported/w3c:

This is being upstreamed in ​https://github.com/web-platform-tests/wpt/pull/30962.

  • web-platform-tests/css/css-fonts/font-palette-modify-2-expected.html:
  • web-platform-tests/css/css-fonts/font-palette-modify-2.html:
  • web-platform-tests/css/css-fonts/font-palette-modify-expected-mismatch.html:
  • web-platform-tests/css/css-fonts/font-palette-modify.html:
  • web-platform-tests/css/css-fonts/font-palette.html:
  • web-platform-tests/css/css-fonts/parsing/font-palette-values-invalid.html:
  • web-platform-tests/css/css-fonts/parsing/font-palette-values-valid.html:

Source/WebCore:

The spec was changed in
​https://github.com/w3c/csswg-drafts/commit/9de250d6692d07ddb8af3e3face37b909e5aad7b.
No browser has shipped the old name, so this is just a mechanical find/replace.

Updated existing tests.

  • Sources.txt:
  • WebCore.xcodeproj/project.pbxproj:
  • css/CSSComputedStyleDeclaration.cpp:

(WebCore::ComputedStyleExtractor::valueForPropertyInStyle):

  • css/CSSFontPaletteValuesOverrideColorsValue.cpp: Renamed from Source/WebCore/css/CSSFontPaletteValuesOverrideColorValue.cpp.

(WebCore::CSSFontPaletteValuesOverrideColorsValue::customCSSText const):
(WebCore::CSSFontPaletteValuesOverrideColorsValue::equals const):

  • css/CSSFontPaletteValuesOverrideColorsValue.h: Renamed from Source/WebCore/css/CSSFontPaletteValuesOverrideColorValue.h.
  • css/CSSFontPaletteValuesRule.cpp:

(WebCore::CSSFontPaletteValuesRule::initializeMapLike):
(WebCore::CSSFontPaletteValuesRule::cssText const):

  • css/CSSProperties.json:
  • css/CSSValue.cpp:

(WebCore::CSSValue::equals const):
(WebCore::CSSValue::cssText const):
(WebCore::CSSValue::destroy):

  • css/CSSValue.h:

(WebCore::CSSValue::isFontPaletteValuesOverrideColorsValue const):
(WebCore::CSSValue::isFontPaletteValuesOverrideColorValue const): Deleted.

  • css/StyleRule.cpp:

(WebCore::StyleRuleFontPaletteValues::StyleRuleFontPaletteValues):

  • css/StyleRule.h:
  • css/parser/CSSParserImpl.cpp:

(WebCore::CSSParserImpl::consumeFontPaletteValuesRule):

  • css/parser/CSSPropertyParser.cpp:

(WebCore::consumeOverrideColorsDescriptor):
(WebCore::CSSPropertyParser::parseFontPaletteValuesDescriptor):
(WebCore::consumeOverrideColorDescriptor): Deleted.

  • platform/graphics/FontPaletteValues.h:

(WebCore::FontPaletteValues::FontPaletteValues):
(WebCore::FontPaletteValues::overrideColors const):
(WebCore::FontPaletteValues::operator== const):
(WebCore::add):
(WebCore::FontPaletteValues::overrideColor const): Deleted.

  • platform/graphics/cocoa/FontCacheCoreText.cpp:

(WebCore::addAttributesForFontPalettes):

Location:
trunk
Files:
22 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/imported/w3c/ChangeLog

    r283154 r283159  
     12021-09-27  Myles C. Maxfield  <mmaxfield@apple.com>
     2
     3        override-color has been renamed to override-colors
     4        https://bugs.webkit.org/show_bug.cgi?id=230789
     5        <rdar://problem/83529354>
     6
     7        Reviewed by Devin Rousso.
     8
     9        This is being upstreamed in https://github.com/web-platform-tests/wpt/pull/30962.
     10
     11        * web-platform-tests/css/css-fonts/font-palette-modify-2-expected.html:
     12        * web-platform-tests/css/css-fonts/font-palette-modify-2.html:
     13        * web-platform-tests/css/css-fonts/font-palette-modify-expected-mismatch.html:
     14        * web-platform-tests/css/css-fonts/font-palette-modify.html:
     15        * web-platform-tests/css/css-fonts/font-palette.html:
     16        * web-platform-tests/css/css-fonts/parsing/font-palette-values-invalid.html:
     17        * web-platform-tests/css/css-fonts/parsing/font-palette-values-valid.html:
     18
    1192021-09-27  Myles C. Maxfield  <mmaxfield@apple.com>
    220

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/font-palette-modify-2-expected.html

    r283077 r283159  
    2020    font-family: "Ahem-COLR";
    2121    base-palette: 0;
    22     override-color: 1 #00FF00;
     22    override-colors: 1 #00FF00;
    2323}
    2424</style>

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/font-palette-modify-2.html

    r283077 r283159  
    2121    font-family: "Ahem-COLR";
    2222    base-palette: 0;
    23     override-color: 1 #00FF00;
     23    override-colors: 1 #00FF00;
    2424}
    2525</style>

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/font-palette-modify-expected-mismatch.html

    r283077 r283159  
    2020    font-family: "Ahem-COLR";
    2121    base-palette: 0;
    22     override-color: 1 #00FF00;
     22    override-colors: 1 #00FF00;
    2323}
    2424</style>

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/font-palette-modify.html

    r283077 r283159  
    2121    font-family: "Ahem-COLR";
    2222    base-palette: 0;
    23     override-color: 1 #00FF00;
     23    override-colors: 1 #00FF00;
    2424}
    2525</style>

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/font-palette.html

    r283077 r283159  
    2727    font-family: "WebFont";
    2828    base-palette: 1;
    29     override-color: 1 #FFFF00;
     29    override-colors: 1 #FFFF00;
    3030}
    3131
    … …  
    3333    font-family: "WebFont";
    3434    base-palette: 1;
    35     override-color: 0 #00FF00, 1 #000000;
     35    override-colors: 0 #00FF00, 1 #000000;
    3636}
    3737
    … …  
    3939    font-family: "WebFont";
    4040    base-palette: 1;
    41     override-color: 1 #000000, 0 #00FF00;
     41    override-colors: 1 #000000, 0 #00FF00;
    4242}
    4343</style>

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/parsing/font-palette-values-invalid.html

    r283154 r283159  
    5252/* 7 */
    5353@font-palette-values A {
    54     override-color: ident #123;
     54    override-colors: ident #123;
    5555}
    5656
    5757/* 8 */
    5858@font-palette-values A {
    59     override-color: 0 "red";
     59    override-colors: 0 "red";
    6060}
    6161
    6262/* 9 */
    6363@font-palette-values A {
    64     override-color: 0 #123, 1;
     64    override-colors: 0 #123, 1;
    6565}
    6666
    6767/* 10 */
    6868@font-palette-values A {
    69     override-color: ;
     69    override-colors: ;
    7070}
    7171
    7272/* 11 */
    7373@font-palette-values A {
    74     override-color: 0 #123 1;
     74    override-colors: 0 #123 1;
    7575}
    7676
    7777/* 12 */
    7878@font-palette-values A {
    79     override-color: 0;
     79    override-colors: 0;
    8080}
    8181
    … …  
    8888@font-palette-values A {
    8989    base-palette: initial;
    90     override-color: initial;
     90    override-colors: initial;
    9191}
    9292
    … …  
    9494@font-palette-values A {
    9595    base-palette: inherit;
    96     override-color: inherit;
     96    override-colors: inherit;
    9797}
    9898
    … …  
    100100@font-palette-values A {
    101101    base-palette: unset;
    102     override-color: unset;
     102    override-colors: unset;
    103103}
    104104</style>
    … …  
    177177    let text = rules[7].cssText;
    178178    let rule = rules[7];
    179     assert_equals(text.indexOf("override-color"), -1);
     179    assert_equals(text.indexOf("override-colors"), -1);
    180180    assert_equals(rule.size, 0);
    181181});
    … …  
    184184    let text = rules[8].cssText;
    185185    let rule = rules[8];
    186     assert_equals(text.indexOf("override-color"), -1);
     186    assert_equals(text.indexOf("override-colors"), -1);
    187187    assert_equals(rule.size, 0);
    188188});
    … …  
    191191    let text = rules[9].cssText;
    192192    let rule = rules[9];
    193     assert_equals(text.indexOf("override-color"), -1);
     193    assert_equals(text.indexOf("override-colors"), -1);
    194194    assert_equals(rule.size, 0);
    195195});
    … …  
    198198    let text = rules[10].cssText;
    199199    let rule = rules[10];
    200     assert_equals(text.indexOf("override-color"), -1);
     200    assert_equals(text.indexOf("override-colors"), -1);
    201201    assert_equals(rule.size, 0);
    202202});
    … …  
    205205    let text = rules[11].cssText;
    206206    let rule = rules[11];
    207     assert_equals(text.indexOf("override-color"), -1);
     207    assert_equals(text.indexOf("override-colors"), -1);
    208208    assert_equals(rule.size, 0);
    209209});
    … …  
    212212    let text = rules[12].cssText;
    213213    let rule = rules[12];
    214     assert_equals(text.indexOf("override-color"), -1);
     214    assert_equals(text.indexOf("override-colors"), -1);
    215215    assert_equals(rule.size, 0);
    216216});
    … …  
    227227    let rule = rules[14];
    228228    assert_equals(text.indexOf("base-palette"), -1);
    229     assert_equals(text.indexOf("override-color"), -1);
     229    assert_equals(text.indexOf("override-colors"), -1);
    230230    assert_equals(rule.size, 0);
    231231    assert_equals(rule.basePalette, "");
    … …  
    236236    let rule = rules[15];
    237237    assert_equals(text.indexOf("base-palette"), -1);
    238     assert_equals(text.indexOf("override-color"), -1);
     238    assert_equals(text.indexOf("override-colors"), -1);
    239239    assert_equals(rule.size, 0);
    240240    assert_equals(rule.basePalette, "");
    … …  
    245245    let rule = rules[16];
    246246    assert_equals(text.indexOf("base-palette"), -1);
    247     assert_equals(text.indexOf("override-color"), -1);
     247    assert_equals(text.indexOf("override-colors"), -1);
    248248    assert_equals(rule.size, 0);
    249249    assert_equals(rule.basePalette, "");

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/parsing/font-palette-values-valid.html

    r283140 r283159  
    2525    base-palette: "baz";
    2626    base-palette: 2;
    27     override-color: "a" #123;
    28     override-color: 3 #123;
    29     override-color: "b" #123;
     27    override-colors: "a" #123;
     28    override-colors: 3 #123;
     29    override-colors: "b" #123;
    3030}
    3131
    … …  
    3535    base-palette: 1;
    3636    base-palette: "bar";
    37     override-color: 3 #123;
    38     override-color: "baz" #123;
    39     override-color: 4 #123;
     37    override-colors: 3 #123;
     38    override-colors: "baz" #123;
     39    override-colors: 4 #123;
    4040}
    4141
    4242/* 4 */
    4343@font-palette-values E {
    44     override-color: 3 rgb(17, 34, 51);
    45     override-color: 3 rgb(68, 85, 102);
     44    override-colors: 3 rgb(17, 34, 51);
     45    override-colors: 3 rgb(68, 85, 102);
    4646}
    4747
    … …  
    5353/* 6 */
    5454@font-palette-values G {
    55     override-color: 3 rgb(17, 34, 51), 4 rgb(68, 85, 102);
     55    override-colors: 3 rgb(17, 34, 51), 4 rgb(68, 85, 102);
    5656}
    5757
    5858/* 7 */
    5959@font-palette-values H {
    60     override-color: 3 rgb(17, 34, 51), 3 rgb(68, 85, 102);
     60    override-colors: 3 rgb(17, 34, 51), 3 rgb(68, 85, 102);
    6161}
    6262
    … …  
    6868/* 9 */
    6969@font-palette-values J {
    70     override-color: -3 rgb(17, 34, 51);
     70    override-colors: -3 rgb(17, 34, 51);
    7171}
    7272
    7373/* 10 */
    7474@font-palette-values K {
    75     override-color: 0 #0000FF;
     75    override-colors: 0 #0000FF;
    7676}
    7777
    7878/* 11 */
    7979@font-palette-values L {
    80     override-color: 0 green;
     80    override-colors: 0 green;
    8181}
    8282
    8383/* 12 */
    8484@font-palette-values M {
    85     override-color: 0 transparent;
     85    override-colors: 0 transparent;
    8686}
    8787
    8888/* 13 */
    8989@font-palette-values N {
    90     override-color: 0 rgba(1 2 3 / 4);
     90    override-colors: 0 rgba(1 2 3 / 4);
    9191}
    9292
    9393/* 14 */
    9494@font-palette-values O {
    95     override-color: 0 lab(29.2345% 39.3825 20.0664);
     95    override-colors: 0 lab(29.2345% 39.3825 20.0664);
    9696}
    9797
    9898/* 15 */
    9999@font-palette-values P {
    100     override-color: 0 color(display-p3 100% 100% 100%);
     100    override-colors: 0 color(display-p3 100% 100% 100%);
    101101}
    102102</style>
    … …  
    113113    assert_equals(text.indexOf("font-family"), -1);
    114114    assert_equals(text.indexOf("base-palette"), -1);
    115     assert_equals(text.indexOf("override-color"), -1);
     115    assert_equals(text.indexOf("override-colors"), -1);
    116116});
    117117
    … …  
    145145    assert_equals(text.indexOf("base-palette: \"baz\""), -1);
    146146    assert_not_equals(text.indexOf("base-palette: 2;"), -1);
    147     assert_equals(text.indexOf("override-color: \"a\""), -1);
    148     assert_equals(text.indexOf("override-color: 3"), -1);
    149     assert_not_equals(text.indexOf("override-color: \"b\""), -1);
     147    assert_equals(text.indexOf("override-colors: \"a\""), -1);
     148    assert_equals(text.indexOf("override-colors: 3"), -1);
     149    assert_not_equals(text.indexOf("override-colors: \"b\""), -1);
    150150});
    151151
    … …  
    163163    assert_equals(text.indexOf("base-palette: 1"), -1);
    164164    assert_not_equals(text.indexOf("base-palette: \"bar\";"), -1);
    165     assert_equals(text.indexOf("override-color: 3"), -1);
    166     assert_equals(text.indexOf("override-color: \"baz\""), -1);
    167     assert_not_equals(text.indexOf("override-color: 4"), -1);
     165    assert_equals(text.indexOf("override-colors: 3"), -1);
     166    assert_equals(text.indexOf("override-colors: \"baz\""), -1);
     167    assert_not_equals(text.indexOf("override-colors: 4"), -1);
    168168});
    169169
    … …  
    256256test(function() {
    257257    let text = rules[9].cssText;
    258     assert_not_equals(text.indexOf("override-color"), -1);
     258    assert_not_equals(text.indexOf("override-colors"), -1);
    259259});
    260260
    … …  
    271271test(function() {
    272272    let text = rules[10].cssText;
    273     assert_not_equals(text.indexOf("override-color"), -1);
     273    assert_not_equals(text.indexOf("override-colors"), -1);
    274274    assert_not_equals(text.indexOf("rgb(0, 0, 255)"), -1);
    275275});
    … …  
    286286test(function() {
    287287    let text = rules[11].cssText;
    288     assert_not_equals(text.indexOf("override-color"), -1);
     288    assert_not_equals(text.indexOf("override-colors"), -1);
    289289    assert_not_equals(text.indexOf("rgb(0, 128, 0)"), -1);
    290290});
    … …  
    301301test(function() {
    302302    let text = rules[12].cssText;
    303     assert_not_equals(text.indexOf("override-color"), -1);
     303    assert_not_equals(text.indexOf("override-colors"), -1);
    304304    assert_not_equals(text.indexOf("rgba(0, 0, 0, 0)"), -1);
    305305});
    … …  
    316316test(function() {
    317317    let text = rules[13].cssText;
    318     assert_not_equals(text.indexOf("override-color"), -1);
     318    assert_not_equals(text.indexOf("override-colors"), -1);
    319319    assert_not_equals(text.indexOf("2"), -1);
    320320});
    … …  
    331331test(function() {
    332332    let text = rules[14].cssText;
    333     assert_not_equals(text.indexOf("override-color"), -1);
     333    assert_not_equals(text.indexOf("override-colors"), -1);
    334334    assert_not_equals(text.indexOf("29"), -1);
    335335});
    … …  
    346346test(function() {
    347347    let text = rules[15].cssText;
    348     assert_not_equals(text.indexOf("override-color"), -1);
     348    assert_not_equals(text.indexOf("override-colors"), -1);
    349349    assert_not_equals(text.indexOf("display-p3"), -1);
    350350});

  • trunk/Source/WebCore/ChangeLog

    r283158 r283159  
     12021-09-27  Myles C. Maxfield  <mmaxfield@apple.com>
     2
     3        override-color has been renamed to override-colors
     4        https://bugs.webkit.org/show_bug.cgi?id=230789
     5        <rdar://problem/83529354>
     6
     7        Reviewed by Devin Rousso.
     8
     9        The spec was changed in
     10        https://github.com/w3c/csswg-drafts/commit/9de250d6692d07ddb8af3e3face37b909e5aad7b.
     11        No browser has shipped the old name, so this is just a mechanical find/replace.
     12
     13        Updated existing tests.
     14
     15        * Sources.txt:
     16        * WebCore.xcodeproj/project.pbxproj:
     17        * css/CSSComputedStyleDeclaration.cpp:
     18        (WebCore::ComputedStyleExtractor::valueForPropertyInStyle):
     19        * css/CSSFontPaletteValuesOverrideColorsValue.cpp: Renamed from Source/WebCore/css/CSSFontPaletteValuesOverrideColorValue.cpp.
     20        (WebCore::CSSFontPaletteValuesOverrideColorsValue::customCSSText const):
     21        (WebCore::CSSFontPaletteValuesOverrideColorsValue::equals const):
     22        * css/CSSFontPaletteValuesOverrideColorsValue.h: Renamed from Source/WebCore/css/CSSFontPaletteValuesOverrideColorValue.h.
     23        * css/CSSFontPaletteValuesRule.cpp:
     24        (WebCore::CSSFontPaletteValuesRule::initializeMapLike):
     25        (WebCore::CSSFontPaletteValuesRule::cssText const):
     26        * css/CSSProperties.json:
     27        * css/CSSValue.cpp:
     28        (WebCore::CSSValue::equals const):
     29        (WebCore::CSSValue::cssText const):
     30        (WebCore::CSSValue::destroy):
     31        * css/CSSValue.h:
     32        (WebCore::CSSValue::isFontPaletteValuesOverrideColorsValue const):
     33        (WebCore::CSSValue::isFontPaletteValuesOverrideColorValue const): Deleted.
     34        * css/StyleRule.cpp:
     35        (WebCore::StyleRuleFontPaletteValues::StyleRuleFontPaletteValues):
     36        * css/StyleRule.h:
     37        * css/parser/CSSParserImpl.cpp:
     38        (WebCore::CSSParserImpl::consumeFontPaletteValuesRule):
     39        * css/parser/CSSPropertyParser.cpp:
     40        (WebCore::consumeOverrideColorsDescriptor):
     41        (WebCore::CSSPropertyParser::parseFontPaletteValuesDescriptor):
     42        (WebCore::consumeOverrideColorDescriptor): Deleted.
     43        * platform/graphics/FontPaletteValues.h:
     44        (WebCore::FontPaletteValues::FontPaletteValues):
     45        (WebCore::FontPaletteValues::overrideColors const):
     46        (WebCore::FontPaletteValues::operator== const):
     47        (WebCore::add):
     48        (WebCore::FontPaletteValues::overrideColor const): Deleted.
     49        * platform/graphics/cocoa/FontCacheCoreText.cpp:
     50        (WebCore::addAttributesForFontPalettes):
     51
    1522021-09-27  Antti Koivisto  <antti@apple.com>
    253

  • trunk/Source/WebCore/Sources.txt

    r283072 r283159  
    660660css/CSSFontFaceSrcValue.cpp
    661661css/CSSFontFeatureValue.cpp
    662 css/CSSFontPaletteValuesOverrideColorValue.cpp
     662css/CSSFontPaletteValuesOverrideColorsValue.cpp
    663663css/CSSFontPaletteValuesRule.cpp
    664664css/CSSFontSelector.cpp

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r283072 r283159  
    654654                1CE8D12726185C0E00FC3AEF /* DisplayListItemBufferIdentifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CE8D12526185BD800FC3AEF /* DisplayListItemBufferIdentifier.h */; settings = {ATTRIBUTES = (Private, ); }; };
    655655                1CE8D12E261861C400FC3AEF /* DisplayListIterator.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CE8D12C2618616400FC3AEF /* DisplayListIterator.h */; settings = {ATTRIBUTES = (Private, ); }; };
    656                 1CEAA53226F336FC00868507 /* CSSFontPaletteValuesOverrideColorValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CEAA53126F331C100868507 /* CSSFontPaletteValuesOverrideColorValue.h */; };
     656                1CEAA53226F336FC00868507 /* CSSFontPaletteValuesOverrideColorsValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CEAA53126F331C100868507 /* CSSFontPaletteValuesOverrideColorsValue.h */; };
    657657                1CFAE3230A6D6A3F0032593D /* libobjc.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1CFAE3220A6D6A3F0032593D /* libobjc.dylib */; };
    658658                1D0026A42374D62400CA6CDF /* JSPictureInPictureWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = 1D0026A22374D62300CA6CDF /* JSPictureInPictureWindow.h */; };
    … …  
    70367036                1CEAA52D26F31A3C00868507 /* CSSFontPaletteValuesRule.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CSSFontPaletteValuesRule.h; sourceTree = "<group>"; };
    70377037                1CEAA52F26F31AF800868507 /* CSSFontPaletteValuesRule.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = CSSFontPaletteValuesRule.idl; sourceTree = "<group>"; };
    7038                 1CEAA53026F331C100868507 /* CSSFontPaletteValuesOverrideColorValue.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CSSFontPaletteValuesOverrideColorValue.cpp; sourceTree = "<group>"; };
    7039                 1CEAA53126F331C100868507 /* CSSFontPaletteValuesOverrideColorValue.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CSSFontPaletteValuesOverrideColorValue.h; sourceTree = "<group>"; };
     7038                1CEAA53026F331C100868507 /* CSSFontPaletteValuesOverrideColorsValue.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CSSFontPaletteValuesOverrideColorsValue.cpp; sourceTree = "<group>"; };
     7039                1CEAA53126F331C100868507 /* CSSFontPaletteValuesOverrideColorsValue.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CSSFontPaletteValuesOverrideColorsValue.h; sourceTree = "<group>"; };
    70407040                1CF0BFD42298706800ED2074 /* TextSizeAdjustment.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TextSizeAdjustment.cpp; sourceTree = "<group>"; };
    70417041                1CF18F3C26BB5AF2004B1722 /* LogInitialization.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = LogInitialization.cpp; sourceTree = "<group>"; };
    … …  
    2957629576                                4A6E9FC113C17D1D0046A7F8 /* CSSFontFeatureValue.cpp */,
    2957729577                                4A6E9FC213C17D1D0046A7F8 /* CSSFontFeatureValue.h */,
    29578                                 1CEAA53026F331C100868507 /* CSSFontPaletteValuesOverrideColorValue.cpp */,
    29579                                 1CEAA53126F331C100868507 /* CSSFontPaletteValuesOverrideColorValue.h */,
     29578                                1CEAA53026F331C100868507 /* CSSFontPaletteValuesOverrideColorsValue.cpp */,
     29579                                1CEAA53126F331C100868507 /* CSSFontPaletteValuesOverrideColorsValue.h */,
    2958029580                                1CEAA52C26F31A3C00868507 /* CSSFontPaletteValuesRule.cpp */,
    2958129581                                1CEAA52D26F31A3C00868507 /* CSSFontPaletteValuesRule.h */,
    … …  
    3195731957                                83520C7E1A71BFCC006BD2AA /* CSSFontFamily.h in Headers */,
    3195831958                                4A6E9FC413C17D1D0046A7F8 /* CSSFontFeatureValue.h in Headers */,
    31959                                 1CEAA53226F336FC00868507 /* CSSFontPaletteValuesOverrideColorValue.h in Headers */,
     31959                                1CEAA53226F336FC00868507 /* CSSFontPaletteValuesOverrideColorsValue.h in Headers */,
    3196031960                                BC64B4DC0CB4298A005F2B62 /* CSSFontSelector.h in Headers */,
    3196131961                                C2E38F021E84573500CA3ADF /* CSSFontStyleRangeValue.h in Headers */,

  • trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

    r282851 r283159  
    40744074        // Unimplemented @font-palette-values properties
    40754075        case CSSPropertyBasePalette:
    4076         case CSSPropertyOverrideColor:
     4076        case CSSPropertyOverrideColors:
    40774077            break;
    40784078

  • trunk/Source/WebCore/css/CSSFontPaletteValuesOverrideColorsValue.cpp

    r283158 r283159  
    2525
    2626#include "config.h"
    27 #include "CSSFontPaletteValuesOverrideColorValue.h"
     27#include "CSSFontPaletteValuesOverrideColorsValue.h"
    2828
    2929namespace WebCore {
    3030
    31 String CSSFontPaletteValuesOverrideColorValue::customCSSText() const
     31String CSSFontPaletteValuesOverrideColorsValue::customCSSText() const
    3232{
    3333    return makeString(m_key->cssText(), " ", m_color->cssText());
    3434}
    3535
    36 bool CSSFontPaletteValuesOverrideColorValue::equals(const CSSFontPaletteValuesOverrideColorValue& other) const
     36bool CSSFontPaletteValuesOverrideColorsValue::equals(const CSSFontPaletteValuesOverrideColorsValue& other) const
    3737{
    3838    return m_key->equals(other.key()) && m_color->equals(other.color());

  • trunk/Source/WebCore/css/CSSFontPaletteValuesOverrideColorsValue.h

    • Property svn:keywords set to Author Date Id Rev URL
    r283158 r283159  
    4040class ScriptExecutionContext;
    4141
    42 class CSSFontPaletteValuesOverrideColorValue final : public CSSValue {
     42class CSSFontPaletteValuesOverrideColorsValue final : public CSSValue {
    4343public:
    44     static Ref<CSSFontPaletteValuesOverrideColorValue> create(Ref<CSSPrimitiveValue>&& key, Ref<CSSPrimitiveValue>&& color)
     44    static Ref<CSSFontPaletteValuesOverrideColorsValue> create(Ref<CSSPrimitiveValue>&& key, Ref<CSSPrimitiveValue>&& color)
    4545    {
    46         return adoptRef(*new CSSFontPaletteValuesOverrideColorValue(WTFMove(key), WTFMove(color)));
     46        return adoptRef(*new CSSFontPaletteValuesOverrideColorsValue(WTFMove(key), WTFMove(color)));
    4747    }
    4848
    … …  
    5959    String customCSSText() const;
    6060
    61     bool equals(const CSSFontPaletteValuesOverrideColorValue&) const;
     61    bool equals(const CSSFontPaletteValuesOverrideColorsValue&) const;
    6262
    6363private:
    64     CSSFontPaletteValuesOverrideColorValue(Ref<CSSPrimitiveValue>&& key, Ref<CSSPrimitiveValue>&& color)
    65         : CSSValue(FontPaletteValuesOverrideColorClass)
     64    CSSFontPaletteValuesOverrideColorsValue(Ref<CSSPrimitiveValue>&& key, Ref<CSSPrimitiveValue>&& color)
     65        : CSSValue(FontPaletteValuesOverrideColorsClass)
    6666        , m_key(WTFMove(key))
    6767        , m_color(WTFMove(color))
    … …  
    7575} // namespace WebCore
    7676
    77 SPECIALIZE_TYPE_TRAITS_CSS_VALUE(CSSFontPaletteValuesOverrideColorValue, isFontPaletteValuesOverrideColorValue())
     77SPECIALIZE_TYPE_TRAITS_CSS_VALUE(CSSFontPaletteValuesOverrideColorsValue, isFontPaletteValuesOverrideColorsValue())

  • trunk/Source/WebCore/css/CSSFontPaletteValuesRule.cpp

    r283140 r283159  
    7070void CSSFontPaletteValuesRule::initializeMapLike(DOMMapAdapter& map)
    7171{
    72     for (auto& pair : m_fontPaletteValuesRule->overrideColor()) {
     72    for (auto& pair : m_fontPaletteValuesRule->overrideColors()) {
    7373        if (!WTF::holds_alternative<int64_t>(pair.first))
    7474            continue;
    … …  
    8989            builder.append("base-palette: ", serializeString(basePalette.string()), "; ");
    9090    });
    91     if (!m_fontPaletteValuesRule->overrideColor().isEmpty()) {
    92         builder.append("override-color:");
    93         for (size_t i = 0; i < m_fontPaletteValuesRule->overrideColor().size(); ++i) {
     91    if (!m_fontPaletteValuesRule->overrideColors().isEmpty()) {
     92        builder.append("override-colors:");
     93        for (size_t i = 0; i < m_fontPaletteValuesRule->overrideColors().size(); ++i) {
    9494            if (i)
    9595                builder.append(',');
    9696            builder.append(' ');
    97             WTF::switchOn(m_fontPaletteValuesRule->overrideColor()[i].first, [&](const AtomString& name) {
     97            WTF::switchOn(m_fontPaletteValuesRule->overrideColors()[i].first, [&](const AtomString& name) {
    9898                builder.append(serializeString(name.string()));
    9999            }, [&](int64_t index) {
    100100                builder.append(index);
    101101            });
    102             builder.append(' ', serializationForCSS(m_fontPaletteValuesRule->overrideColor()[i].second));
     102            builder.append(' ', serializationForCSS(m_fontPaletteValuesRule->overrideColors()[i].second));
    103103        }
    104104        builder.append("; ");

  • trunk/Source/WebCore/css/CSSProperties.json

    r282851 r283159  
    41084108            }
    41094109        },
    4110         "override-color": {
     4110        "override-colors": {
    41114111            "codegen-properties": {
    41124112                "skip-builder": true,

  • trunk/Source/WebCore/css/CSSValue.cpp

    r282806 r283159  
    4141#include "CSSFontFaceSrcValue.h"
    4242#include "CSSFontFeatureValue.h"
    43 #include "CSSFontPaletteValuesOverrideColorValue.h"
     43#include "CSSFontPaletteValuesOverrideColorsValue.h"
    4444#include "CSSFontStyleRangeValue.h"
    4545#include "CSSFontStyleValue.h"
    … …  
    167167        case FontFaceSrcClass:
    168168            return compareCSSValues<CSSFontFaceSrcValue>(*this, other);
    169         case FontPaletteValuesOverrideColorClass:
    170             return compareCSSValues<CSSFontPaletteValuesOverrideColorValue>(*this, other);
     169        case FontPaletteValuesOverrideColorsClass:
     170            return compareCSSValues<CSSFontPaletteValuesOverrideColorsValue>(*this, other);
    171171        case FontFeatureClass:
    172172            return compareCSSValues<CSSFontFeatureValue>(*this, other);
    … …  
    269269    case FontFaceSrcClass:
    270270        return downcast<CSSFontFaceSrcValue>(*this).customCSSText();
    271     case FontPaletteValuesOverrideColorClass:
    272         return downcast<CSSFontPaletteValuesOverrideColorValue>(*this).customCSSText();
     271    case FontPaletteValuesOverrideColorsClass:
     272        return downcast<CSSFontPaletteValuesOverrideColorsValue>(*this).customCSSText();
    273273    case FontFeatureClass:
    274274        return downcast<CSSFontFeatureValue>(*this).customCSSText();
    … …  
    384384        delete downcast<CSSFontFaceSrcValue>(this);
    385385        return;
    386     case FontPaletteValuesOverrideColorClass:
    387         delete downcast<CSSFontPaletteValuesOverrideColorValue>(this);
     386    case FontPaletteValuesOverrideColorsClass:
     387        delete downcast<CSSFontPaletteValuesOverrideColorsValue>(this);
    388388        return;
    389389    case FontFeatureClass:

  • trunk/Source/WebCore/css/CSSValue.h

    r282806 r283159  
    9898    bool isFontVariationValue() const { return m_classType == FontVariationClass; }
    9999    bool isFontFaceSrcValue() const { return m_classType == FontFaceSrcClass; }
    100     bool isFontPaletteValuesOverrideColorValue() const { return m_classType == FontPaletteValuesOverrideColorClass; }
     100    bool isFontPaletteValuesOverrideColorsValue() const { return m_classType == FontPaletteValuesOverrideColorsClass; }
    101101    bool isFontValue() const { return m_classType == FontClass; }
    102102    bool isFontStyleValue() const { return m_classType == FontStyleClass; }
    … …  
    189189        FontStyleRangeClass,
    190190        FontFaceSrcClass,
    191         FontPaletteValuesOverrideColorClass,
     191        FontPaletteValuesOverrideColorsClass,
    192192        FunctionClass,
    193193

  • trunk/Source/WebCore/css/StyleRule.cpp

    r283120 r283159  
    329329}
    330330
    331 StyleRuleFontPaletteValues::StyleRuleFontPaletteValues(const AtomString& name, const AtomString& fontFamily, const FontPaletteValues::PaletteIndex& basePalette, Vector<FontPaletteValues::OverriddenColor>&& overrideColor)
     331StyleRuleFontPaletteValues::StyleRuleFontPaletteValues(const AtomString& name, const AtomString& fontFamily, const FontPaletteValues::PaletteIndex& basePalette, Vector<FontPaletteValues::OverriddenColor>&& overrideColors)
    332332    : StyleRuleBase(StyleRuleType::FontPaletteValues)
    333333    , m_name(name)
    334334    , m_fontFamily(fontFamily)
    335     , m_fontPaletteValues(basePalette, WTFMove(overrideColor))
     335    , m_fontPaletteValues(basePalette, WTFMove(overrideColors))
    336336{
    337337}

  • trunk/Source/WebCore/css/StyleRule.h

    r283120 r283159  
    160160class StyleRuleFontPaletteValues final : public StyleRuleBase {
    161161public:
    162     static Ref<StyleRuleFontPaletteValues> create(const AtomString& name, const AtomString& fontFamily, const FontPaletteValues::PaletteIndex& basePalette, Vector<FontPaletteValues::OverriddenColor>&& overrideColor) { return adoptRef(*new StyleRuleFontPaletteValues(name, fontFamily, basePalette, WTFMove(overrideColor))); }
     162    static Ref<StyleRuleFontPaletteValues> create(const AtomString& name, const AtomString& fontFamily, const FontPaletteValues::PaletteIndex& basePalette, Vector<FontPaletteValues::OverriddenColor>&& overrideColors) { return adoptRef(*new StyleRuleFontPaletteValues(name, fontFamily, basePalette, WTFMove(overrideColors))); }
    163163   
    164164    ~StyleRuleFontPaletteValues();
    … …  
    184184    }
    185185
    186     const Vector<FontPaletteValues::OverriddenColor>& overrideColor() const
     186    const Vector<FontPaletteValues::OverriddenColor>& overrideColors() const
    187187    {
    188         return m_fontPaletteValues.overrideColor();
     188        return m_fontPaletteValues.overrideColors();
    189189    }
    190190
    … …  
    192192
    193193private:
    194     StyleRuleFontPaletteValues(const AtomString& name, const AtomString& fontFamily, const FontPaletteValues::PaletteIndex& basePalette, Vector<FontPaletteValues::OverriddenColor>&& overrideColor);
     194    StyleRuleFontPaletteValues(const AtomString& name, const AtomString& fontFamily, const FontPaletteValues::PaletteIndex& basePalette, Vector<FontPaletteValues::OverriddenColor>&& overrideColors);
    195195    StyleRuleFontPaletteValues(const StyleRuleFontPaletteValues&);
    196196

  • trunk/Source/WebCore/css/parser/CSSParserImpl.cpp

    r283120 r283159  
    3636#include "CSSDeferredParser.h"
    3737#include "CSSFontFamily.h"
    38 #include "CSSFontPaletteValuesOverrideColorValue.h"
     38#include "CSSFontPaletteValuesOverrideColorsValue.h"
    3939#include "CSSKeyframeRule.h"
    4040#include "CSSKeyframesRule.h"
    … …  
    690690    }
    691691
    692     Vector<FontPaletteValues::OverriddenColor> overrideColor;
    693     if (auto overrideColorValue = properties->getPropertyCSSValue(CSSPropertyOverrideColor)) {
    694         const auto& list = downcast<CSSValueList>(*overrideColorValue);
     692    Vector<FontPaletteValues::OverriddenColor> overrideColors;
     693    if (auto overrideColorsValue = properties->getPropertyCSSValue(CSSPropertyOverrideColors)) {
     694        const auto& list = downcast<CSSValueList>(*overrideColorsValue);
    695695        for (const auto& item : list) {
    696696            FontPaletteValues::PaletteColorIndex key(nullAtom());
    697             const auto& pair = downcast<CSSFontPaletteValuesOverrideColorValue>(item.get());
     697            const auto& pair = downcast<CSSFontPaletteValuesOverrideColorsValue>(item.get());
    698698            if (pair.key().isString())
    699699                key = pair.key().stringValue();
    … …  
    703703                continue;
    704704            Color color = pair.color().isRGBColor() ? pair.color().color() : StyleColor::colorFromKeyword(pair.color().valueID(), { });
    705             overrideColor.append(std::make_pair(key, color));
    706         }
    707     }
    708 
    709     return StyleRuleFontPaletteValues::create(name->stringValue(), fontFamily, basePalette, WTFMove(overrideColor));
     705            overrideColors.append(std::make_pair(key, color));
     706        }
     707    }
     708
     709    return StyleRuleFontPaletteValues::create(name->stringValue(), fontFamily, basePalette, WTFMove(overrideColors));
    710710}
    711711

  • trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp

    r282851 r283159  
    3939#include "CSSFontFaceSrcValue.h"
    4040#include "CSSFontFeatureValue.h"
    41 #include "CSSFontPaletteValuesOverrideColorValue.h"
     41#include "CSSFontPaletteValuesOverrideColorsValue.h"
    4242#if ENABLE(VARIATION_FONTS)
    4343#include "CSSFontVariationValue.h"
    … …  
    48544854}
    48554855
    4856 static RefPtr<CSSValueList> consumeOverrideColorDescriptor(CSSParserTokenRange& range, const CSSParserContext& context)
     4856static RefPtr<CSSValueList> consumeOverrideColorsDescriptor(CSSParserTokenRange& range, const CSSParserContext& context)
    48574857{
    48584858    RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
    … …  
    48704870            return nullptr;
    48714871
    4872         RefPtr<CSSValue> value = CSSFontPaletteValuesOverrideColorValue::create(key.releaseNonNull(), color.releaseNonNull());
     4872        RefPtr<CSSValue> value = CSSFontPaletteValuesOverrideColorsValue::create(key.releaseNonNull(), color.releaseNonNull());
    48734873        list->append(value.releaseNonNull());
    48744874    } while (consumeCommaIncludingWhitespace(range));
    … …  
    48904890        parsedValue = consumeBasePaletteDescriptor(m_range);
    48914891        break;
    4892     case CSSPropertyOverrideColor:
    4893         parsedValue = consumeOverrideColorDescriptor(m_range, m_context);
     4892    case CSSPropertyOverrideColors:
     4893        parsedValue = consumeOverrideColorsDescriptor(m_range, m_context);
    48944894        break;
    48954895    default:

  • trunk/Source/WebCore/platform/graphics/FontPaletteValues.h

    r283031 r283159  
    4343    FontPaletteValues() = default;
    4444
    45     FontPaletteValues(const PaletteIndex& basePalette, Vector<OverriddenColor>&& overrideColor)
     45    FontPaletteValues(const PaletteIndex& basePalette, Vector<OverriddenColor>&& overrideColors)
    4646        : m_basePalette(basePalette)
    47         , m_overrideColor(WTFMove(overrideColor))
     47        , m_overrideColors(WTFMove(overrideColors))
    4848    {
    4949    }
    … …  
    5454    }
    5555
    56     const Vector<OverriddenColor>& overrideColor() const
     56    const Vector<OverriddenColor>& overrideColors() const
    5757    {
    58         return m_overrideColor;
     58        return m_overrideColors;
    5959    }
    6060
    6161    bool operator==(const FontPaletteValues& other) const
    6262    {
    63         return m_basePalette == other.m_basePalette && m_overrideColor == other.m_overrideColor;
     63        return m_basePalette == other.m_basePalette && m_overrideColors == other.m_overrideColors;
    6464    }
    6565
    … …  
    7171private:
    7272    PaletteIndex m_basePalette;
    73     Vector<OverriddenColor> m_overrideColor;
     73    Vector<OverriddenColor> m_overrideColors;
    7474};
    7575
    … …  
    7777{
    7878    add(hasher, fontPaletteValues.basePalette());
    79     add(hasher, fontPaletteValues.overrideColor());
     79    add(hasher, fontPaletteValues.overrideColors());
    8080}
    8181

  • trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp

    r282922 r283159  
    471471            // This is unimplementable in Core Text.
    472472        });
    473         if (!fontPaletteValues.overrideColor().isEmpty()) {
     473        if (!fontPaletteValues.overrideColors().isEmpty()) {
    474474            auto overrideDictionary = adoptCF(CFDictionaryCreateMutable(kCFAllocatorDefault, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
    475             for (const auto& pair : fontPaletteValues.overrideColor()) {
     475            for (const auto& pair : fontPaletteValues.overrideColors()) {
    476476                const auto& paletteColorIndex = pair.first;
    477477                const auto& color = pair.second;
Note: See TracChangeset for help on using the changeset viewer.