Skip to content
Permalink
Browse files
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:

Canonical link: https://commits.webkit.org/167912@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@190564 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
litherum committed Oct 5, 2015
1 parent 5948128 commit fbca9eaff7eb8854f2d23c2adc3c619e921e4c96
@@ -1,3 +1,21 @@
2015-10-05 Myles C. Maxfield <mmaxfield@apple.com>

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

Reviewed by Sam Weinig.

* 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:

2015-10-04 Alexey Proskuryakov <ap@apple.com>

Mark tests as flaky for
@@ -2,128 +2,128 @@
<head>
<style>
#valid_normal {
-webkit-font-feature-settings: normal;
font-feature-settings: normal;
}

#valid_value_1 {
-webkit-font-feature-settings: "dlig" 1;
font-feature-settings: "dlig" 1;
}

#valid_value_2 {
-webkit-font-feature-settings: "swsh" 2;
font-feature-settings: "swsh" 2;
}

#valid_value_on {
-webkit-font-feature-settings: "smcp" on;
font-feature-settings: "smcp" on;
}

#valid_value_off {
-webkit-font-feature-settings: "liga" off;
font-feature-settings: "liga" off;
}

#valid_value_omit {
-webkit-font-feature-settings: "c2sc";
font-feature-settings: "c2sc";
}

#valid_valuelist {
-webkit-font-feature-settings: "tnum", 'hist';
font-feature-settings: "tnum", 'hist';
}

#valid_singlequote {
-webkit-font-feature-settings: 'PKRN';
font-feature-settings: 'PKRN';
}

#valid_unusual_tag {
-webkit-font-feature-settings: "!@#$";
font-feature-settings: "!@#$";
}

#valid_tag_space {
-webkit-font-feature-settings: "a bc";
font-feature-settings: "a bc";
}

#valid_composite {
-webkit-font-feature-settings: "dlig" 1, 'smcp' on, 'lig ' off;
font-feature-settings: "dlig" 1, 'smcp' on, 'lig ' off;
}

#invalid_ident {
-webkit-font-feature-settings: dlig;
font-feature-settings: dlig;
}

#invalid_cases {
-webkit-font-feature-settings: dlig, DLIG, DLig;
font-feature-settings: dlig, DLIG, DLig;
}

#invalid_1 {
-webkit-font-feature-settings: 1;
font-feature-settings: 1;
}

#invalid_off {
-webkit-font-feature-settings: off;
font-feature-settings: off;
}

#invalid_normal_duplicate {
-webkit-font-feature-settings: normal, normal;
font-feature-settings: normal, normal;
}

#invalid_normal_list {
-webkit-font-feature-settings: normal, aaaa;
font-feature-settings: normal, aaaa;
}

#invalid_longer_ident {
-webkit-font-feature-settings: aaaaa;
font-feature-settings: aaaaa;
}

#invalid_longer_quote {
-webkit-font-feature-settings: "aaaaa";
font-feature-settings: "aaaaa";
}

#invalid_negative {
-webkit-font-feature-settings: aaaa -1;
font-feature-settings: aaaa -1;
}

#invalid_float {
-webkit-font-feature-settings: aaaa 1.5;
font-feature-settings: aaaa 1.5;
}

#invalid_missing_comma {
-webkit-font-feature-settings: aaaa "bbbb";
font-feature-settings: aaaa "bbbb";
}

#invalid_missing_comma_ident {
-webkit-font-feature-settings: aaaa bbbb;
font-feature-settings: aaaa bbbb;
}

#invalid_comma {
-webkit-font-feature-settings: ,;
font-feature-settings: ,;
}

#invalid_ending_comma {
-webkit-font-feature-settings: aaaa,;
font-feature-settings: aaaa,;
}

#invalid_beginning_comma {
-webkit-font-feature-settings: ,aaaa;
font-feature-settings: ,aaaa;
}

#invalid_on {
-webkit-font-feature-settings: aaaa, on;
font-feature-settings: aaaa, on;
}

#invalid_0 {
-webkit-font-feature-settings: "aaaa" 1, "bbbb", 0;
font-feature-settings: "aaaa" 1, "bbbb", 0;
}

#invalid_composite {
-webkit-font-feature-settings: aaaaa on, dlig on, PKRN -1;
font-feature-settings: aaaaa on, dlig on, PKRN -1;
}
</style>
<style>
@font-face {
-webkit-font-feature-settings: 'liga';
font-feature-settings: 'liga';
}

