Diff
Modified: trunk/LayoutTests/ChangeLog (183661 => 183662)
--- trunk/LayoutTests/ChangeLog 2015-05-01 01:38:27 UTC (rev 183661)
+++ trunk/LayoutTests/ChangeLog 2015-05-01 01:56:32 UTC (rev 183662)
@@ -1,3 +1,29 @@
+2015-04-30 Dean Jackson <[email protected]>
+
+ Expose -apple-system as a font family
+ https://bugs.webkit.org/show_bug.cgi?id=144484
+ <rdar://problem/20767330>
+
+ Reviewed by Tim Horton.
+
+ Change a bunch of tests to use "-apple-system" instead
+ of "-apple-system-font" for font-family.
+
+ Add a test to make sure the old name still works.
+
+ * fast/text/system-font-legacy-name.html
+ * platform/ios-simulator/fast/text/system-monospaced-numbers.html:
+ * platform/ios-simulator/ios/fast/text/apple-logo-expected.txt:
+ * platform/ios-simulator/ios/fast/text/apple-logo.html:
+ * platform/ios-simulator/ios/fast/text/opticalFont-expected.txt:
+ * platform/ios-simulator/ios/fast/text/opticalFont.html:
+ * platform/ios-simulator/ios/fast/text/opticalFontWithWeight-expected.txt:
+ * platform/ios-simulator/ios/fast/text/opticalFontWithWeight.html:
+ * platform/ios-simulator/ios/fast/text/underline-scaling-expected.txt:
+ * platform/ios-simulator/ios/fast/text/underline-scaling.html:
+ * platform/mac/fast/text/systemFont-expected.txt:
+ * platform/mac/fast/text/systemFont.html:
+
2015-04-30 Javier Fernandez <[email protected]>
[CSS Grid Layout] overflow-position keyword for align and justify properties.
Added: trunk/LayoutTests/fast/text/system-font-legacy-name-expected.txt (0 => 183662)
--- trunk/LayoutTests/fast/text/system-font-legacy-name-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/text/system-font-legacy-name-expected.txt 2015-05-01 01:56:32 UTC (rev 183662)
@@ -0,0 +1,7 @@
+These next two lines should be the same width
+
+This is some text
+
+This is some text
+
+PASS: widths were the same
Property changes on: trunk/LayoutTests/fast/text/system-font-legacy-name-expected.txt
___________________________________________________________________
Added: svn:mime-type
Added: svn:keywords
Added: svn:eol-style
Copied: trunk/LayoutTests/fast/text/system-font-legacy-name.html (from rev 183661, trunk/LayoutTests/platform/ios-simulator/fast/text/system-monospaced-numbers.html) (0 => 183662)
--- trunk/LayoutTests/fast/text/system-font-legacy-name.html (rev 0)
+++ trunk/LayoutTests/fast/text/system-font-legacy-name.html 2015-05-01 01:56:32 UTC (rev 183662)
@@ -0,0 +1,38 @@
+<style>
+span {
+ font-size: 24px
+}
+
+#a {
+ font-family: -apple-system;
+}
+
+#b {
+ font-family: -apple-system-font;
+}
+</style>
+<script>
+if (window.testRunner)
+ window.testRunner.dumpAsText();
+
+window.addEventListener("load", run, false);
+
+function run() {
+ var a = document.getElementById("a");
+ var b = document.getElementById("b");
+ var result = document.getElementById("result");
+
+ var aRect = a.getBoundingClientRect();
+ var bRect = b.getBoundingClientRect();
+
+ if (aRect.width == bRect.width)
+ result.textContent = "PASS: widths were the same";
+ else
+ result.textContent = "FAIL: widths were not the same";
+}
+</script>
+<p>These next two lines should be the same width</p>
+<p><span id="a">This is some text</span></p>
+<p><span id="b">This is some text</span></p>
+
+<p id="result"></p>
Modified: trunk/LayoutTests/platform/ios-simulator/fast/text/system-monospaced-numbers.html (183661 => 183662)
--- trunk/LayoutTests/platform/ios-simulator/fast/text/system-monospaced-numbers.html 2015-05-01 01:38:27 UTC (rev 183661)
+++ trunk/LayoutTests/platform/ios-simulator/fast/text/system-monospaced-numbers.html 2015-05-01 01:56:32 UTC (rev 183662)
@@ -1,6 +1,6 @@
<style>
span {
- font-family: -apple-system-font-monospaced-numbers;
+ font-family: -apple-system-monospaced-numbers;
font-size: 24px
}
</style>
Modified: trunk/LayoutTests/platform/ios-simulator/ios/fast/text/apple-logo-expected.txt (183661 => 183662)
--- trunk/LayoutTests/platform/ios-simulator/ios/fast/text/apple-logo-expected.txt 2015-05-01 01:38:27 UTC (rev 183661)
+++ trunk/LayoutTests/platform/ios-simulator/ios/fast/text/apple-logo-expected.txt 2015-05-01 01:56:32 UTC (rev 183662)
@@ -23,37 +23,37 @@
text run at (53,2) width 16: "\x{F8FF}"
RenderText {#text} at (68,5) size 5x19
text run at (68,5) width 5: " "
- RenderInline {SPAN} at (0,0) size 17x23
- RenderText {#text} at (72,2) size 17x23
- text run at (72,2) width 17: "\x{F8FF}"
- RenderText {#text} at (88,5) size 5x19
- text run at (88,5) width 5: " "
- RenderInline {SPAN} at (0,0) size 17x23
- RenderText {#text} at (92,2) size 17x23
- text run at (92,2) width 17: "\x{F8FF}"
- RenderText {#text} at (108,5) size 5x19
- text run at (108,5) width 5: " "
- RenderInline {SPAN} at (0,0) size 17x23
- RenderText {#text} at (112,2) size 17x23
- text run at (112,2) width 17: "\x{F8FF}"
- RenderText {#text} at (128,5) size 5x19
- text run at (128,5) width 5: " "
- RenderInline {SPAN} at (0,0) size 13x20
- RenderText {#text} at (132,4) size 13x20
- text run at (132,4) width 13: "\x{F8FF}"
- RenderText {#text} at (144,5) size 5x19
- text run at (144,5) width 5: " "
- RenderInline {SPAN} at (0,0) size 17x25
- RenderText {#text} at (148,0) size 17x25
- text run at (148,0) width 17: "\x{F8FF}"
- RenderText {#text} at (164,5) size 5x19
- text run at (164,5) width 5: " "
- RenderInline {SPAN} at (0,0) size 17x25
- RenderText {#text} at (168,0) size 17x25
- text run at (168,0) width 17: "\x{F8FF}"
- RenderText {#text} at (184,5) size 5x19
- text run at (184,5) width 5: " "
- RenderInline {SPAN} at (0,0) size 17x25
- RenderText {#text} at (188,0) size 17x25
- text run at (188,0) width 17: "\x{F8FF}"
+ RenderInline {SPAN} at (0,0) size 14x19
+ RenderText {#text} at (72,5) size 14x19
+ text run at (72,5) width 14: "\x{F8FF}"
+ RenderText {#text} at (85,5) size 5x19
+ text run at (85,5) width 5: " "
+ RenderInline {SPAN} at (0,0) size 14x19
+ RenderText {#text} at (89,5) size 14x19
+ text run at (89,5) width 14: "\x{F8FF}"
+ RenderText {#text} at (102,5) size 5x19
+ text run at (102,5) width 5: " "
+ RenderInline {SPAN} at (0,0) size 16x23
+ RenderText {#text} at (106,2) size 16x23
+ text run at (106,2) width 16: "\x{F8FF}"
+ RenderText {#text} at (121,5) size 5x19
+ text run at (121,5) width 5: " "
+ RenderInline {SPAN} at (0,0) size 16x20
+ RenderText {#text} at (125,4) size 16x20
+ text run at (125,4) width 16: "\x{F8FF}"
+ RenderText {#text} at (140,5) size 5x19
+ text run at (140,5) width 5: " "
+ RenderInline {SPAN} at (0,0) size 20x25
+ RenderText {#text} at (144,0) size 20x25
+ text run at (144,0) width 20: "\x{F8FF}"
+ RenderText {#text} at (163,5) size 5x19
+ text run at (163,5) width 5: " "
+ RenderInline {SPAN} at (0,0) size 20x25
+ RenderText {#text} at (167,0) size 20x25
+ text run at (167,0) width 20: "\x{F8FF}"
+ RenderText {#text} at (186,5) size 5x19
+ text run at (186,5) width 5: " "
+ RenderInline {SPAN} at (0,0) size 16x25
+ RenderText {#text} at (190,0) size 16x25
+ text run at (190,0) width 16: "\x{F8FF}"
RenderText {#text} at (0,0) size 0x0
Modified: trunk/LayoutTests/platform/ios-simulator/ios/fast/text/apple-logo.html (183661 => 183662)
--- trunk/LayoutTests/platform/ios-simulator/ios/fast/text/apple-logo.html 2015-05-01 01:38:27 UTC (rev 183661)
+++ trunk/LayoutTests/platform/ios-simulator/ios/fast/text/apple-logo.html 2015-05-01 01:56:32 UTC (rev 183662)
@@ -7,7 +7,7 @@
<span style="font-size: 20px; font: -apple-system-body; font-family: 'Times New Roman';"></span>
<span style="font-size: 20px; font: -apple-system-body; font-family: 'Times New Roman'; font-style: italic;"></span>
<span style="font: -apple-system-body; font-size: 20px; font-family: 'Times New Roman';"></span>
-<span style="font-family: -apple-system-font;"></span>
-<span style="font-size: 20px; font-family: -apple-system-font;"></span>
-<span style="font-size: 20px; font-family: -apple-system-font; font-weight: bold"></span>
-<span style="font-size: 20px; font-family: -apple-system-font; font-style: italic"></span>
+<span style="font-family: -apple-system;"></span>
+<span style="font-size: 20px; font-family: -apple-system;"></span>
+<span style="font-size: 20px; font-family: -apple-system; font-weight: bold"></span>
+<span style="font-size: 20px; font-family: -apple-system; font-style: italic"></span>
Modified: trunk/LayoutTests/platform/ios-simulator/ios/fast/text/opticalFont-expected.txt (183661 => 183662)
--- trunk/LayoutTests/platform/ios-simulator/ios/fast/text/opticalFont-expected.txt 2015-05-01 01:38:27 UTC (rev 183661)
+++ trunk/LayoutTests/platform/ios-simulator/ios/fast/text/opticalFont-expected.txt 2015-05-01 01:56:32 UTC (rev 183662)
@@ -1,60 +1,56 @@
-layer at (0,0) size 800x1349
+layer at (0,0) size 800x1152
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x1349
- RenderBlock {HTML} at (0,0) size 800x1349
- RenderBody {BODY} at (8,8) size 784x1333
+layer at (0,0) size 800x1152
+ RenderBlock {HTML} at (0,0) size 800x1152
+ RenderBody {BODY} at (8,8) size 784x1136
RenderBlock {DIV} at (0,0) size 784x29
- RenderText {#text} at (0,0) size 395x29
- text run at (0,0) width 395: "This is a test for -webkit-system-font"
- RenderBlock {DIV} at (0,29) size 784x58
- RenderText {#text} at (0,0) size 744x58
- text run at (0,0) width 744: "This is a test for -apple-system-font. It should be the same as the line"
- text run at (0,29) width 73: "above."
- RenderBlock {DIV} at (0,87) size 784x74
- RenderText {#text} at (0,0) size 710x74
- text run at (0,0) width 710: "This is a test for -webkit-system-font, using the 'font'"
- text run at (0,37) width 114: "property"
- RenderBlock {DIV} at (0,161) size 784x74
- RenderText {#text} at (0,0) size 696x74
- text run at (0,0) width 696: "This is a test for -apple-system-font, using the 'font'"
- text run at (0,37) width 114: "property"
- RenderBlock {DIV} at (0,235) size 784x29
- RenderInline {B} at (0,0) size 548x29
- RenderText {#text} at (0,0) size 548x29
- text run at (0,0) width 548: "This is a test for -webkit-system-font in bold form"
- RenderBlock {DIV} at (0,264) size 784x29
- RenderInline {I} at (0,0) size 528x29
- RenderText {#text} at (0,0) size 528x29
- text run at (0,0) width 528: "This is a test for -webkit-system-font in italic form"
- RenderBlock {DIV} at (0,293) size 784x37
- RenderText {#text} at (0,0) size 663x37
- text run at (0,0) width 663: "This is a test for -webkit-system-font at size 30px"
- RenderBlock {DIV} at (0,330) size 784x88
- RenderText {#text} at (0,0) size 705x88
- text run at (0,0) width 705: "This is a test for -webkit-system-font at size"
- text run at (0,44) width 81: "36px"
- RenderBlock {DIV} at (0,418) size 784x102
- RenderText {#text} at (0,0) size 738x102
- text run at (0,0) width 738: "This is a test for -webkit-system-font at"
- text run at (0,51) width 179: "size 42px"
- RenderBlock {DIV} at (0,520) size 784x116
- RenderText {#text} at (0,0) size 705x116
- text run at (0,0) width 705: "This is a test for -webkit-system-"
- text run at (0,58) width 355: "font at size 48px"
- RenderBlock {DIV} at (0,636) size 784x132
- RenderText {#text} at (0,0) size 600x132
- text run at (0,0) width 600: "This is a test for -webkit-"
- text run at (0,66) width 594: "system-font at size 54px"
- RenderBlock {DIV} at (0,768) size 784x146
- RenderText {#text} at (0,0) size 666x146
- text run at (0,0) width 666: "This is a test for -webkit-"
- text run at (0,73) width 659: "system-font at size 60px"
- RenderBlock {DIV} at (0,914) size 784x158
- RenderText {#text} at (0,0) size 733x158
- text run at (0,0) width 733: "This is a test for -webkit-"
- text run at (0,79) width 725: "system-font at size 66px"
- RenderBlock {DIV} at (0,1072) size 784x261
- RenderText {#text} at (0,0) size 706x261
- text run at (0,0) width 559: "This is a test for -"
- text run at (0,87) width 706: "webkit-system-font at"
- text run at (0,174) width 306: "size 72px"
+ RenderText {#text} at (0,0) size 392x29
+ text run at (0,0) width 392: "This is a test for -webkit-system-font"
+ RenderBlock {DIV} at (0,29) size 784x29
+ RenderText {#text} at (0,0) size 765x29
+ text run at (0,0) width 765: "This is a test for -apple-system. It should be the same as the line above."
+ RenderBlock {DIV} at (0,58) size 784x74
+ RenderText {#text} at (0,0) size 699x74
+ text run at (0,0) width 699: "This is a test for -webkit-system-font, using the 'font'"
+ text run at (0,37) width 113: "property"
+ RenderBlock {DIV} at (0,132) size 784x37
+ RenderText {#text} at (0,0) size 742x37
+ text run at (0,0) width 742: "This is a test for -apple-system, using the 'font' property"
+ RenderBlock {DIV} at (0,169) size 784x29
+ RenderInline {B} at (0,0) size 551x29
+ RenderText {#text} at (0,0) size 551x29
+ text run at (0,0) width 551: "This is a test for -webkit-system-font in bold form"
+ RenderBlock {DIV} at (0,198) size 784x29
+ RenderInline {I} at (0,0) size 512x29
+ RenderText {#text} at (0,0) size 512x29
+ text run at (0,0) width 512: "This is a test for -webkit-system-font in italic form"
+ RenderBlock {DIV} at (0,227) size 784x37
+ RenderText {#text} at (0,0) size 655x37
+ text run at (0,0) width 655: "This is a test for -webkit-system-font at size 30px"
+ RenderBlock {DIV} at (0,264) size 784x44
+ RenderText {#text} at (0,0) size 782x44
+ text run at (0,0) width 782: "This is a test for -webkit-system-font at size 36px"
+ RenderBlock {DIV} at (0,308) size 784x102
+ RenderText {#text} at (0,0) size 721x102
+ text run at (0,0) width 721: "This is a test for -webkit-system-font at"
+ text run at (0,51) width 176: "size 42px"
+ RenderBlock {DIV} at (0,410) size 784x116
+ RenderText {#text} at (0,0) size 769x116
+ text run at (0,0) width 769: "This is a test for -webkit-system-font"
+ text run at (0,58) width 255: "at size 48px"
+ RenderBlock {DIV} at (0,526) size 784x132
+ RenderText {#text} at (0,0) size 769x132
+ text run at (0,0) width 769: "This is a test for -webkit-system-"
+ text run at (0,66) width 390: "font at size 54px"
+ RenderBlock {DIV} at (0,658) size 784x146
+ RenderText {#text} at (0,0) size 642x146
+ text run at (0,0) width 642: "This is a test for -webkit-"
+ text run at (0,73) width 642: "system-font at size 60px"
+ RenderBlock {DIV} at (0,804) size 784x158
+ RenderText {#text} at (0,0) size 704x158
+ text run at (0,0) width 704: "This is a test for -webkit-"
+ text run at (0,79) width 703: "system-font at size 66px"
+ RenderBlock {DIV} at (0,962) size 784x174
+ RenderText {#text} at (0,0) size 766x174
+ text run at (0,0) width 766: "This is a test for -webkit-"
+ text run at (0,87) width 759: "system-font at size 72px"
Modified: trunk/LayoutTests/platform/ios-simulator/ios/fast/text/opticalFont.html (183661 => 183662)
--- trunk/LayoutTests/platform/ios-simulator/ios/fast/text/opticalFont.html 2015-05-01 01:38:27 UTC (rev 183661)
+++ trunk/LayoutTests/platform/ios-simulator/ios/fast/text/opticalFont.html 2015-05-01 01:56:32 UTC (rev 183662)
@@ -1,8 +1,8 @@
<body>
<div style="font-family: -webkit-system-font; font-size: 24px">This is a test for -webkit-system-font</div>
- <div style="font-family: -apple-system-font; font-size: 24px">This is a test for -apple-system-font. It should be the same as the line above.</div>
+ <div style="font-family: -apple-system; font-size: 24px">This is a test for -apple-system. It should be the same as the line above.</div>
<div style="font: 30.0px -webkit-system-font">This is a test for -webkit-system-font, using the 'font' property</div>
- <div style="font: 30px -apple-system-font">This is a test for -apple-system-font, using the 'font' property</div>
+ <div style="font: 30px -apple-system">This is a test for -apple-system, using the 'font' property</div>
<div style="font-family: -webkit-system-font; font-size: 24px"><b>This is a test for -webkit-system-font in bold form</b></div>
<div style="font-family: -webkit-system-font; font-size: 24px"><i>This is a test for -webkit-system-font in italic form</i></div>
<div style="font-family: -webkit-system-font; font-size: 30px">This is a test for -webkit-system-font at size 30px</div>
Modified: trunk/LayoutTests/platform/ios-simulator/ios/fast/text/opticalFontWithWeight-expected.txt (183661 => 183662)
--- trunk/LayoutTests/platform/ios-simulator/ios/fast/text/opticalFontWithWeight-expected.txt 2015-05-01 01:38:27 UTC (rev 183661)
+++ trunk/LayoutTests/platform/ios-simulator/ios/fast/text/opticalFontWithWeight-expected.txt 2015-05-01 01:56:32 UTC (rev 183662)
@@ -1,71 +1,71 @@
-layer at (0,0) size 800x992
+layer at (0,0) size 800x822
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x992
- RenderBlock {HTML} at (0,0) size 800x993
- RenderBody {BODY} at (8,8) size 784x969
- RenderBlock {H2} at (0,0) size 784x30
- RenderText {#text} at (0,0) size 165x29
- text run at (0,0) width 165: "Normal Weight"
- RenderBlock {P} at (0,49) size 784x21
- RenderText {#text} at (0,0) size 666x20
- text run at (0,0) width 666: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
- RenderBlock {H2} at (0,89) size 784x31
- RenderText {#text} at (0,0) size 125x29
- text run at (0,0) width 125: "100 Weight"
- RenderBlock {P} at (0,139) size 784x21
- RenderText {#text} at (0,0) size 590x20
- text run at (0,0) width 590: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
- RenderBlock {H2} at (0,179) size 784x31
- RenderText {#text} at (0,0) size 125x29
- text run at (0,0) width 125: "200 Weight"
- RenderBlock {P} at (0,229) size 784x21
- RenderText {#text} at (0,0) size 617x20
- text run at (0,0) width 617: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
- RenderBlock {H2} at (0,269) size 784x31
- RenderText {#text} at (0,0) size 125x29
- text run at (0,0) width 125: "300 Weight"
- RenderBlock {P} at (0,319) size 784x21
- RenderText {#text} at (0,0) size 640x20
- text run at (0,0) width 640: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
- RenderBlock {H2} at (0,359) size 784x31
- RenderText {#text} at (0,0) size 125x29
- text run at (0,0) width 125: "400 Weight"
- RenderBlock {P} at (0,409) size 784x21
- RenderText {#text} at (0,0) size 666x20
- text run at (0,0) width 666: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
- RenderBlock {H2} at (0,449) size 784x31
- RenderText {#text} at (0,0) size 125x29
- text run at (0,0) width 125: "500 Weight"
- RenderBlock {P} at (0,498) size 784x21
- RenderText {#text} at (0,0) size 666x20
- text run at (0,0) width 666: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
- RenderBlock {H2} at (0,538) size 784x31
- RenderText {#text} at (0,0) size 137x29
- text run at (0,0) width 137: "Bold Weight"
- RenderBlock {P} at (0,588) size 784x21
- RenderText {#text} at (0,0) size 688x20
- text run at (0,0) width 688: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
- RenderBlock {H2} at (0,628) size 784x31
- RenderText {#text} at (0,0) size 125x29
- text run at (0,0) width 125: "600 Weight"
- RenderBlock {P} at (0,678) size 784x21
- RenderText {#text} at (0,0) size 688x20
- text run at (0,0) width 688: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
- RenderBlock {H2} at (0,718) size 784x31
- RenderText {#text} at (0,0) size 125x29
- text run at (0,0) width 125: "700 Weight"
- RenderBlock {P} at (0,768) size 784x21
- RenderText {#text} at (0,0) size 688x20
- text run at (0,0) width 688: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
- RenderBlock {H2} at (0,808) size 784x31
- RenderText {#text} at (0,0) size 125x29
- text run at (0,0) width 125: "800 Weight"
- RenderBlock {P} at (0,858) size 784x21
- RenderText {#text} at (0,0) size 688x20
- text run at (0,0) width 688: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
- RenderBlock {H2} at (0,898) size 784x31
- RenderText {#text} at (0,0) size 125x29
- text run at (0,0) width 125: "900 Weight"
- RenderBlock {P} at (0,948) size 784x21
- RenderText {#text} at (0,0) size 688x20
- text run at (0,0) width 688: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
+layer at (0,0) size 800x822
+ RenderBlock {HTML} at (0,0) size 800x822
+ RenderBody {BODY} at (8,8) size 784x798
+ RenderBlock {H2} at (0,0) size 784x22
+ RenderText {#text} at (0,1) size 113x20
+ text run at (0,1) width 113: "Normal Weight"
+ RenderBlock {P} at (0,38) size 784x20
+ RenderText {#text} at (0,0) size 671x20
+ text run at (0,0) width 671: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
+ RenderBlock {H2} at (0,74) size 784x22
+ RenderText {#text} at (0,1) size 86x20
+ text run at (0,1) width 86: "100 Weight"
+ RenderBlock {P} at (0,112) size 784x20
+ RenderText {#text} at (0,0) size 662x20
+ text run at (0,0) width 662: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
+ RenderBlock {H2} at (0,148) size 784x22
+ RenderText {#text} at (0,1) size 88x20
+ text run at (0,1) width 88: "200 Weight"
+ RenderBlock {P} at (0,186) size 784x20
+ RenderText {#text} at (0,0) size 662x20
+ text run at (0,0) width 662: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
+ RenderBlock {H2} at (0,222) size 784x22
+ RenderText {#text} at (0,1) size 89x20
+ text run at (0,1) width 89: "300 Weight"
+ RenderBlock {P} at (0,260) size 784x20
+ RenderText {#text} at (0,0) size 662x20
+ text run at (0,0) width 662: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
+ RenderBlock {H2} at (0,296) size 784x22
+ RenderText {#text} at (0,1) size 89x20
+ text run at (0,1) width 89: "400 Weight"
+ RenderBlock {P} at (0,334) size 784x20
+ RenderText {#text} at (0,0) size 671x20
+ text run at (0,0) width 671: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
+ RenderBlock {H2} at (0,370) size 784x22
+ RenderText {#text} at (0,1) size 89x20
+ text run at (0,1) width 89: "500 Weight"
+ RenderBlock {P} at (0,408) size 784x20
+ RenderText {#text} at (0,0) size 671x20
+ text run at (0,0) width 671: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
+ RenderBlock {H2} at (0,444) size 784x22
+ RenderText {#text} at (0,1) size 92x20
+ text run at (0,1) width 92: "Bold Weight"
+ RenderBlock {P} at (0,482) size 784x20
+ RenderText {#text} at (0,0) size 701x20
+ text run at (0,0) width 701: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
+ RenderBlock {H2} at (0,518) size 784x22
+ RenderText {#text} at (0,1) size 89x20
+ text run at (0,1) width 89: "600 Weight"
+ RenderBlock {P} at (0,556) size 784x20
+ RenderText {#text} at (0,0) size 701x20
+ text run at (0,0) width 701: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
+ RenderBlock {H2} at (0,592) size 784x22
+ RenderText {#text} at (0,1) size 88x20
+ text run at (0,1) width 88: "700 Weight"
+ RenderBlock {P} at (0,630) size 784x20
+ RenderText {#text} at (0,0) size 701x20
+ text run at (0,0) width 701: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
+ RenderBlock {H2} at (0,666) size 784x22
+ RenderText {#text} at (0,1) size 89x20
+ text run at (0,1) width 89: "800 Weight"
+ RenderBlock {P} at (0,704) size 784x20
+ RenderText {#text} at (0,0) size 701x20
+ text run at (0,0) width 701: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
+ RenderBlock {H2} at (0,740) size 784x22
+ RenderText {#text} at (0,1) size 89x20
+ text run at (0,1) width 89: "900 Weight"
+ RenderBlock {P} at (0,778) size 784x20
+ RenderText {#text} at (0,0) size 701x20
+ text run at (0,0) width 701: "Body Text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque ornare ornare mi"
Modified: trunk/LayoutTests/platform/ios-simulator/ios/fast/text/opticalFontWithWeight.html (183661 => 183662)
--- trunk/LayoutTests/platform/ios-simulator/ios/fast/text/opticalFontWithWeight.html 2015-05-01 01:38:27 UTC (rev 183661)
+++ trunk/LayoutTests/platform/ios-simulator/ios/fast/text/opticalFontWithWeight.html 2015-05-01 01:56:32 UTC (rev 183662)
@@ -6,7 +6,7 @@
font: -apple-system-headline;
}
p {
- font-family: -apple-system-font;
+ font-family: -apple-system;
}
</style>
</head>
Modified: trunk/LayoutTests/platform/ios-simulator/ios/fast/text/underline-scaling-expected.txt (183661 => 183662)
--- trunk/LayoutTests/platform/ios-simulator/ios/fast/text/underline-scaling-expected.txt 2015-05-01 01:38:27 UTC (rev 183661)
+++ trunk/LayoutTests/platform/ios-simulator/ios/fast/text/underline-scaling-expected.txt 2015-05-01 01:56:32 UTC (rev 183662)
@@ -4,29 +4,29 @@
RenderBlock {HTML} at (0,0) size 800x284
RenderBody {BODY} at (8,8) size 784x268
RenderBlock {P} at (0,0) size 784x20
- RenderText {#text} at (0,0) size 132x20
- text run at (0,0) width 132: "font-size is default"
+ RenderText {#text} at (0,0) size 135x20
+ text run at (0,0) width 135: "font-size is default"
RenderBlock {P} at (0,20) size 784x10
- RenderText {#text} at (0,0) size 55x10
- text run at (0,0) width 55: "font-size is 8px"
+ RenderText {#text} at (0,0) size 62x10
+ text run at (0,0) width 62: "font-size is 8px"
RenderBlock {P} at (0,30) size 784x15
- RenderText {#text} at (0,0) size 89x15
- text run at (0,0) width 89: "font-size is 12px"
+ RenderText {#text} at (0,0) size 93x15
+ text run at (0,0) width 93: "font-size is 12px"
RenderBlock {P} at (0,45) size 784x20
- RenderText {#text} at (0,0) size 118x20
- text run at (0,0) width 118: "font-size is 16px"
+ RenderText {#text} at (0,0) size 119x20
+ text run at (0,0) width 119: "font-size is 16px"
RenderBlock {P} at (0,65) size 784x25
- RenderText {#text} at (0,0) size 148x25
- text run at (0,0) width 148: "font-size is 20px"
+ RenderText {#text} at (0,0) size 149x25
+ text run at (0,0) width 149: "font-size is 20px"
RenderBlock {P} at (0,90) size 784x29
RenderText {#text} at (0,0) size 177x29
text run at (0,0) width 177: "font-size is 24px"
RenderBlock {P} at (0,119) size 784x39
- RenderText {#text} at (0,0) size 236x39
- text run at (0,0) width 236: "font-size is 32px"
+ RenderText {#text} at (0,0) size 234x39
+ text run at (0,0) width 234: "font-size is 32px"
RenderBlock {P} at (0,158) size 784x49
- RenderText {#text} at (0,0) size 295x49
- text run at (0,0) width 295: "font-size is 40px"
+ RenderText {#text} at (0,0) size 293x49
+ text run at (0,0) width 293: "font-size is 40px"
RenderBlock {P} at (0,207) size 784x61
- RenderText {#text} at (0,0) size 369x61
- text run at (0,0) width 369: "font-size is 50px"
+ RenderText {#text} at (0,0) size 363x61
+ text run at (0,0) width 363: "font-size is 50px"
Modified: trunk/LayoutTests/platform/ios-simulator/ios/fast/text/underline-scaling.html (183661 => 183662)
--- trunk/LayoutTests/platform/ios-simulator/ios/fast/text/underline-scaling.html 2015-05-01 01:38:27 UTC (rev 183661)
+++ trunk/LayoutTests/platform/ios-simulator/ios/fast/text/underline-scaling.html 2015-05-01 01:56:32 UTC (rev 183662)
@@ -4,7 +4,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<style>
p {
- font-family: -apple-system-font;
+ font-family: -apple-system;
text-decoration: underline;
margin-top: 0;
margin-bottom: 0;
Modified: trunk/LayoutTests/platform/mac/fast/text/systemFont-expected.txt (183661 => 183662)
--- trunk/LayoutTests/platform/mac/fast/text/systemFont-expected.txt 2015-05-01 01:38:27 UTC (rev 183661)
+++ trunk/LayoutTests/platform/mac/fast/text/systemFont-expected.txt 2015-05-01 01:56:32 UTC (rev 183662)
@@ -1,8 +1,8 @@
-layer at (0,0) size 785x2092
+layer at (0,0) size 785x2036
RenderView at (0,0) size 785x600
-layer at (0,0) size 785x2092
- RenderBlock {HTML} at (0,0) size 785x2092
- RenderBody {BODY} at (8,8) size 769x2076
+layer at (0,0) size 785x2036
+ RenderBlock {HTML} at (0,0) size 785x2036
+ RenderBody {BODY} at (8,8) size 769x2020
RenderBlock {DIV} at (0,0) size 769x897
RenderBlock {DIV} at (0,0) size 769x28
RenderText {#text} at (0,0) size 438x28
@@ -41,58 +41,57 @@
RenderText {#text} at (0,0) size 762x170
text run at (0,0) width 551: "This is a test for -"
text run at (0,85) width 762: "webkit-system-font font"
- RenderBlock {DIV} at (0,897) size 769x897
+ RenderBlock {DIV} at (0,897) size 769x841
RenderBlock {DIV} at (0,0) size 769x28
- RenderText {#text} at (0,0) size 427x28
- text run at (0,0) width 427: "This is a test for -apple-system-font font"
+ RenderText {#text} at (0,0) size 376x28
+ text run at (0,0) width 376: "This is a test for -apple-system font"
RenderBlock {DIV} at (0,28) size 769x35
- RenderText {#text} at (0,0) size 533x35
- text run at (0,0) width 533: "This is a test for -apple-system-font font"
+ RenderText {#text} at (0,0) size 470x35
+ text run at (0,0) width 470: "This is a test for -apple-system font"
RenderBlock {DIV} at (0,63) size 769x35
- RenderText {#text} at (0,0) size 533x35
- text run at (0,0) width 533: "This is a test for -apple-system-font font"
+ RenderText {#text} at (0,0) size 470x35
+ text run at (0,0) width 470: "This is a test for -apple-system font"
RenderBlock {DIV} at (0,98) size 769x43
- RenderInline {B} at (0,0) size 686x43
- RenderText {#text} at (0,0) size 686x43
- text run at (0,0) width 686: "This is a test for -apple-system-font font"
+ RenderInline {B} at (0,0) size 604x43
+ RenderText {#text} at (0,0) size 604x43
+ text run at (0,0) width 604: "This is a test for -apple-system font"
RenderBlock {DIV} at (0,141) size 769x50
- RenderInline {I} at (0,0) size 747x50
- RenderText {#text} at (0,0) size 747x50
- text run at (0,0) width 747: "This is a test for -apple-system-font font"
- RenderBlock {DIV} at (0,191) size 769x112
- RenderText {#text} at (0,0) size 758x112
- text run at (0,0) width 758: "This is a test for -apple-system-font"
- text run at (0,56) width 83: "font"
- RenderBlock {DIV} at (0,303) size 769x126
- RenderText {#text} at (0,0) size 759x126
- text run at (0,0) width 759: "This is a test for -apple-system-"
- text run at (0,63) width 201: "font font"
- RenderBlock {DIV} at (0,429) size 769x142
+ RenderInline {I} at (0,0) size 658x50
+ RenderText {#text} at (0,0) size 658x50
+ text run at (0,0) width 658: "This is a test for -apple-system font"
+ RenderBlock {DIV} at (0,191) size 769x56
+ RenderText {#text} at (0,0) size 752x56
+ text run at (0,0) width 752: "This is a test for -apple-system font"
+ RenderBlock {DIV} at (0,247) size 769x126
+ RenderText {#text} at (0,0) size 739x126
+ text run at (0,0) width 739: "This is a test for -apple-system"
+ text run at (0,63) width 93: "font"
+ RenderBlock {DIV} at (0,373) size 769x142
RenderText {#text} at (0,0) size 630x142
text run at (0,0) width 630: "This is a test for -apple-"
- text run at (0,71) width 437: "system-font font"
- RenderBlock {DIV} at (0,571) size 769x156
+ text run at (0,71) width 311: "system font"
+ RenderBlock {DIV} at (0,515) size 769x156
RenderText {#text} at (0,0) size 693x156
text run at (0,0) width 693: "This is a test for -apple-"
- text run at (0,78) width 481: "system-font font"
- RenderBlock {DIV} at (0,727) size 769x170
+ text run at (0,78) width 342: "system font"
+ RenderBlock {DIV} at (0,671) size 769x170
RenderText {#text} at (0,0) size 756x170
text run at (0,0) width 756: "This is a test for -apple-"
- text run at (0,85) width 525: "system-font font"
- RenderBlock {DIV} at (0,1794) size 769x282
+ text run at (0,85) width 373: "system font"
+ RenderBlock {DIV} at (0,1738) size 769x282
RenderBlock {DIV} at (0,0) size 769x56
- RenderText {#text} at (0,0) size 695x56
- text run at (0,0) width 695: "This is a test for -apple-system-font-monospaced-numbers font -"
+ RenderText {#text} at (0,0) size 644x56
+ text run at (0,0) width 644: "This is a test for -apple-system-monospaced-numbers font -"
text run at (0,28) width 126: "00:11:22:33"
RenderBlock {DIV} at (0,56) size 769x70
- RenderText {#text} at (0,0) size 672x70
- text run at (0,0) width 672: "This is a test for -apple-system-font-monospaced-"
- text run at (0,35) width 362: "numbers font - 00:11:22:33"
+ RenderText {#text} at (0,0) size 726x70
+ text run at (0,0) width 726: "This is a test for -apple-system-monospaced-numbers"
+ text run at (0,35) width 237: "font - 00:11:22:33"
RenderBlock {DIV} at (0,126) size 769x70
- RenderText {#text} at (0,0) size 672x70
- text run at (0,0) width 672: "This is a test for -apple-system-font-monospaced-"
- text run at (0,35) width 362: "numbers font - 00:11:22:33"
+ RenderText {#text} at (0,0) size 726x70
+ text run at (0,0) width 726: "This is a test for -apple-system-monospaced-numbers"
+ text run at (0,35) width 237: "font - 00:11:22:33"
RenderBlock {DIV} at (0,196) size 769x86
- RenderText {#text} at (0,0) size 658x86
- text run at (0,0) width 582: "This is a test for -apple-system-font-"
- text run at (0,43) width 658: "monospaced-numbers font - 00:11:22:33"
+ RenderText {#text} at (0,0) size 730x86
+ text run at (0,0) width 730: "This is a test for -apple-system-monospaced-"
+ text run at (0,43) width 434: "numbers font - 00:11:22:33"
Modified: trunk/LayoutTests/platform/mac/fast/text/systemFont.html (183661 => 183662)
--- trunk/LayoutTests/platform/mac/fast/text/systemFont.html 2015-05-01 01:38:27 UTC (rev 183661)
+++ trunk/LayoutTests/platform/mac/fast/text/systemFont.html 2015-05-01 01:56:32 UTC (rev 183662)
@@ -12,21 +12,21 @@
<div style="font-family: -webkit-system-font; font-size: 72px">This is a test for -webkit-system-font font</div>
</div>
<div>
- <div style="font-family: -apple-system-font; font-size: 24px">This is a test for -apple-system-font font</div>
- <div style="font: 30.0px '-apple-system-font'">This is a test for -apple-system-font font</div>
- <div style="font-family: -apple-system-font; font-size: 30px">This is a test for -apple-system-font font</div>
- <div style="font-family: -apple-system-font; font-size: 36px"><b>This is a test for -apple-system-font font</b></div>
- <div style="font-family: -apple-system-font; font-size: 42px"><i>This is a test for -apple-system-font font</i></div>
- <div style="font-family: -apple-system-font; font-size: 48px">This is a test for -apple-system-font font</div>
- <div style="font-family: -apple-system-font; font-size: 54px">This is a test for -apple-system-font font</div>
- <div style="font-family: -apple-system-font; font-size: 60px">This is a test for -apple-system-font font</div>
- <div style="font-family: -apple-system-font; font-size: 66px">This is a test for -apple-system-font font</div>
- <div style="font-family: -apple-system-font; font-size: 72px">This is a test for -apple-system-font font</div>
+ <div style="font-family: -apple-system; font-size: 24px">This is a test for -apple-system font</div>
+ <div style="font: 30.0px '-apple-system'">This is a test for -apple-system font</div>
+ <div style="font-family: -apple-system; font-size: 30px">This is a test for -apple-system font</div>
+ <div style="font-family: -apple-system; font-size: 36px"><b>This is a test for -apple-system font</b></div>
+ <div style="font-family: -apple-system; font-size: 42px"><i>This is a test for -apple-system font</i></div>
+ <div style="font-family: -apple-system; font-size: 48px">This is a test for -apple-system font</div>
+ <div style="font-family: -apple-system; font-size: 54px">This is a test for -apple-system font</div>
+ <div style="font-family: -apple-system; font-size: 60px">This is a test for -apple-system font</div>
+ <div style="font-family: -apple-system; font-size: 66px">This is a test for -apple-system font</div>
+ <div style="font-family: -apple-system; font-size: 72px">This is a test for -apple-system font</div>
</div>
<div>
- <div style="font-family: -apple-system-font-monospaced-numbers; font-size: 24px">This is a test for -apple-system-font-monospaced-numbers font - 00:11:22:33</div>
- <div style="font: 30.0px '-apple-system-font-monospaced-numbers'">This is a test for -apple-system-font-monospaced-numbers font - 00:11:22:33</div>
- <div style="font-family: -apple-system-font-monospaced-numbers; font-size: 30px">This is a test for -apple-system-font-monospaced-numbers font - 00:11:22:33</div>
- <div style="font-family: -apple-system-font-monospaced-numbers; font-size: 36px">This is a test for -apple-system-font-monospaced-numbers font - 00:11:22:33</div>
+ <div style="font-family: -apple-system-monospaced-numbers; font-size: 24px">This is a test for -apple-system-monospaced-numbers font - 00:11:22:33</div>
+ <div style="font: 30.0px '-apple-system-monospaced-numbers'">This is a test for -apple-system-monospaced-numbers font - 00:11:22:33</div>
+ <div style="font-family: -apple-system-monospaced-numbers; font-size: 30px">This is a test for -apple-system-monospaced-numbers font - 00:11:22:33</div>
+ <div style="font-family: -apple-system-monospaced-numbers; font-size: 36px">This is a test for -apple-system-monospaced-numbers font - 00:11:22:33</div>
</div>
</body>
Modified: trunk/Source/WebCore/ChangeLog (183661 => 183662)
--- trunk/Source/WebCore/ChangeLog 2015-05-01 01:38:27 UTC (rev 183661)
+++ trunk/Source/WebCore/ChangeLog 2015-05-01 01:56:32 UTC (rev 183662)
@@ -1,3 +1,31 @@
+2015-04-30 Dean Jackson <[email protected]>
+
+ Expose -apple-system as a font family
+ https://bugs.webkit.org/show_bug.cgi?id=144484
+ <rdar://problem/20767330>
+
+ Reviewed by Tim Horton.
+
+ Accept "-apple-system" for the font-family property, and
+ rename "-apple-system-font-monospaced-numbers" to
+ "-apple-system-monospaced-numbers".
+
+ Also change the media controls to use the new name.
+
+ Covered by existing tests and this new one:
+ fast/text/system-font-legacy-name.html
+
+ * Modules/mediacontrols/mediaControlsApple.css:
+ (audio::-webkit-media-controls-time-remaining-display):
+ * Modules/mediacontrols/mediaControlsiOS.css:
+ (::-webkit-media-controls):
+ (audio::-webkit-media-controls-time-remaining-display):
+ (audio::-webkit-media-controls-status-display):
+ * platform/graphics/ios/FontCacheIOS.mm: Add support for the new name.
+ (WebCore::createCTFontWithFamilyNameAndWeight):
+ * platform/graphics/mac/FontCacheMac.mm: Ditto.
+ (WebCore::fontWithFamily):
+
2015-04-30 Javier Fernandez <[email protected]>
[CSS Grid Layout] overflow-position keyword for align and justify properties.
Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css (183661 => 183662)
--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css 2015-05-01 01:38:27 UTC (rev 183661)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css 2015-05-01 01:56:32 UTC (rev 183662)
@@ -498,7 +498,7 @@
text-decoration: none;
position: relative;
bottom: 0.5px;
- font-family: -apple-system-font-monospaced-numbers;
+ font-family: -apple-system-monospaced-numbers;
-webkit-text-size-adjust:none;
mix-blend-mode: plus-lighter;
}
Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css (183661 => 183662)
--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css 2015-05-01 01:38:27 UTC (rev 183661)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css 2015-05-01 01:56:32 UTC (rev 183662)
@@ -57,7 +57,7 @@
-webkit-align-items: stretch;
-webkit-justify-content: flex-end;
-webkit-flex-direction: column;
- font-family: -apple-system-font;
+ font-family: -apple-system;
overflow: hidden;
}
@@ -416,7 +416,7 @@
opacity: 0.55;
height: 50px;
font-size: 13px;
- font-family: -apple-system-font-monospaced-numbers;
+ font-family: -apple-system-monospaced-numbers;
}
audio::-webkit-media-controls-current-time-display,
@@ -496,7 +496,7 @@
audio::-webkit-media-controls-status-display {
overflow: hidden;
- font-family: -apple-system-font;
+ font-family: -apple-system;
letter-spacing: normal;
word-spacing: normal;
line-height: normal;
Modified: trunk/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm (183661 => 183662)
--- trunk/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm 2015-05-01 01:38:27 UTC (rev 183661)
+++ trunk/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm 2015-05-01 01:56:32 UTC (rev 183662)
@@ -602,8 +602,9 @@
return nullptr;
static NeverDestroyed<AtomicString> systemUIFontWithWebKitPrefix("-webkit-system-font", AtomicString::ConstructFromLiteral);
- static NeverDestroyed<AtomicString> systemUIFontWithApplePrefix("-apple-system-font", AtomicString::ConstructFromLiteral);
- if (equalIgnoringCase(familyName, systemUIFontWithWebKitPrefix) || equalIgnoringCase(familyName, systemUIFontWithApplePrefix)) {
+ static NeverDestroyed<AtomicString> systemUIFontWithApplePrefix("-apple-system", AtomicString::ConstructFromLiteral);
+ static NeverDestroyed<AtomicString> systemUIFontWithAppleAlternatePrefix("-apple-system-font", AtomicString::ConstructFromLiteral);
+ if (equalIgnoringCase(familyName, systemUIFontWithWebKitPrefix) || equalIgnoringCase(familyName, systemUIFontWithApplePrefix) || equalIgnoringCase(familyName, systemUIFontWithAppleAlternatePrefix)) {
CTFontUIFontType fontType = kCTFontUIFontSystem;
if (weight > 300) {
// The comment below has been copied from CoreText/UIFoundation. However, in WebKit we synthesize the oblique,
@@ -623,7 +624,7 @@
return CTFontCreateWithFontDescriptor(fontDescriptor.get(), size, nullptr);
}
- static NeverDestroyed<AtomicString> systemUIMonospacedNumbersFontWithApplePrefix("-apple-system-font-monospaced-numbers", AtomicString::ConstructFromLiteral);
+ static NeverDestroyed<AtomicString> systemUIMonospacedNumbersFontWithApplePrefix("-apple-system-monospaced-numbers", AtomicString::ConstructFromLiteral);
if (equalIgnoringCase(familyName, systemUIMonospacedNumbersFontWithApplePrefix)) {
RetainPtr<CTFontDescriptorRef> systemFontDescriptor = adoptCF(CTFontDescriptorCreateForUIType(kCTFontUIFontSystem, size, nullptr));
RetainPtr<CTFontDescriptorRef> monospaceFontDescriptor = adoptCF(CTFontDescriptorCreateCopyWithFeature(systemFontDescriptor.get(), (CFNumberRef)@(kNumberSpacingType), (CFNumberRef)@(kMonospacedNumbersSelector)));
Modified: trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm (183661 => 183662)
--- trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2015-05-01 01:38:27 UTC (rev 183661)
+++ trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2015-05-01 01:56:32 UTC (rev 183662)
@@ -208,12 +208,12 @@
// we then do a search based on the family names of the installed fonts.
static NSFont *fontWithFamily(const AtomicString& family, NSFontTraitMask desiredTraits, FontWeight weight, float size)
{
- if (equalIgnoringASCIICase(family.string(), String(@"-webkit-system-font")) || equalIgnoringASCIICase(family.string(), String(@"-apple-system-font"))) {
+ if (equalIgnoringASCIICase(family.string(), String(@"-webkit-system-font")) || equalIgnoringASCIICase(family.string(), String(@"-apple-system")) || equalIgnoringASCIICase(family.string(), String(@"-apple-system-font"))) {
// We ignore italic for system font.
return (weight >= FontWeight600) ? [NSFont boldSystemFontOfSize:size] : [NSFont systemFontOfSize:size];
}
- if (equalIgnoringASCIICase(family.string(), String(@"-apple-system-font-monospaced-numbers"))) {
+ if (equalIgnoringASCIICase(family.string(), String(@"-apple-system-monospaced-numbers"))) {
NSArray *featureArray = @[ @{ NSFontFeatureTypeIdentifierKey : @(kNumberSpacingType),
NSFontFeatureSelectorIdentifierKey : @(kMonospacedNumbersSelector) } ];
