Title: [183348] trunk
- Revision
- 183348
- Author
- mmaxfi...@apple.com
- Date
- 2015-04-25 22:20:19 -0700 (Sat, 25 Apr 2015)
Log Message
font-synthesis's initial value is "style weight"
https://bugs.webkit.org/show_bug.cgi?id=144195
Reviewed by Darin Adler.
Source/WebCore:
Updated fast/css3-text/font-synthesis-parse.html.
* rendering/style/RenderStyle.h:
LayoutTests:
Updating test.
* fast/css3-text/font-synthesis-parse-expected.txt:
* fast/css3-text/font-synthesis-parse.html:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (183347 => 183348)
--- trunk/LayoutTests/ChangeLog 2015-04-26 04:16:27 UTC (rev 183347)
+++ trunk/LayoutTests/ChangeLog 2015-04-26 05:20:19 UTC (rev 183348)
@@ -1,3 +1,15 @@
+2015-04-25 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ font-synthesis's initial value is "style weight"
+ https://bugs.webkit.org/show_bug.cgi?id=144195
+
+ Reviewed by Darin Adler.
+
+ Updating test.
+
+ * fast/css3-text/font-synthesis-parse-expected.txt:
+ * fast/css3-text/font-synthesis-parse.html:
+
2015-04-25 Jordan Harband <ljh...@gmail.com>
Set#keys !== Set#values
Modified: trunk/LayoutTests/fast/css3-text/font-synthesis-parse-expected.txt (183347 => 183348)
--- trunk/LayoutTests/fast/css3-text/font-synthesis-parse-expected.txt 2015-04-26 04:16:27 UTC (rev 183347)
+++ trunk/LayoutTests/fast/css3-text/font-synthesis-parse-expected.txt 2015-04-26 05:20:19 UTC (rev 183348)
@@ -5,7 +5,7 @@
PASS cssRule.type is cssRule.STYLE_RULE
PASS declaration.length is 1
PASS declaration.getPropertyValue('font-synthesis') is "initial"
-PASS computedStyle.getPropertyCSSValue('font-synthesis').cssText is "none"
+PASS computedStyle.getPropertyCSSValue('font-synthesis').cssText is "style weight"
PASS cssRule.type is cssRule.STYLE_RULE
PASS declaration.length is 1
PASS declaration.getPropertyValue('font-synthesis') is "weight"
Modified: trunk/LayoutTests/fast/css3-text/font-synthesis-parse.html (183347 => 183348)
--- trunk/LayoutTests/fast/css3-text/font-synthesis-parse.html 2015-04-26 04:16:27 UTC (rev 183347)
+++ trunk/LayoutTests/fast/css3-text/font-synthesis-parse.html 2015-04-26 05:20:19 UTC (rev 183348)
@@ -18,14 +18,14 @@
stylesheet.deleteRule(0);
}
- function testInitialIsNone(stylesheet, target) {
+ function testInitialIsBoth(stylesheet, target) {
cssRule = stylesheet.cssRules.item(0);
shouldBe("cssRule.type", "cssRule.STYLE_RULE");
declaration = cssRule.style;
shouldBe("declaration.length", "1");
shouldBeEqualToString("declaration.getPropertyValue('font-synthesis')", "initial");
computedStyle = window.getComputedStyle(target, null);
- shouldBeEqualToString("computedStyle.getPropertyCSSValue('font-synthesis').cssText", "none");
+ shouldBeEqualToString("computedStyle.getPropertyCSSValue('font-synthesis').cssText", "style weight");
stylesheet.deleteRule(0);
}
@@ -82,7 +82,7 @@
testEmptyIsNone(stylesheet, target);
stylesheet.insertRule("#p { font-synthesis: initial; }", 0);
- testInitialIsNone(stylesheet, target);
+ testInitialIsBoth(stylesheet, target);
stylesheet.insertRule("#p { font-synthesis: weight }", 0);
testWeight(stylesheet, target);
Modified: trunk/Source/WebCore/ChangeLog (183347 => 183348)
--- trunk/Source/WebCore/ChangeLog 2015-04-26 04:16:27 UTC (rev 183347)
+++ trunk/Source/WebCore/ChangeLog 2015-04-26 05:20:19 UTC (rev 183348)
@@ -1,3 +1,14 @@
+2015-04-25 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ font-synthesis's initial value is "style weight"
+ https://bugs.webkit.org/show_bug.cgi?id=144195
+
+ Reviewed by Darin Adler.
+
+ Updated fast/css3-text/font-synthesis-parse.html.
+
+ * rendering/style/RenderStyle.h:
+
2015-04-25 Commit Queue <commit-qu...@webkit.org>
Unreviewed, rolling out r183305.
Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (183347 => 183348)
--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2015-04-26 04:16:27 UTC (rev 183347)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2015-04-26 05:20:19 UTC (rev 183348)
@@ -2064,7 +2064,7 @@
static BlendMode initialBlendMode() { return BlendModeNormal; }
static Isolation initialIsolation() { return IsolationAuto; }
#endif
- static FontSynthesis initialFontSynthesis() { return FontSynthesisNone; }
+ static FontSynthesis initialFontSynthesis() { return FontSynthesisStyle | FontSynthesisWeight; }
static ptrdiff_t noninheritedFlagsMemoryOffset() { return OBJECT_OFFSETOF(RenderStyle, noninherited_flags); }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