@font-face {
-webkit-font-feature-settings: aaaaa;
font-feature-settings: aaaaa;
}
</style>
<script src="../resources/js-test-pre.js"></script>
@@ -159,7 +159,7 @@
<div id="invalid_on"></div>
<div id="invalid_0"></div>

<div id="outer" style="-webkit-font-feature-settings: 'dlig';">
<div id="outer" style="font-feature-settings: 'dlig';">
<div id="inner"></div>
</div>

@@ -179,7 +179,7 @@

function parseResultOf(id) {
var element = document.getElementById(id);
return window.getComputedStyle(element)['-webkit-font-feature-settings'];
return window.getComputedStyle(element)['font-feature-settings'];
}

debug('- Tests valid inputs.');
@@ -219,8 +219,8 @@
shouldBeEqualToString('canonicalize(parseResultOf("inner"))', canonicalize("'dlig' 1"));

debug('- Tests @font-face.');
var fontFaceRuleValid = document.styleSheets[1].cssRules[0].style['-webkit-font-feature-settings'];
var fontFaceRuleInvalid = document.styleSheets[1].cssRules[1].style['-webkit-font-feature-settings'];
var fontFaceRuleValid = document.styleSheets[1].cssRules[0].style['font-feature-settings'];
var fontFaceRuleInvalid = document.styleSheets[1].cssRules[1].style['font-feature-settings'];
shouldBeEqualToString('canonicalize(fontFaceRuleValid)', canonicalize("'liga' 1"));
shouldBeEqualToString('fontFaceRuleInvalid', "");

@@ -14,7 +14,7 @@
var element = document.createElement("div");
element.textContent = "Lucky affluent actor asks to feast on giant 10.34\" cheese-filled quiche in fjord.";
element.style.fontFamily = font;
element.style.webkitFontFeatureSettings = feature;
element.style.fontFeatureSettings = feature;
document.body.appendChild(element);
});
});
@@ -20,7 +20,7 @@
var element = document.createElement("span");
element.textContent = c;
element.style.fontFamily = "FontFeaturesTest";
element.style.webkitFontFeatureSettings = '"' + feature + '" ' + state;
element.style.fontFeatureSettings = '"' + feature + '" ' + state;
insertionpoint.appendChild(element);
});
insertionpoint.appendChild(document.createTextNode(" "));
@@ -11,11 +11,11 @@
}
.dligOn {
font-family: 'test';
-webkit-font-feature-settings: 'dlig';
font-feature-settings: 'dlig';
}
.dligOff {
font-family: 'test';
-webkit-font-feature-settings: 'dlig' 0;
font-feature-settings: 'dlig' 0;
}
.dligNone {
font-family: 'test';
@@ -1,5 +1,5 @@
test1 -webkit-font-feature-settings: 'dlig' 1
test2 -webkit-font-feature-settings: normal
test1 font-feature-settings: 'dlig' 1
test2 font-feature-settings: normal
test1 -webkit-font-smoothing: antialiased
test2 -webkit-font-smoothing: auto
test1 -webkit-text-orientation: upright
@@ -3,7 +3,7 @@
testRunner.dumpAsText();
</script>
<style>
.a { -webkit-font-feature-settings: 'dlig'; -webkit-font-smoothing: antialiased; -webkit-text-orientation: upright; }
.a { font-feature-settings: 'dlig'; -webkit-font-smoothing: antialiased; -webkit-text-orientation: upright; }
</style>
<div class=a>
<div id=test1></div>
@@ -16,10 +16,10 @@
document.write(e + " " + p + ": " + cssValue.cssText + "<br>");
}

