Changeset 244817 in webkit

Timestamp:

Apr 30, 2019, 6:14:37 PM (7 years ago)

Author:

mmaxfield@apple.com

Message:

font-weight: 1000 is not parsed successfully
​https://bugs.webkit.org/show_bug.cgi?id=197427

Reviewed by Dean Jackson.

Source/WebCore:

The spec says:
"Only values greater than or equal to 1, and less than or equal to 1000, are valid"

This change brings us in-line with all the other browsers.

Test: fast/text/font-weight-1-1000.html

• css/parser/CSSPropertyParserHelpers.cpp:

(WebCore::CSSPropertyParserHelpers::consumeFontWeightNumber):

LayoutTests:

• platform/win/TestExpectations: Windows disables variation fonts, so requires values to be divisible by 100
• fast/text/font-weight-1-1000-expected.txt: Added.
• fast/text/font-weight-1-1000.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/font-weight-1-1000-expected.txt (added)
• LayoutTests/fast/text/font-weight-1-1000.html (added)
• LayoutTests/platform/win/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-04-30  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        font-weight: 1000 is not parsed successfully
+        https://bugs.webkit.org/show_bug.cgi?id=197427
+
+        Reviewed by Dean Jackson.
+
+        * platform/win/TestExpectations: Windows disables variation fonts, so requires values to be divisible by 100
+        * fast/text/font-weight-1-1000-expected.txt: Added.
+        * fast/text/font-weight-1-1000.html: Added.
+
 2019-04-30  Commit Queue  <commit-queue@webkit.org>
 

trunk/LayoutTests/platform/win/TestExpectations

@@ -3598 +3598 @@
 transitions/clip-path-path-transitions.html [ Failure ]
 legacy-animation-engine/transitions/clip-path-path-transitions.html [ Failure ]
+fast/text/font-weight-1-1000.html [ Failure ]
 # Unexpected image-only failures tracked in webkit.org/b/172437.
 editing/selection/update-selection-by-style-change.html [ ImageOnlyFailure ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-04-30  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        font-weight: 1000 is not parsed successfully
+        https://bugs.webkit.org/show_bug.cgi?id=197427
+
+        Reviewed by Dean Jackson.
+
+        The spec says:
+        "Only values greater than or equal to 1, and less than or equal to 1000, are valid"
+
+        This change brings us in-line with all the other browsers.
+
+        Test: fast/text/font-weight-1-1000.html
+
+        * css/parser/CSSPropertyParserHelpers.cpp:
+        (WebCore::CSSPropertyParserHelpers::consumeFontWeightNumber):
+
 2019-04-30  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp

@@ -231 +231 @@
     // Values less than or equal to 0 or greater than or equal to 1000 are parse errors.
     auto& token = range.peek();
-    if (token.type() == NumberToken && token.numericValue() > 0 && token.numericValue() < 1000
+    if (token.type() == NumberToken && token.numericValue() >= 1 && token.numericValue() <= 1000
 #if !ENABLE(VARIATION_FONTS)
         && token.numericValueType() == IntegerValueType && divisibleBy100(token.numericValue())