Changeset 243637 in webkit

Timestamp:

Mar 28, 2019, 7:26:47 PM (7 years ago)

Author:

mmaxfield@apple.com

Message:

FontFace constructor throws an exception when there is a name which starts with a number
​https://bugs.webkit.org/show_bug.cgi?id=196232
<rdar://problem/49293978>

Reviewed by Ryosuke Niwa.

Source/WebCore:

We were technically following the spec, but Chrome and Firefox are both consistent and it was making a website break.
This is just a short-term fix until the underlying ​https://bugs.webkit.org/show_bug.cgi?id=196381 is fixed.

Test: fast/text/font-face-family.html

• css/FontFace.cpp:

(WebCore::FontFace::setFamily):

LayoutTests:

• fast/text/font-face-family-expected.txt: Added.
• fast/text/font-face-family.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/font-face-family-expected.txt (added)
• LayoutTests/fast/text/font-face-family.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/FontFace.cpp (modified) (2 diffs)
• Source/WebCore/css/parser/CSSPropertyParser.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-03-28  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        FontFace constructor throws an exception when there is a name which starts with a number
+        https://bugs.webkit.org/show_bug.cgi?id=196232
+        <rdar://problem/49293978>
+
+        Reviewed by Ryosuke Niwa.
+
+        * fast/text/font-face-family-expected.txt: Added.
+        * fast/text/font-face-family.html: Added.
+
 2019-03-28  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-03-28  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        FontFace constructor throws an exception when there is a name which starts with a number
+        https://bugs.webkit.org/show_bug.cgi?id=196232
+        <rdar://problem/49293978>
+
+        Reviewed by Ryosuke Niwa.
+
+        We were technically following the spec, but Chrome and Firefox are both consistent and it was making a website break.
+        This is just a short-term fix until the underlying https://bugs.webkit.org/show_bug.cgi?id=196381 is fixed.
+
+        Test: fast/text/font-face-family.html
+
+        * css/FontFace.cpp:
+        (WebCore::FontFace::setFamily):
+
 2019-03-28  Justin Fan  <justin_fan@apple.com>
 

trunk/Source/WebCore/css/FontFace.cpp

@@ -154 +154 @@
         return Exception { SyntaxError };
 
-    bool success = false;
-    if (auto value = parseString(family, CSSPropertyFontFamily))
-        success = m_backing->setFamilies(*value);
+    // FIXME: https://bugs.webkit.org/show_bug.cgi?id=196381 Don't use a list here.
+    // See consumeFontFamilyDescriptor() in CSSPropertyParser.cpp for why we're using it.
+    auto list = CSSValueList::createCommaSeparated();
+    list->append(CSSValuePool::singleton().createFontFamilyValue(family));
+    bool success = m_backing->setFamilies(list);
     if (!success)
         return Exception { SyntaxError };
@@ -294 +296 @@
 {
     m_backing->updateStyleIfNeeded();
+
+    // FIXME: https://bugs.webkit.org/show_bug.cgi?id=196381 This is only here because CSSFontFace erroneously uses a list of values instead of a single value.
+    // See consumeFontFamilyDescriptor() in CSSPropertyParser.cpp.
+    if (m_backing->families()->length() == 1) {
+        if (m_backing->families()->item(0)) {
+            auto& item = *m_backing->families()->item(0);
+            if (item.isPrimitiveValue()) {
+                auto& primitiveValue = downcast<CSSPrimitiveValue>(item);
+                if (primitiveValue.isFontFamily()) {
+                    auto& fontFamily = primitiveValue.fontFamily();
+                    return fontFamily.familyName;
+                }
+            }
+        }
+    }
     return m_backing->families()->cssText();
 }

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

@@ -1088 +1088 @@
 static RefPtr<CSSValueList> consumeFontFamilyDescriptor(CSSParserTokenRange& range)
 {
-    // FIXME-NEWPARSER: For compatibility with the old parser, we have to make
+    // FIXME-NEWPARSER: https://bugs.webkit.org/show_bug.cgi?id=196381 For compatibility with the old parser, we have to make
     // a list here, even though the list always contains only a single family name.
     // Once the old parser is gone, we can delete this function, make the caller