Changeset 190564 in webkit


Ignore:
Timestamp:
Oct 5, 2015 10:27:16 AM (9 years ago)
Author:
mmaxfield@apple.com
Message:

Unprefix -webkit-font-feature-settings
​https://bugs.webkit.org/show_bug.cgi?id=149722

Reviewed by Sam Weinig.

Source/WebCore:

  • css/CSSComputedStyleDeclaration.cpp:

(WebCore::ComputedStyleExtractor::propertyValue):

  • css/CSSParser.cpp:

(WebCore::CSSParser::parseValue):
(WebCore::CSSParser::parseFontFeatureSettings):

  • css/CSSPropertyNames.in:
  • css/CSSValueKeywords.in:
  • css/StyleBuilderCustom.h:

(WebCore::StyleBuilderCustom::applyInitialFontFeatureSettings):
(WebCore::StyleBuilderCustom::applyInheritFontFeatureSettings):
(WebCore::StyleBuilderCustom::applyInitialWebkitFontFeatureSettings): Deleted.
(WebCore::StyleBuilderCustom::applyInheritWebkitFontFeatureSettings): Deleted.

Source/WebInspectorUI:

  • UserInterface/Models/CSSKeywordCompletions.js:

LayoutTests:

  • css3/font-feature-settings-parsing.html:
  • css3/font-feature-settings-preinstalled-fonts.html:
  • css3/font-feature-settings-rendering-2.html:
  • css3/font-feature-settings-rendering.html:
  • fast/css/inherited-properties-rare-text-expected.txt:
  • fast/css/inherited-properties-rare-text.html:
  • fast/text/shaping/shaping-script-order.html:
  • fast/text/shaping/shaping-selection-rect.html:
  • fonts/unicode-character-font-crash.html:
  • scrollbars/scrollbar-scrollbarparts-repaint-crash.html:
