Diff
Modified: branches/safari-602-branch/LayoutTests/ChangeLog (204137 => 204138)
--- branches/safari-602-branch/LayoutTests/ChangeLog 2016-08-04 20:59:49 UTC (rev 204137)
+++ branches/safari-602-branch/LayoutTests/ChangeLog 2016-08-04 21:05:04 UTC (rev 204138)
@@ -1,5 +1,9 @@
2016-08-04 Babak Shafiei <bshaf...@apple.com>
+ Rollout r204132. rdar://problem/27685273
+
+2016-08-04 Babak Shafiei <bshaf...@apple.com>
+
Merge r204107. rdar://problem/27685273
2016-08-03 Myles C. Maxfield <mmaxfi...@apple.com>
Modified: branches/safari-602-branch/LayoutTests/fast/text/system-font-weight-expected.txt (204137 => 204138)
--- branches/safari-602-branch/LayoutTests/fast/text/system-font-weight-expected.txt 2016-08-04 20:59:49 UTC (rev 204137)
+++ branches/safari-602-branch/LayoutTests/fast/text/system-font-weight-expected.txt 2016-08-04 21:05:04 UTC (rev 204138)
@@ -3,19 +3,8 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-PASS four.offsetWidth is not three.offsetWidth
-PASS five.offsetWidth is not four.offsetWidth
-PASS six.offsetWidth is not five.offsetWidth
-PASS eight.offsetWidth is not seven.offsetWidth
+PASS six.offsetWidth is not nine.offsetWidth
PASS successfullyParsed is true
TEST COMPLETE
-Hello, World
-Hello, World
-Hello, World
-Hello, World
-Hello, World
-Hello, World
-Hello, World
-Hello, World
-Hello, World
+Hello, WorldHello, World
Modified: branches/safari-602-branch/LayoutTests/fast/text/system-font-weight.html (204137 => 204138)
--- branches/safari-602-branch/LayoutTests/fast/text/system-font-weight.html 2016-08-04 20:59:49 UTC (rev 204137)
+++ branches/safari-602-branch/LayoutTests/fast/text/system-font-weight.html 2016-08-04 21:05:04 UTC (rev 204138)
@@ -5,31 +5,13 @@
</head>
<body>
<div style="font: 19px -apple-system">
-<div><span id="one" style="font-weight: 100;">Hello, World</span></div>
-<div><span id="two" style="font-weight: 200;">Hello, World</span></div>
-<div><span id="three" style="font-weight: 300;">Hello, World</span></div>
-<div><span id="four" style="font-weight: 400;">Hello, World</span></div>
-<div><span id="five" style="font-weight: 500;">Hello, World</span></div>
-<div><span id="six" style="font-weight: 600;">Hello, World</span></div>
-<div><span id="seven" style="font-weight: 700;">Hello, World</span></div>
-<div><span id="eight" style="font-weight: 800;">Hello, World</span></div>
-<div><span id="nine" style="font-weight: 900;">Hello, World</span></div>
+<span id="six" style="font-weight: 600;">Hello, World</span><span id="nine" style="font-weight: 900;">Hello, World</span>
</div>
<script>
description("This test makes sure that extra-heavy weights of the system font can be achieved.");
-var _one_ = document.getElementById("one");
-var two = document.getElementById("two");
-var three = document.getElementById("three");
-var four = document.getElementById("four");
-var five = document.getElementById("five");
var six = document.getElementById("six");
-var seven = document.getElementById("seven");
-var eight = document.getElementById("eight");
var nine = document.getElementById("nine");
-shouldNotBe("four.offsetWidth", "three.offsetWidth");
-shouldNotBe("five.offsetWidth", "four.offsetWidth");
-shouldNotBe("six.offsetWidth", "five.offsetWidth");
-shouldNotBe("eight.offsetWidth", "seven.offsetWidth");
+shouldNotBe("six.offsetWidth", "nine.offsetWidth");
</script>
<script src=""
</body>
Deleted: branches/safari-602-branch/LayoutTests/platform/ios-simulator/fast/text/system-font-weight-expected.txt (204137 => 204138)
--- branches/safari-602-branch/LayoutTests/platform/ios-simulator/fast/text/system-font-weight-expected.txt 2016-08-04 20:59:49 UTC (rev 204137)
+++ branches/safari-602-branch/LayoutTests/platform/ios-simulator/fast/text/system-font-weight-expected.txt 2016-08-04 21:05:04 UTC (rev 204138)
@@ -1,21 +0,0 @@
-This test makes sure that extra-heavy weights of the system font can be achieved.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS four.offsetWidth is not three.offsetWidth
-FAIL five.offsetWidth should not be 104.
-PASS six.offsetWidth is not five.offsetWidth
-FAIL eight.offsetWidth should not be 108.
-PASS successfullyParsed is true
-
-TEST COMPLETE
-Hello, World
-Hello, World
-Hello, World
-Hello, World
-Hello, World
-Hello, World
-Hello, World
-Hello, World
-Hello, World
Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (204137 => 204138)
--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-08-04 20:59:49 UTC (rev 204137)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-08-04 21:05:04 UTC (rev 204138)
@@ -1,5 +1,9 @@
2016-08-04 Babak Shafiei <bshaf...@apple.com>
+ Rollout r204132. rdar://problem/27685273
+
+2016-08-04 Babak Shafiei <bshaf...@apple.com>
+
Merge r204107. rdar://problem/27685273
2016-08-03 Myles C. Maxfield <mmaxfi...@apple.com>
Modified: branches/safari-602-branch/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm (204137 => 204138)
--- branches/safari-602-branch/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm 2016-08-04 20:59:49 UTC (rev 204137)
+++ branches/safari-602-branch/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm 2016-08-04 21:05:04 UTC (rev 204138)
@@ -155,17 +155,7 @@
RetainPtr<NSMutableDictionary> traitsDictionary = adoptNS([[NSMutableDictionary alloc] init]);
ASSERT(weight >= FontWeight100 && weight <= FontWeight900);
- float ctWeights[] = {
- static_cast<float>(kCTFontWeightUltraLight),
- static_cast<float>(kCTFontWeightThin),
- static_cast<float>(kCTFontWeightLight),
- static_cast<float>(kCTFontWeightRegular),
- static_cast<float>(kCTFontWeightMedium),
- static_cast<float>(kCTFontWeightSemibold),
- static_cast<float>(kCTFontWeightBold),
- static_cast<float>(kCTFontWeightHeavy),
- static_cast<float>(kCTFontWeightBlack)
- };
+ float ctWeights[] = { -0.7, -0.5, -0.23, 0, 0.2, 0.3, 0.4, 0.6, 0.8 };
[traitsDictionary setObject:[NSNumber numberWithFloat:ctWeights[weight]] forKey:static_cast<NSString *>(kCTFontWeightTrait)];
[traitsDictionary setObject:@YES forKey:static_cast<NSString *>(kCTFontUIFontDesignTrait)];
