Title: [208697] trunk/Source/WebCore
Revision
208697
Author
[email protected]
Date
2016-11-14 11:16:02 -0800 (Mon, 14 Nov 2016)

Log Message

[CSS Parser] Support percentages in word-spacing
https://bugs.webkit.org/show_bug.cgi?id=164721

Reviewed by Dean Jackson.

* css/parser/CSSPropertyParser.cpp:
(WebCore::consumeLetterSpacing):
(WebCore::consumeWordSpacing):
(WebCore::consumeSpacing): Deleted.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (208696 => 208697)


--- trunk/Source/WebCore/ChangeLog	2016-11-14 19:06:35 UTC (rev 208696)
+++ trunk/Source/WebCore/ChangeLog	2016-11-14 19:16:02 UTC (rev 208697)
@@ -1,3 +1,15 @@
+2016-11-14  Dave Hyatt  <[email protected]>
+
+        [CSS Parser] Support percentages in word-spacing
+        https://bugs.webkit.org/show_bug.cgi?id=164721
+
+        Reviewed by Dean Jackson.
+
+        * css/parser/CSSPropertyParser.cpp:
+        (WebCore::consumeLetterSpacing):
+        (WebCore::consumeWordSpacing):
+        (WebCore::consumeSpacing): Deleted.
+
 2016-11-14  Joanmarie Diggs  <[email protected]>
 
         AX: In ARIA 1.1, the implicit value for aria-level on headings is 2

Modified: trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp (208696 => 208697)


--- trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp	2016-11-14 19:06:35 UTC (rev 208696)
+++ trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp	2016-11-14 19:16:02 UTC (rev 208697)
@@ -787,14 +787,22 @@
     return list;
 }
 
-static RefPtr<CSSValue> consumeSpacing(CSSParserTokenRange& range, CSSParserMode cssParserMode)
+static RefPtr<CSSValue> consumeLetterSpacing(CSSParserTokenRange& range, CSSParserMode cssParserMode)
 {
     if (range.peek().id() == CSSValueNormal)
         return consumeIdent(range);
-    // FIXME: allow <percentage>s in word-spacing.
+    
     return consumeLength(range, cssParserMode, ValueRangeAll, UnitlessQuirk::Allow);
 }
 
+static RefPtr<CSSValue> consumeWordSpacing(CSSParserTokenRange& range, CSSParserMode cssParserMode)
+{
+    if (range.peek().id() == CSSValueNormal)
+        return consumeIdent(range);
+    
+    return consumeLengthOrPercent(range, cssParserMode, ValueRangeAll, UnitlessQuirk::Allow);
+}
+    
 static RefPtr<CSSValue> consumeTabSize(CSSParserTokenRange& range, CSSParserMode cssParserMode)
 {
     RefPtr<CSSPrimitiveValue> parsedValue = consumeInteger(range, 0);
@@ -3448,8 +3456,9 @@
     case CSSPropertyFontWeight:
         return consumeFontWeight(m_range);
     case CSSPropertyLetterSpacing:
+        return consumeLetterSpacing(m_range, m_context.mode);
     case CSSPropertyWordSpacing:
-        return consumeSpacing(m_range, m_context.mode);
+        return consumeWordSpacing(m_range, m_context.mode);
     case CSSPropertyTabSize:
         return consumeTabSize(m_range, m_context.mode);
 #if ENABLE(TEXT_AUTOSIZING)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to