test('test1', '-webkit-font-feature-settings');
test('test2', '-webkit-font-feature-settings');
test('test1', 'font-feature-settings');
test('test2', 'font-feature-settings');
test('test1', '-webkit-font-smoothing');
test('test2', '-webkit-font-smoothing');
test('test1', '-webkit-text-orientation');
test('test2', '-webkit-text-orientation');
</script>
</script>
@@ -11,6 +11,6 @@
<body>
The following two lines should be the same:
<p class="lro">abc&#x05d2;&#x05d1;&#x05d0;&#x0661;&#x0662;&#x0663;</p>
<p class="lro" style="-webkit-font-feature-settings: 'kern';">abc&#x05d2;&#x05d1;&#x05d0;&#x0661;&#x0662;&#x0663;</p>
<p class="lro" style="font-feature-settings: 'kern';">abc&#x05d2;&#x05d1;&#x05d0;&#x0661;&#x0662;&#x0663;</p>
</body>
</html>
@@ -9,10 +9,10 @@
unicode-bidi: bidi-override;
}
#kerning {
-webkit-font-feature-settings: 'kern';
font-feature-settings: 'kern';
}
#smallcaps {
-webkit-font-feature-settings: 'smcp';
font-feature-settings: 'smcp';
}
</style>
<script>
@@ -2,7 +2,7 @@

<head>
<style>
.texhtml{-webkit-font-feature-settings:"lnum","tnum"}
.texhtml{font-feature-settings:"lnum","tnum"}
</style>
</head>

@@ -3,7 +3,7 @@
<head>
<style>
body::-webkit-scrollbar {
-webkit-font-feature-settings: "a bc";
font-feature-settings: "a bc";
}
</style>
<script>
@@ -1,3 +1,23 @@
2015-10-05 Myles C. Maxfield <mmaxfield@apple.com>

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

Reviewed by Sam Weinig.

* 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.

2015-10-05 Zan Dobersek <zdobersek@igalia.com>

[GStreamer] Replace uses of std::bind() with lambdas
@@ -2530,7 +2530,7 @@ RefPtr<CSSValue> ComputedStyleExtractor::propertyValue(CSSPropertyID propertyID,
return fontWeightFromStyle(style.get());
case CSSPropertyFontSynthesis:
return fontSynthesisFromStyle(*style);
case CSSPropertyWebkitFontFeatureSettings: {
case CSSPropertyFontFeatureSettings: {
const FontFeatureSettings& featureSettings = style->fontDescription().featureSettings();
if (!featureSettings.size())
return cssValuePool.createIdentifierValue(CSSValueNormal);
@@ -3055,7 +3055,7 @@ bool CSSParser::parseValue(CSSPropertyID propId, bool important)
else
return parseLineBoxContain(important);
break;
case CSSPropertyWebkitFontFeatureSettings:
case CSSPropertyFontFeatureSettings:
if (id == CSSValueNormal)
validPrimitive = true;
else
@@ -10486,7 +10486,7 @@ bool CSSParser::parseFontFeatureSettings(bool important)
if (m_valueList->size() == 1 && m_valueList->current()->id == CSSValueNormal) {
RefPtr<CSSPrimitiveValue> normalValue = CSSValuePool::singleton().createIdentifierValue(CSSValueNormal);
m_valueList->next();
addProperty(CSSPropertyWebkitFontFeatureSettings, normalValue.release(), important);
addProperty(CSSPropertyFontFeatureSettings, normalValue.release(), important);
return true;
}

@@ -10501,7 +10501,7 @@ bool CSSParser::parseFontFeatureSettings(bool important)
return false;
}
if (settings->length()) {
addProperty(CSSPropertyWebkitFontFeatureSettings, settings.release(), important);
addProperty(CSSPropertyFontFeatureSettings, settings.release(), important);
return true;
}
return false;
@@ -105,7 +105,7 @@ font-style [Inherited, FontProperty, NameForMethods=Italic]
font-variant [Inherited, FontProperty, NameForMethods=SmallCaps]
font-weight [Inherited, Custom=All]
text-rendering [Inherited, FontProperty, NameForMethods=TextRenderingMode]
-webkit-font-feature-settings [Inherited, FontProperty, Custom=Initial|Inherit, Converter=FontFeatureSettings, NameForMethods=FeatureSettings]
font-feature-settings [Inherited, FontProperty, Custom=Initial|Inherit, Converter=FontFeatureSettings, NameForMethods=FeatureSettings]
-webkit-font-kerning [Inherited, FontProperty, NameForMethods=Kerning]
-webkit-font-smoothing [Inherited, FontProperty]
font-variant-ligatures [Inherited, FontProperty, NameForMethods=VariantLigatures, Custom=All]
@@ -1040,7 +1040,7 @@ inline-box
initial-letter
replaced

// -webkit-font-feature-settings
// font-feature-settings
on
off

0 comments on commit fbca9ea

Please sign in to comment.