Diff
Modified: trunk/LayoutTests/ChangeLog (190563 => 190564)
--- trunk/LayoutTests/ChangeLog 2015-10-05 17:22:20 UTC (rev 190563)
+++ trunk/LayoutTests/ChangeLog 2015-10-05 17:27:16 UTC (rev 190564)
@@ -1,3 +1,21 @@
+2015-10-05 Myles C. Maxfield <mmaxfi...@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 <a...@apple.com>
Mark tests as flaky for
Modified: trunk/LayoutTests/css3/font-feature-settings-parsing.html (190563 => 190564)
--- trunk/LayoutTests/css3/font-feature-settings-parsing.html 2015-10-05 17:22:20 UTC (rev 190563)
+++ trunk/LayoutTests/css3/font-feature-settings-parsing.html 2015-10-05 17:27:16 UTC (rev 190564)
@@ -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=""
@@ -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', "");
Modified: trunk/LayoutTests/css3/font-feature-settings-preinstalled-fonts.html (190563 => 190564)
--- trunk/LayoutTests/css3/font-feature-settings-preinstalled-fonts.html 2015-10-05 17:22:20 UTC (rev 190563)
+++ trunk/LayoutTests/css3/font-feature-settings-preinstalled-fonts.html 2015-10-05 17:27:16 UTC (rev 190564)
@@ -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);
});
});
Modified: trunk/LayoutTests/css3/font-feature-settings-rendering-2.html (190563 => 190564)
--- trunk/LayoutTests/css3/font-feature-settings-rendering-2.html 2015-10-05 17:22:20 UTC (rev 190563)
+++ trunk/LayoutTests/css3/font-feature-settings-rendering-2.html 2015-10-05 17:27:16 UTC (rev 190564)
@@ -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(" "));
Modified: trunk/LayoutTests/css3/font-feature-settings-rendering.html (190563 => 190564)
--- trunk/LayoutTests/css3/font-feature-settings-rendering.html 2015-10-05 17:22:20 UTC (rev 190563)
+++ trunk/LayoutTests/css3/font-feature-settings-rendering.html 2015-10-05 17:27:16 UTC (rev 190564)
@@ -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';
Modified: trunk/LayoutTests/fast/css/inherited-properties-rare-text-expected.txt (190563 => 190564)
--- trunk/LayoutTests/fast/css/inherited-properties-rare-text-expected.txt 2015-10-05 17:22:20 UTC (rev 190563)
+++ trunk/LayoutTests/fast/css/inherited-properties-rare-text-expected.txt 2015-10-05 17:27:16 UTC (rev 190564)
@@ -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
Modified: trunk/LayoutTests/fast/css/inherited-properties-rare-text.html (190563 => 190564)
--- trunk/LayoutTests/fast/css/inherited-properties-rare-text.html 2015-10-05 17:22:20 UTC (rev 190563)
+++ trunk/LayoutTests/fast/css/inherited-properties-rare-text.html 2015-10-05 17:27:16 UTC (rev 190564)
@@ -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>
\ No newline at end of file
+</script>
Modified: trunk/LayoutTests/fast/text/shaping/shaping-script-order.html (190563 => 190564)
--- trunk/LayoutTests/fast/text/shaping/shaping-script-order.html 2015-10-05 17:22:20 UTC (rev 190563)
+++ trunk/LayoutTests/fast/text/shaping/shaping-script-order.html 2015-10-05 17:27:16 UTC (rev 190564)
@@ -11,6 +11,6 @@
<body>
The following two lines should be the same:
<p class="lro">abcגבא١٢٣</p>
-<p class="lro" style="-webkit-font-feature-settings: 'kern';">abcגבא١٢٣</p>
+<p class="lro" style="font-feature-settings: 'kern';">abcגבא١٢٣</p>
</body>
</html>
Modified: trunk/LayoutTests/fast/text/shaping/shaping-selection-rect.html (190563 => 190564)
--- trunk/LayoutTests/fast/text/shaping/shaping-selection-rect.html 2015-10-05 17:22:20 UTC (rev 190563)
+++ trunk/LayoutTests/fast/text/shaping/shaping-selection-rect.html 2015-10-05 17:27:16 UTC (rev 190564)
@@ -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>
Modified: trunk/LayoutTests/fonts/unicode-character-font-crash.html (190563 => 190564)
--- trunk/LayoutTests/fonts/unicode-character-font-crash.html 2015-10-05 17:22:20 UTC (rev 190563)
+++ trunk/LayoutTests/fonts/unicode-character-font-crash.html 2015-10-05 17:27:16 UTC (rev 190564)
@@ -2,7 +2,7 @@
<head>
<style>
-.texhtml{-webkit-font-feature-settings:"lnum","tnum"}
+.texhtml{font-feature-settings:"lnum","tnum"}
</style>
</head>
Modified: trunk/LayoutTests/scrollbars/scrollbar-scrollbarparts-repaint-crash.html (190563 => 190564)
--- trunk/LayoutTests/scrollbars/scrollbar-scrollbarparts-repaint-crash.html 2015-10-05 17:22:20 UTC (rev 190563)
+++ trunk/LayoutTests/scrollbars/scrollbar-scrollbarparts-repaint-crash.html 2015-10-05 17:27:16 UTC (rev 190564)
@@ -3,7 +3,7 @@
<head>
<style>
body::-webkit-scrollbar {
- -webkit-font-feature-settings: "a bc";
+ font-feature-settings: "a bc";
}
</style>
<script>
Modified: trunk/Source/WebCore/ChangeLog (190563 => 190564)
--- trunk/Source/WebCore/ChangeLog 2015-10-05 17:22:20 UTC (rev 190563)
+++ trunk/Source/WebCore/ChangeLog 2015-10-05 17:27:16 UTC (rev 190564)
@@ -1,3 +1,23 @@
+2015-10-05 Myles C. Maxfield <mmaxfi...@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 <zdober...@igalia.com>
[GStreamer] Replace uses of std::bind() with lambdas
Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (190563 => 190564)
--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2015-10-05 17:22:20 UTC (rev 190563)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2015-10-05 17:27:16 UTC (rev 190564)
@@ -2530,7 +2530,7 @@
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);
Modified: trunk/Source/WebCore/css/CSSParser.cpp (190563 => 190564)
--- trunk/Source/WebCore/css/CSSParser.cpp 2015-10-05 17:22:20 UTC (rev 190563)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2015-10-05 17:27:16 UTC (rev 190564)
@@ -3055,7 +3055,7 @@
else
return parseLineBoxContain(important);
break;
- case CSSPropertyWebkitFontFeatureSettings:
+ case CSSPropertyFontFeatureSettings:
if (id == CSSValueNormal)
validPrimitive = true;
else
@@ -10486,7 +10486,7 @@
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 @@
return false;
}
if (settings->length()) {
- addProperty(CSSPropertyWebkitFontFeatureSettings, settings.release(), important);
+ addProperty(CSSPropertyFontFeatureSettings, settings.release(), important);
return true;
}
return false;
Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (190563 => 190564)
--- trunk/Source/WebCore/css/CSSPropertyNames.in 2015-10-05 17:22:20 UTC (rev 190563)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in 2015-10-05 17:27:16 UTC (rev 190564)
@@ -105,7 +105,7 @@
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]
Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (190563 => 190564)
--- trunk/Source/WebCore/css/CSSValueKeywords.in 2015-10-05 17:22:20 UTC (rev 190563)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in 2015-10-05 17:27:16 UTC (rev 190564)
@@ -1040,7 +1040,7 @@
initial-letter
replaced
-// -webkit-font-feature-settings
+// font-feature-settings
on
off
Modified: trunk/Source/WebCore/css/StyleBuilderCustom.h (190563 => 190564)
--- trunk/Source/WebCore/css/StyleBuilderCustom.h 2015-10-05 17:22:20 UTC (rev 190563)
+++ trunk/Source/WebCore/css/StyleBuilderCustom.h 2015-10-05 17:27:16 UTC (rev 190564)
@@ -108,8 +108,8 @@
// Custom handling of initial + inherit value setting only.
static void applyInitialWebkitMaskImage(StyleResolver&) { }
static void applyInheritWebkitMaskImage(StyleResolver&) { }
- static void applyInitialWebkitFontFeatureSettings(StyleResolver&) { }
- static void applyInheritWebkitFontFeatureSettings(StyleResolver&) { }
+ static void applyInitialFontFeatureSettings(StyleResolver&) { }
+ static void applyInheritFontFeatureSettings(StyleResolver&) { }
// Custom handling of inherit + value setting only.
static void applyInheritDisplay(StyleResolver&);
Modified: trunk/Source/WebInspectorUI/ChangeLog (190563 => 190564)
--- trunk/Source/WebInspectorUI/ChangeLog 2015-10-05 17:22:20 UTC (rev 190563)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-10-05 17:27:16 UTC (rev 190564)
@@ -1,3 +1,12 @@
+2015-10-05 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ Unprefix -webkit-font-feature-settings
+ https://bugs.webkit.org/show_bug.cgi?id=149722
+
+ Reviewed by Sam Weinig.
+
+ * UserInterface/Models/CSSKeywordCompletions.js:
+
2015-10-04 Nikita Vasilyev <nvasil...@apple.com>
Web Inspector: Wrong column numbers in error object views
Modified: trunk/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js (190563 => 190564)
--- trunk/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js 2015-10-05 17:22:20 UTC (rev 190563)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js 2015-10-05 17:27:16 UTC (rev 190564)
@@ -101,7 +101,7 @@
"stroke-width", "tab-size", "text-align", "text-anchor", "text-decoration", "text-indent", "text-rendering",
"text-shadow", "text-transform", "visibility", "voice-family", "volume", "white-space", "widows", "word-break",
"word-spacing", "word-wrap", "writing-mode", "-webkit-aspect-ratio", "-webkit-border-horizontal-spacing",
- "-webkit-border-vertical-spacing", "-webkit-box-direction", "-webkit-color-correction", "-webkit-font-feature-settings",
+ "-webkit-border-vertical-spacing", "-webkit-box-direction", "-webkit-color-correction", "font-feature-settings",
"-webkit-font-kerning", "-webkit-font-smoothing", "-webkit-font-variant-ligatures",
"-webkit-hyphenate-character", "-webkit-hyphenate-limit-after", "-webkit-hyphenate-limit-before",
"-webkit-hyphenate-limit-lines", "-webkit-hyphens", "-webkit-line-align", "-webkit-line-box-contain",
@@ -958,7 +958,7 @@
"-webkit-line-box-contain": [
"block", "inline", "font", "glyphs", "replaced", "inline-box", "none", "initial"
],
- "-webkit-font-feature-settings": [
+ "font-feature-settings": [
"normal"
],
"-webkit-font-variant-ligatures": [