Location:
trunk
Files:
19 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r190553 r190564  
     12015-10-05  Myles C. Maxfield  <mmaxfield@apple.com>
     2
     3        Unprefix -webkit-font-feature-settings
     4        https://bugs.webkit.org/show_bug.cgi?id=149722
     5
     6        Reviewed by Sam Weinig.
     7
     8        * css3/font-feature-settings-parsing.html:
     9        * css3/font-feature-settings-preinstalled-fonts.html:
     10        * css3/font-feature-settings-rendering-2.html:
     11        * css3/font-feature-settings-rendering.html:
     12        * fast/css/inherited-properties-rare-text-expected.txt:
     13        * fast/css/inherited-properties-rare-text.html:
     14        * fast/text/shaping/shaping-script-order.html:
     15        * fast/text/shaping/shaping-selection-rect.html:
     16        * fonts/unicode-character-font-crash.html:
     17        * scrollbars/scrollbar-scrollbarparts-repaint-crash.html:
     18
    1192015-10-04  Alexey Proskuryakov  <ap@apple.com>
    220

  • trunk/LayoutTests/css3/font-feature-settings-parsing.html

    r188056 r190564  
    33<style>
    44#valid_normal {
    5     -webkit-font-feature-settings: normal;
     5    font-feature-settings: normal;
    66}
    77
    88#valid_value_1 {
    9     -webkit-font-feature-settings: "dlig" 1;
     9    font-feature-settings: "dlig" 1;
    1010}
    1111
    1212#valid_value_2 {
    13     -webkit-font-feature-settings: "swsh" 2;
     13    font-feature-settings: "swsh" 2;
    1414}
    1515
    1616#valid_value_on {
    17     -webkit-font-feature-settings: "smcp" on;
     17    font-feature-settings: "smcp" on;
    1818}
    1919
    2020#valid_value_off {
    21     -webkit-font-feature-settings: "liga" off;
     21    font-feature-settings: "liga" off;
    2222}
    2323
    2424#valid_value_omit {
    25     -webkit-font-feature-settings: "c2sc";
     25    font-feature-settings: "c2sc";
    2626}
    2727
    2828#valid_valuelist {
    29     -webkit-font-feature-settings: "tnum", 'hist';
     29    font-feature-settings: "tnum", 'hist';
    3030}
    3131
    3232#valid_singlequote {
    33     -webkit-font-feature-settings: 'PKRN';
     33    font-feature-settings: 'PKRN';
    3434}
    3535
    3636#valid_unusual_tag {
    37     -webkit-font-feature-settings: "!@#$";
     37    font-feature-settings: "!@#$";
    3838}
    3939
    4040#valid_tag_space {
    41     -webkit-font-feature-settings: "a bc";
     41    font-feature-settings: "a bc";
    4242}
    4343
    4444#valid_composite {
    45     -webkit-font-feature-settings: "dlig" 1, 'smcp' on, 'lig ' off;
     45    font-feature-settings: "dlig" 1, 'smcp' on, 'lig ' off;
    4646}
    4747
    4848#invalid_ident {
    49     -webkit-font-feature-settings: dlig;
     49    font-feature-settings: dlig;
    5050}
    5151
    5252#invalid_cases {
    53     -webkit-font-feature-settings: dlig, DLIG, DLig;
     53    font-feature-settings: dlig, DLIG, DLig;
    5454}
    5555
    5656#invalid_1 {
    57     -webkit-font-feature-settings: 1;
     57    font-feature-settings: 1;
    5858}
    5959
    6060#invalid_off {
    61     -webkit-font-feature-settings: off;
     61    font-feature-settings: off;
    6262}
    6363
    6464#invalid_normal_duplicate {
    65     -webkit-font-feature-settings: normal, normal;
     65    font-feature-settings: normal, normal;
    6666}
    6767
    6868#invalid_normal_list {
    69     -webkit-font-feature-settings: normal, aaaa;
     69    font-feature-settings: normal, aaaa;
    7070}
    7171
    7272#invalid_longer_ident {
    73     -webkit-font-feature-settings: aaaaa;
     73    font-feature-settings: aaaaa;
    7474}
    7575
    7676#invalid_longer_quote {
    77     -webkit-font-feature-settings: "aaaaa";
     77    font-feature-settings: "aaaaa";
    7878}
    7979
    8080#invalid_negative {
    81     -webkit-font-feature-settings: aaaa -1;
     81    font-feature-settings: aaaa -1;
    8282}
    8383
    8484#invalid_float {
    85     -webkit-font-feature-settings: aaaa 1.5;
     85    font-feature-settings: aaaa 1.5;
    8686}
    8787
    8888#invalid_missing_comma {
    89     -webkit-font-feature-settings: aaaa "bbbb";
     89    font-feature-settings: aaaa "bbbb";
    9090}
    9191
    9292#invalid_missing_comma_ident {
    93     -webkit-font-feature-settings: aaaa bbbb;
     93    font-feature-settings: aaaa bbbb;
    9494}
    9595
    9696#invalid_comma {
    97     -webkit-font-feature-settings: ,;
     97    font-feature-settings: ,;
    9898}
    9999
    100100#invalid_ending_comma {
    101     -webkit-font-feature-settings: aaaa,;
     101    font-feature-settings: aaaa,;
    102102}
    103103
    104104#invalid_beginning_comma {
    105     -webkit-font-feature-settings: ,aaaa;
     105    font-feature-settings: ,aaaa;
    106106}
    107107
    108108#invalid_on {
    109     -webkit-font-feature-settings: aaaa, on;
     109    font-feature-settings: aaaa, on;
    110110}
    111111
    112112#invalid_0 {
    113     -webkit-font-feature-settings: "aaaa" 1, "bbbb", 0;
     113    font-feature-settings: "aaaa" 1, "bbbb", 0;
    114114}
    115115
    116116#invalid_composite {
    117     -webkit-font-feature-settings: aaaaa on, dlig on, PKRN -1;
     117    font-feature-settings: aaaaa on, dlig on, PKRN -1;
    118118}
    119119</style>
    120120<style>
    121121@font-face {
    122     -webkit-font-feature-settings: 'liga';
     122    font-feature-settings: 'liga';
    123123}
    124124
    125125@font-face {
    126     -webkit-font-feature-settings: aaaaa;
     126    font-feature-settings: aaaaa;
    127127}
    128128</style>
    … …  
    160160<div id="invalid_0"></div>
    161161
    162 <div id="outer" style="-webkit-font-feature-settings: 'dlig';">
     162<div id="outer" style="font-feature-settings: 'dlig';">
    163163  <div id="inner"></div>
    164164</div>
    … …  
    180180function parseResultOf(id) {
    181181    var element = document.getElementById(id);
    182     return window.getComputedStyle(element)['-webkit-font-feature-settings'];
     182    return window.getComputedStyle(element)['font-feature-settings'];
    183183}
    184184
    … …  
    220220
    221221debug('- Tests @font-face.');
    222 var fontFaceRuleValid = document.styleSheets[1].cssRules[0].style['-webkit-font-feature-settings'];
    223 var fontFaceRuleInvalid = document.styleSheets[1].cssRules[1].style['-webkit-font-feature-settings'];
     222var fontFaceRuleValid = document.styleSheets[1].cssRules[0].style['font-feature-settings'];
     223var fontFaceRuleInvalid = document.styleSheets[1].cssRules[1].style['font-feature-settings'];
    224224shouldBeEqualToString('canonicalize(fontFaceRuleValid)', canonicalize("'liga' 1"));
    225225shouldBeEqualToString('fontFaceRuleInvalid', "");

  • trunk/LayoutTests/css3/font-feature-settings-preinstalled-fonts.html

    r188146 r190564  
    1515        element.textContent = "Lucky affluent actor asks to feast on giant 10.34\" cheese-filled quiche in fjord.";
    1616        element.style.fontFamily = font;
    17         element.style.webkitFontFeatureSettings = feature;
     17        element.style.fontFeatureSettings = feature;
    1818        document.body.appendChild(element);
    1919    });

  • trunk/LayoutTests/css3/font-feature-settings-rendering-2.html

    r190192 r190564  
    2121        element.textContent = c;
    2222        element.style.fontFamily = "FontFeaturesTest";
    23         element.style.webkitFontFeatureSettings = '"' + feature + '" ' + state;
     23        element.style.fontFeatureSettings = '"' + feature + '" ' + state;
    2424        insertionpoint.appendChild(element);
    2525    });

  • trunk/LayoutTests/css3/font-feature-settings-rendering.html

    r119990 r190564  
    1212.dligOn {
    1313    font-family: 'test';
    14     -webkit-font-feature-settings: 'dlig';
     14    font-feature-settings: 'dlig';
    1515}
    1616.dligOff {
    1717    font-family: 'test';
    18     -webkit-font-feature-settings: 'dlig' 0;
     18    font-feature-settings: 'dlig' 0;
    1919}
    2020.dligNone {

  • trunk/LayoutTests/fast/css/inherited-properties-rare-text-expected.txt

    r98716 r190564  
    1 test1 -webkit-font-feature-settings: 'dlig' 1
    2 test2 -webkit-font-feature-settings: normal
     1test1 font-feature-settings: 'dlig' 1
     2test2 font-feature-settings: normal
    33test1 -webkit-font-smoothing: antialiased
    44test2 -webkit-font-smoothing: auto

  • trunk/LayoutTests/fast/css/inherited-properties-rare-text.html

    r120683 r190564  
    44</script>
    55<style>
    6 .a { -webkit-font-feature-settings: 'dlig'; -webkit-font-smoothing: antialiased; -webkit-text-orientation: upright; }
     6.a { font-feature-settings: 'dlig'; -webkit-font-smoothing: antialiased; -webkit-text-orientation: upright; }
    77</style>
    88<div class=a>
    … …  
    1717}
    1818   
    19 test('test1', '-webkit-font-feature-settings');
    20 test('test2', '-webkit-font-feature-settings');
     19test('test1', 'font-feature-settings');
     20test('test2', 'font-feature-settings');
    2121test('test1', '-webkit-font-smoothing');
    2222test('test2', '-webkit-font-smoothing');

  • trunk/LayoutTests/fast/text/shaping/shaping-script-order.html

    r122562 r190564  
    1212The following two lines should be the same:
    1313<p class="lro">abc&#x05d2;&#x05d1;&#x05d0;&#x0661;&#x0662;&#x0663;</p>
    14 <p class="lro" style="-webkit-font-feature-settings: 'kern';">abc&#x05d2;&#x05d1;&#x05d0;&#x0661;&#x0662;&#x0663;</p>
     14<p class="lro" style="font-feature-settings: 'kern';">abc&#x05d2;&#x05d1;&#x05d0;&#x0661;&#x0662;&#x0663;</p>
    1515</body>
    1616</html>

  • trunk/LayoutTests/fast/text/shaping/shaping-selection-rect.html

    r147156 r190564  
    1010    }
    1111    #kerning {
    12         -webkit-font-feature-settings: 'kern';
     12        font-feature-settings: 'kern';
    1313    }
    1414    #smallcaps {
    15         -webkit-font-feature-settings: 'smcp';
     15        font-feature-settings: 'smcp';
    1616    }
    1717</style>

  • trunk/LayoutTests/fonts/unicode-character-font-crash.html

    r177909 r190564  
    33<head>
    44<style>
    5 .texhtml{-webkit-font-feature-settings:"lnum","tnum"}
     5.texhtml{font-feature-settings:"lnum","tnum"}
    66</style>
    77</head>

  • trunk/LayoutTests/scrollbars/scrollbar-scrollbarparts-repaint-crash.html

    r120417 r190564  
    44<style>
    55body::-webkit-scrollbar {
    6     -webkit-font-feature-settings: "a bc";
     6    font-feature-settings: "a bc";
    77}
    88</style>

  • trunk/Source/WebCore/ChangeLog

    r190562 r190564  
     12015-10-05  Myles C. Maxfield  <mmaxfield@apple.com>
     2
     3        Unprefix -webkit-font-feature-settings
     4        https://bugs.webkit.org/show_bug.cgi?id=149722
     5
     6        Reviewed by Sam Weinig.
     7
     8        * css/CSSComputedStyleDeclaration.cpp:
     9        (WebCore::ComputedStyleExtractor::propertyValue):
     10        * css/CSSParser.cpp:
     11        (WebCore::CSSParser::parseValue):
     12        (WebCore::CSSParser::parseFontFeatureSettings):
     13        * css/CSSPropertyNames.in:
     14        * css/CSSValueKeywords.in:
     15        * css/StyleBuilderCustom.h:
     16        (WebCore::StyleBuilderCustom::applyInitialFontFeatureSettings):
     17        (WebCore::StyleBuilderCustom::applyInheritFontFeatureSettings):
     18        (WebCore::StyleBuilderCustom::applyInitialWebkitFontFeatureSettings): Deleted.
     19        (WebCore::StyleBuilderCustom::applyInheritWebkitFontFeatureSettings): Deleted.
     20
    1212015-10-05  Zan Dobersek  <zdobersek@igalia.com>
    222

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

    r190231 r190564  
    25312531        case CSSPropertyFontSynthesis:
    25322532            return fontSynthesisFromStyle(*style);
    2533         case CSSPropertyWebkitFontFeatureSettings: {
     2533        case CSSPropertyFontFeatureSettings: {
    25342534            const FontFeatureSettings& featureSettings = style->fontDescription().featureSettings();
    25352535            if (!featureSettings.size())

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

    r190231 r190564  
    30563056            return parseLineBoxContain(important);
    30573057        break;
    3058     case CSSPropertyWebkitFontFeatureSettings:
     3058    case CSSPropertyFontFeatureSettings:
    30593059        if (id == CSSValueNormal)
    30603060            validPrimitive = true;
    … …  
    1048710487        RefPtr<CSSPrimitiveValue> normalValue = CSSValuePool::singleton().createIdentifierValue(CSSValueNormal);
    1048810488        m_valueList->next();
    10489         addProperty(CSSPropertyWebkitFontFeatureSettings, normalValue.release(), important);
     10489        addProperty(CSSPropertyFontFeatureSettings, normalValue.release(), important);
    1049010490        return true;
    1049110491    }
    … …  
    1050210502    }
    1050310503    if (settings->length()) {
    10504         addProperty(CSSPropertyWebkitFontFeatureSettings, settings.release(), important);
     10504        addProperty(CSSPropertyFontFeatureSettings, settings.release(), important);
    1050510505        return true;
    1050610506    }

  • trunk/Source/WebCore/css/CSSPropertyNames.in

    r190192 r190564  
    106106font-weight [Inherited, Custom=All]
    107107text-rendering [Inherited, FontProperty, NameForMethods=TextRenderingMode]
    108 -webkit-font-feature-settings [Inherited, FontProperty, Custom=Initial|Inherit, Converter=FontFeatureSettings, NameForMethods=FeatureSettings]
     108font-feature-settings [Inherited, FontProperty, Custom=Initial|Inherit, Converter=FontFeatureSettings, NameForMethods=FeatureSettings]
    109109-webkit-font-kerning [Inherited, FontProperty, NameForMethods=Kerning]
    110110-webkit-font-smoothing [Inherited, FontProperty]

  • trunk/Source/WebCore/css/CSSValueKeywords.in

    r190192 r190564  
    10411041replaced
    10421042
    1043 // -webkit-font-feature-settings
     1043// font-feature-settings
    10441044on
    10451045off

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

    r190192 r190564  
    109109    static void applyInitialWebkitMaskImage(StyleResolver&) { }
    110110    static void applyInheritWebkitMaskImage(StyleResolver&) { }
    111     static void applyInitialWebkitFontFeatureSettings(StyleResolver&) { }
    112     static void applyInheritWebkitFontFeatureSettings(StyleResolver&) { }
     111    static void applyInitialFontFeatureSettings(StyleResolver&) { }
     112    static void applyInheritFontFeatureSettings(StyleResolver&) { }
    113113
    114114    // Custom handling of inherit + value setting only.

  • trunk/Source/WebInspectorUI/ChangeLog

    r190551 r190564  
     12015-10-05  Myles C. Maxfield  <mmaxfield@apple.com>
     2
     3        Unprefix -webkit-font-feature-settings
     4        https://bugs.webkit.org/show_bug.cgi?id=149722
     5
     6        Reviewed by Sam Weinig.
     7
     8        * UserInterface/Models/CSSKeywordCompletions.js:
     9
    1102015-10-04  Nikita Vasilyev  <nvasilyev@apple.com>
    211

  • trunk/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js

    r188993 r190564  
    102102    "text-shadow", "text-transform", "visibility", "voice-family", "volume", "white-space", "widows", "word-break",
    103103    "word-spacing", "word-wrap", "writing-mode", "-webkit-aspect-ratio", "-webkit-border-horizontal-spacing",
    104     "-webkit-border-vertical-spacing", "-webkit-box-direction", "-webkit-color-correction", "-webkit-font-feature-settings",
     104    "-webkit-border-vertical-spacing", "-webkit-box-direction", "-webkit-color-correction", "font-feature-settings",
    105105    "-webkit-font-kerning", "-webkit-font-smoothing", "-webkit-font-variant-ligatures",
    106106    "-webkit-hyphenate-character", "-webkit-hyphenate-limit-after", "-webkit-hyphenate-limit-before",
    … …  
    959959        "block", "inline", "font", "glyphs", "replaced", "inline-box", "none", "initial"
    960960    ],
    961     "-webkit-font-feature-settings": [
     961    "font-feature-settings": [
    962962        "normal"
    963963    ],
Note: See TracChangeset for help on using the changeset viewer.