Restrict font-family in @font-face to <family-name>

third_party/WebKit/Source/core/css/FontFace.cpp

Index: third_party/WebKit/Source/core/css/FontFace.cpp
diff --git a/third_party/WebKit/Source/core/css/FontFace.cpp b/third_party/WebKit/Source/core/css/FontFace.cpp
index 6e096c0420eedcafa1ca78213b8192fe1aeb8b6c..91dee225068c2ce5022334c885f717dfd47367c6 100644
--- a/third_party/WebKit/Source/core/css/FontFace.cpp
+++ b/third_party/WebKit/Source/core/css/FontFace.cpp
@@ -112,7 +112,7 @@ PassRefPtrWillBeRawPtr<FontFace> FontFace::create(Document* document, const Styl
 
     // Obtain the font-family property and the src property. Both must be defined.
     RefPtrWillBeRawPtr<CSSValue> family = properties.getPropertyCSSValue(CSSPropertyFontFamily);
-    if (!family || !family->isValueList())
+    if (!family || !family->isPrimitiveValue())
         return nullptr;
     RefPtrWillBeRawPtr<CSSValue> src = properties.getPropertyCSSValue(CSSPropertySrc);
     if (!src || !src->isValueList())
@@ -120,7 +120,7 @@ PassRefPtrWillBeRawPtr<FontFace> FontFace::create(Document* document, const Styl
 
     RefPtrWillBeRawPtr<FontFace> fontFace = adoptRefWillBeNoop(new FontFace(document));
 
-    if (fontFace->setFamilyValue(toCSSValueList(family.get()))
+    if (fontFace->setFamilyValue(toCSSPrimitiveValue(family.get()))
         && fontFace->setPropertyFromStyle(properties, CSSPropertyFontStyle)
         && fontFace->setPropertyFromStyle(properties, CSSPropertyFontWeight)
         && fontFace->setPropertyFromStyle(properties, CSSPropertyFontStretch)
@@ -270,13 +270,8 @@ bool FontFace::setPropertyValue(PassRefPtrWillBeRawPtr<CSSValue> value, CSSPrope
     return true;
 }
 
-bool FontFace::setFamilyValue(CSSValueList* familyList)
+bool FontFace::setFamilyValue(CSSPrimitiveValue* familyValue)
 {
-    // The font-family descriptor has to have exactly one family name.
-    if (familyList->length() != 1)
-        return false;
-
-    CSSPrimitiveValue* familyValue = toCSSPrimitiveValue(familyList->item(0));
     AtomicString family;
     if (familyValue->isCustomIdent()) {
         family = AtomicString(familyValue->getStringValue());