Title: [193579] branches/safari-601-branch
- Revision
- 193579
- Author
- matthew_han...@apple.com
- Date
- 2015-12-06 02:37:21 -0800 (Sun, 06 Dec 2015)
Log Message
Merge r190999. rdar://problem/23769821
Modified Paths
Diff
Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193578 => 193579)
--- branches/safari-601-branch/LayoutTests/ChangeLog 2015-12-06 10:37:16 UTC (rev 193578)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2015-12-06 10:37:21 UTC (rev 193579)
@@ -1,5 +1,21 @@
2015-12-06 Matthew Hanson <matthew_han...@apple.com>
+ Merge r190999. rdar://problem/23769821
+
+ 2015-10-13 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ Unprefix font-kerning
+ https://bugs.webkit.org/show_bug.cgi?id=150080
+
+ Reviewed by Sam Weinig.
+
+ This is the last property in CSS3 Fonts which is prefixed.
+
+ * fast/text/font-kerning-expected.html:
+ * fast/text/font-kerning.html:
+
+2015-12-06 Matthew Hanson <matthew_han...@apple.com>
+
Merge r190848. rdar://problem/23769770
2015-10-11 Myles C. Maxfield <mmaxfi...@apple.com>
Modified: branches/safari-601-branch/LayoutTests/fast/text/font-kerning-expected.html (193578 => 193579)
--- branches/safari-601-branch/LayoutTests/fast/text/font-kerning-expected.html 2015-12-06 10:37:16 UTC (rev 193578)
+++ branches/safari-601-branch/LayoutTests/fast/text/font-kerning-expected.html 2015-12-06 10:37:21 UTC (rev 193579)
@@ -9,4 +9,12 @@
<div class="notkerned">AVAVAVAV</div>
<div class="kerned">AVAVAVAV</div>
<div class="kerned">AVAVAVAV</div>
+ <div style="position: absolute; left: 300px; top: 8px;">
+ <div class="notkerned">AVAVAVAV</div>
+ <div class="kerned">AVAVAVAV</div>
+ <div class="kerned">AVAVAVAV</div>
+ <div class="notkerned">AVAVAVAV</div>
+ <div class="kerned">AVAVAVAV</div>
+ <div class="kerned">AVAVAVAV</div>
+ </div>
</body>
Modified: branches/safari-601-branch/LayoutTests/fast/text/font-kerning.html (193578 => 193579)
--- branches/safari-601-branch/LayoutTests/fast/text/font-kerning.html 2015-12-06 10:37:16 UTC (rev 193578)
+++ branches/safari-601-branch/LayoutTests/fast/text/font-kerning.html 2015-12-06 10:37:21 UTC (rev 193579)
@@ -1,7 +1,10 @@
<style>
- .kerning-none { -webkit-font-kerning: none; }
- .kerning-auto { -webkit-font-kerning: auto; }
- .kerning-normal { -webkit-font-kerning: normal; }
+ .kerning-none { font-kerning: none; }
+ .kerning-auto { font-kerning: auto; }
+ .kerning-normal { font-kerning: normal; }
+ .webkit-kerning-none { -webkit-font-kerning: none; }
+ .webkit-kerning-auto { -webkit-font-kerning: auto; }
+ .webkit-kerning-normal { -webkit-font-kerning: normal; }
</style>
<body style="font-size: 36px;">
<div>
@@ -14,4 +17,16 @@
<div class="kerning-auto">AVAVAVAV</div>
<div class="kerning-normal">AVAVAVAV</div>
</div>
+ <div style="position: absolute; left: 300px; top: 8px;">
+ <div>
+ <div class="webkit-kerning-none">AVAVAVAV</div>
+ <div class="webkit-kerning-auto">AVAVAVAV</div>
+ <div class="webkit-kerning-normal">AVAVAVAV</div>
+ </div>
+ <div style="text-rendering: optimizelegibility">
+ <div class="webkit-kerning-none">AVAVAVAV</div>
+ <div class="webkit-kerning-auto">AVAVAVAV</div>
+ <div class="webkit-kerning-normal">AVAVAVAV</div>
+ </div>
+ </div>
</body>
Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193578 => 193579)
--- branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-06 10:37:16 UTC (rev 193578)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-06 10:37:21 UTC (rev 193579)
@@ -1,5 +1,22 @@
2015-12-06 Matthew Hanson <matthew_han...@apple.com>
+ Merge r190999. rdar://problem/23769821
+
+ 2015-10-13 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ Unprefix font-kerning
+ https://bugs.webkit.org/show_bug.cgi?id=150080
+
+ Reviewed by Sam Weinig.
+
+ This is the last property in CSS3 Fonts which is prefixed.
+
+ Test: fast/text/font-kerning.html
+
+ * css/CSSPropertyNames.in:
+
+2015-12-06 Matthew Hanson <matthew_han...@apple.com>
+
Merge r190402. rdar://problem/23769741
2015-10-01 Csaba Osztrogonác <o...@webkit.org>
Modified: branches/safari-601-branch/Source/WebCore/css/CSSPropertyNames.in (193578 => 193579)
--- branches/safari-601-branch/Source/WebCore/css/CSSPropertyNames.in 2015-12-06 10:37:16 UTC (rev 193578)
+++ branches/safari-601-branch/Source/WebCore/css/CSSPropertyNames.in 2015-12-06 10:37:21 UTC (rev 193579)
@@ -107,6 +107,7 @@
text-rendering [Inherited, FontProperty, NameForMethods=TextRenderingMode]
font-feature-settings [Inherited, FontProperty, Custom=Initial|Inherit, Converter=FontFeatureSettings, NameForMethods=FeatureSettings]
-webkit-font-kerning [Inherited, FontProperty, NameForMethods=Kerning]
+font-kerning = -webkit-font-kerning
-webkit-font-smoothing [Inherited, FontProperty]
font-variant-ligatures [Inherited, FontProperty, NameForMethods=VariantLigatures, Custom=All]
font-variant-position [Inherited, FontProperty, NameForMethods=VariantPosition]
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
