Changeset 209217 in webkit

Timestamp:

Dec 1, 2016 2:54:52 PM (7 years ago)

Author:

hyatt@apple.com

Message:

[CSS Parser] Only allow a single font-family in @font-face
​https://bugs.webkit.org/show_bug.cgi?id=165278

Reviewed by Zalan Bujtas.

• css/parser/CSSPropertyParser.cpp:

(WebCore::consumeFontFamilyDescriptor):
(WebCore::CSSPropertyParser::parseFontFaceDescriptor):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/parser/CSSPropertyParser.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-12-01  Dave Hyatt  <hyatt@apple.com>
+
+        [CSS Parser] Only allow a single font-family in @font-face
+        https://bugs.webkit.org/show_bug.cgi?id=165278
+
+        Reviewed by Zalan Bujtas.
+
+        * css/parser/CSSPropertyParser.cpp:
+        (WebCore::consumeFontFamilyDescriptor):
+        (WebCore::CSSPropertyParser::parseFontFaceDescriptor):
+
 2016-12-01  Beth Dakin  <bdakin@apple.com>
 

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

@@ -921 +921 @@
         }
     } while (consumeCommaIncludingWhitespace(range));
+    return list;
+}
+
+static RefPtr<CSSValueList> consumeFontFamilyDescriptor(CSSParserTokenRange& range)
+{
+    // FIXME-NEWPARSER: 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
+    // use consumeFamilyName instead, and then patch the @font-face code to
+    // not expect a list with a single name in it.
+    RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
+    RefPtr<CSSValue> parsedValue = consumeFamilyName(range);
+    if (parsedValue)
+        list->append(parsedValue.releaseNonNull());
+    
+    if (!range.atEnd() || !list->length())
+        return nullptr;
+
     return list;
 }
@@ -4077 +4095 @@
     switch (propId) {
     case CSSPropertyFontFamily:
-        parsedValue = consumeFontFamily(m_range);
+        parsedValue = consumeFontFamilyDescriptor(m_range);
         break;
     case CSSPropertySrc: // This is a list of urls or local references.