Diff
Modified: trunk/LayoutTests/ChangeLog (197214 => 197215)
--- trunk/LayoutTests/ChangeLog 2016-02-26 23:33:45 UTC (rev 197214)
+++ trunk/LayoutTests/ChangeLog 2016-02-26 23:39:45 UTC (rev 197215)
@@ -1,3 +1,18 @@
+2016-02-26 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r197160.
+ https://bugs.webkit.org/show_bug.cgi?id=154757
+
+ This change causes editing/mac/attributed-string/font-
+ size.html to fail on El Capitan WK1 (Requested by ryanhaddad
+ on #webkit).
+
+ Reverted changeset:
+
+ "Font size computed style is innaccurate"
+ https://bugs.webkit.org/show_bug.cgi?id=154705
+ http://trac.webkit.org/changeset/197160
+
2016-02-26 Ryan Haddad <[email protected]>
Skip js/basic-map.html on Mac since it is already run in JSC tests
Modified: trunk/LayoutTests/css3/calc/font-size-fractional-expected.txt (197214 => 197215)
--- trunk/LayoutTests/css3/calc/font-size-fractional-expected.txt 2016-02-26 23:33:45 UTC (rev 197214)
+++ trunk/LayoutTests/css3/calc/font-size-fractional-expected.txt 2016-02-26 23:39:45 UTC (rev 197215)
@@ -4,7 +4,7 @@
PASS getComputedStyle(document.getElementById("calc-reduce"), null).lineHeight is "24px"
-PASS getComputedStyle(document.getElementById("calc-reduce"), null).fontSize is "9.600000381469727px"
+PASS getComputedStyle(document.getElementById("calc-reduce"), null).fontSize is "10px"
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/css3/viewport-percentage-lengths/viewport-percentage-lengths-relative-font-size-expected.txt (197214 => 197215)
--- trunk/LayoutTests/css3/viewport-percentage-lengths/viewport-percentage-lengths-relative-font-size-expected.txt 2016-02-26 23:33:45 UTC (rev 197214)
+++ trunk/LayoutTests/css3/viewport-percentage-lengths/viewport-percentage-lengths-relative-font-size-expected.txt 2016-02-26 23:39:45 UTC (rev 197215)
@@ -15,17 +15,17 @@
PASS innerHeight is 600
PASS getComputedStyle(container).fontSize is "45px"
PASS getComputedStyle(ems).fontSize is "180px"
-PASS getComputedStyle(percent).fontSize is "22.5px"
+PASS getComputedStyle(percent).fontSize is "23px"
PASS innerWidth is 900
PASS innerHeight is 640
PASS getComputedStyle(container).fontSize is "45px"
PASS getComputedStyle(ems).fontSize is "180px"
-PASS getComputedStyle(percent).fontSize is "22.5px"
+PASS getComputedStyle(percent).fontSize is "23px"
PASS innerWidth is 500
PASS innerHeight is 640
PASS getComputedStyle(container).fontSize is "25px"
PASS getComputedStyle(ems).fontSize is "100px"
-PASS getComputedStyle(percent).fontSize is "12.5px"
+PASS getComputedStyle(percent).fontSize is "13px"
PASS innerWidth is 800
PASS innerHeight is 600
PASS getComputedStyle(container).fontSize is "40px"
Modified: trunk/LayoutTests/css3/viewport-percentage-lengths/viewport-percentage-lengths-relative-font-size.html (197214 => 197215)
--- trunk/LayoutTests/css3/viewport-percentage-lengths/viewport-percentage-lengths-relative-font-size.html 2016-02-26 23:33:45 UTC (rev 197214)
+++ trunk/LayoutTests/css3/viewport-percentage-lengths/viewport-percentage-lengths-relative-font-size.html 2016-02-26 23:39:45 UTC (rev 197215)
@@ -21,9 +21,9 @@
<script>
description("Test that relative font sizes work when the parent is in viewport units.");
standardResizeTest(function () {
- shouldBeEqualToString("getComputedStyle(container).fontSize", (innerWidth / 20) + "px");
- shouldBeEqualToString("getComputedStyle(ems).fontSize", (innerWidth / 5) + "px");
- shouldBeEqualToString("getComputedStyle(percent).fontSize", (innerWidth / 40) + "px");
+ shouldBeEqualToString("getComputedStyle(container).fontSize", Math.round(innerWidth / 20) + "px");
+ shouldBeEqualToString("getComputedStyle(ems).fontSize", Math.round(innerWidth / 5) + "px");
+ shouldBeEqualToString("getComputedStyle(percent).fontSize", Math.round(innerWidth / 40) + "px");
});
</script>
<script src=""
Modified: trunk/LayoutTests/editing/mac/attributed-string/font-size-expected.txt (197214 => 197215)
--- trunk/LayoutTests/editing/mac/attributed-string/font-size-expected.txt 2016-02-26 23:33:45 UTC (rev 197214)
+++ trunk/LayoutTests/editing/mac/attributed-string/font-size-expected.txt 2016-02-26 23:39:45 UTC (rev 197215)
@@ -34,7 +34,7 @@
HeaderLevel: 0
[small element]
NSColor: #000000 (NSDeviceRGBColorSpace)
- NSFont: Times-Roman 13.33 pt.
+ NSFont: Times-Roman 13.00 pt.
NSKern: 0pt
NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
NSStrokeWidth: 0
@@ -385,7 +385,7 @@
HeaderLevel: 0
[ ]
NSColor: #000000 (NSDeviceRGBColorSpace)
- NSFont: Times-Roman 16.67 pt.
+ NSFont: Times-Roman 16.00 pt.
NSKern: 0pt
NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
NSStrokeWidth: 0
Modified: trunk/LayoutTests/editing/mac/attributed-string/vertical-align-expected.txt (197214 => 197215)
--- trunk/LayoutTests/editing/mac/attributed-string/vertical-align-expected.txt 2016-02-26 23:33:45 UTC (rev 197214)
+++ trunk/LayoutTests/editing/mac/attributed-string/vertical-align-expected.txt 2016-02-26 23:39:45 UTC (rev 197215)
@@ -29,7 +29,7 @@
HeaderLevel: 0
[sup element]
NSColor: #000000 (NSDeviceRGBColorSpace)
- NSFont: Times-Roman 13.33 pt.
+ NSFont: Times-Roman 13.00 pt.
NSKern: 0pt
NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
NSStrokeWidth: 0
@@ -84,7 +84,7 @@
HeaderLevel: 0
[sub element]
NSColor: #000000 (NSDeviceRGBColorSpace)
- NSFont: Times-Roman 13.33 pt.
+ NSFont: Times-Roman 13.00 pt.
NSKern: 0pt
NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
NSStrokeWidth: 0
Modified: trunk/LayoutTests/platform/mac-mavericks/editing/mac/attributed-string/font-size-expected.txt (197214 => 197215)
--- trunk/LayoutTests/platform/mac-mavericks/editing/mac/attributed-string/font-size-expected.txt 2016-02-26 23:33:45 UTC (rev 197214)
+++ trunk/LayoutTests/platform/mac-mavericks/editing/mac/attributed-string/font-size-expected.txt 2016-02-26 23:39:45 UTC (rev 197215)
@@ -31,7 +31,7 @@
TighteningFactor: 0.05
HeaderLevel: 0
[small element]
- NSFont: Times-Roman 13.33 pt.
+ NSFont: Times-Roman 13.00 pt.
NSParagraphStyle:
Alignment 4
LineSpacing: 0
@@ -325,7 +325,7 @@
TighteningFactor: 0.05
HeaderLevel: 0
[5pt]
- NSFont: Times-Roman 6.67 pt.
+ NSFont: Times-Roman 7.00 pt.
NSParagraphStyle:
Alignment 4
LineSpacing: 0
Modified: trunk/LayoutTests/platform/mac-mavericks/editing/mac/attributed-string/vertical-align-expected.txt (197214 => 197215)
--- trunk/LayoutTests/platform/mac-mavericks/editing/mac/attributed-string/vertical-align-expected.txt 2016-02-26 23:33:45 UTC (rev 197214)
+++ trunk/LayoutTests/platform/mac-mavericks/editing/mac/attributed-string/vertical-align-expected.txt 2016-02-26 23:39:45 UTC (rev 197215)
@@ -26,7 +26,7 @@
TighteningFactor: 0.05
HeaderLevel: 0
[sup element]
- NSFont: Times-Roman 13.33 pt.
+ NSFont: Times-Roman 13.00 pt.
NSSuperScript: 1
NSParagraphStyle:
Alignment 4
@@ -69,7 +69,7 @@
TighteningFactor: 0.05
HeaderLevel: 0
[sub element]
- NSFont: Times-Roman 13.33 pt.
+ NSFont: Times-Roman 13.00 pt.
NSSuperScript: -1
NSParagraphStyle:
Alignment 4
Modified: trunk/LayoutTests/platform/mac-yosemite/editing/mac/attributed-string/font-size-expected.txt (197214 => 197215)
--- trunk/LayoutTests/platform/mac-yosemite/editing/mac/attributed-string/font-size-expected.txt 2016-02-26 23:33:45 UTC (rev 197214)
+++ trunk/LayoutTests/platform/mac-yosemite/editing/mac/attributed-string/font-size-expected.txt 2016-02-26 23:39:45 UTC (rev 197215)
@@ -32,7 +32,7 @@
HeaderLevel: 0
[small element]
NSColor: #000000 (NSDeviceRGBColorSpace)
- NSFont: Times-Roman 13.33 pt.
+ NSFont: Times-Roman 13.00 pt.
NSKern: 0pt
NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
NSStrokeWidth: 0
@@ -382,7 +382,7 @@
HeaderLevel: 0
[5pt]
NSColor: #000000 (NSDeviceRGBColorSpace)
- NSFont: Times-Roman 6.67 pt.
+ NSFont: Times-Roman 7.00 pt.
NSKern: 0pt
NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
NSStrokeWidth: 0
Modified: trunk/LayoutTests/platform/mac-yosemite/editing/mac/attributed-string/vertical-align-expected.txt (197214 => 197215)
--- trunk/LayoutTests/platform/mac-yosemite/editing/mac/attributed-string/vertical-align-expected.txt 2016-02-26 23:33:45 UTC (rev 197214)
+++ trunk/LayoutTests/platform/mac-yosemite/editing/mac/attributed-string/vertical-align-expected.txt 2016-02-26 23:39:45 UTC (rev 197215)
@@ -27,7 +27,7 @@
HeaderLevel: 0
[sup element]
NSColor: #000000 (NSDeviceRGBColorSpace)
- NSFont: Times-Roman 13.33 pt.
+ NSFont: Times-Roman 13.00 pt.
NSKern: 0pt
NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
NSStrokeWidth: 0
@@ -78,7 +78,7 @@
HeaderLevel: 0
[sub element]
NSColor: #000000 (NSDeviceRGBColorSpace)
- NSFont: Times-Roman 13.33 pt.
+ NSFont: Times-Roman 13.00 pt.
NSKern: 0pt
NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
NSStrokeWidth: 0
Modified: trunk/Source/WebCore/ChangeLog (197214 => 197215)
--- trunk/Source/WebCore/ChangeLog 2016-02-26 23:33:45 UTC (rev 197214)
+++ trunk/Source/WebCore/ChangeLog 2016-02-26 23:39:45 UTC (rev 197215)
@@ -1,3 +1,18 @@
+2016-02-26 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r197160.
+ https://bugs.webkit.org/show_bug.cgi?id=154757
+
+ This change causes editing/mac/attributed-string/font-
+ size.html to fail on El Capitan WK1 (Requested by ryanhaddad
+ on #webkit).
+
+ Reverted changeset:
+
+ "Font size computed style is innaccurate"
+ https://bugs.webkit.org/show_bug.cgi?id=154705
+ http://trac.webkit.org/changeset/197160
+
2016-02-26 Gavin Barraclough <[email protected]>
Page TimerAlignmentIntervalIncrease mechanism should have upper limit
Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (197214 => 197215)
--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2016-02-26 23:33:45 UTC (rev 197214)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2016-02-26 23:39:45 UTC (rev 197215)
@@ -1578,7 +1578,7 @@
if (CSSValueID sizeIdentifier = style->fontDescription().keywordSizeAsIdentifier())
return CSSValuePool::singleton().createIdentifierValue(sizeIdentifier);
- return zoomAdjustedPixelValue(style->fontDescription().computedSize(), *style);
+ return zoomAdjustedPixelValue(style->fontDescription().computedPixelSize(), *style);
}
bool ComputedStyleExtractor::useFixedFontDefaultSize() const
@@ -1830,7 +1830,7 @@
static Ref<CSSPrimitiveValue> fontSizeFromStyle(RenderStyle& style)
{
- return zoomAdjustedPixelValue(style.fontDescription().computedSize(), style);
+ return zoomAdjustedPixelValue(style.fontDescription().computedPixelSize(), style);
}
static Ref<CSSPrimitiveValue> fontStyleFromStyle(RenderStyle* style)
