| Index: Source/core/css/CSSFontSelector.cpp
|
| diff --git a/Source/core/css/CSSFontSelector.cpp b/Source/core/css/CSSFontSelector.cpp
|
| index 977d9055ce674b19d5d96137fa67174da6538b39..443ed66881aa79e23b3b89a3a4f07c7413fd616c 100644
|
| --- a/Source/core/css/CSSFontSelector.cpp
|
| +++ b/Source/core/css/CSSFontSelector.cpp
|
| @@ -106,7 +106,7 @@ void CSSFontSelector::addFontFaceRule(const StyleRuleFontFace* fontFaceRule)
|
| if (!fontStyle->isPrimitiveValue())
|
| return;
|
|
|
| - switch (toCSSPrimitiveValue(fontStyle.get())->getIdent()) {
|
| + switch (toCSSPrimitiveValue(fontStyle.get())->getValueID()) {
|
| case CSSValueNormal:
|
| traitsMask |= FontStyleNormalMask;
|
| break;
|
| @@ -124,7 +124,7 @@ void CSSFontSelector::addFontFaceRule(const StyleRuleFontFace* fontFaceRule)
|
| if (!fontWeight->isPrimitiveValue())
|
| return;
|
|
|
| - switch (toCSSPrimitiveValue(fontWeight.get())->getIdent()) {
|
| + switch (toCSSPrimitiveValue(fontWeight.get())->getValueID()) {
|
| case CSSValueBold:
|
| case CSSValue700:
|
| traitsMask |= FontWeight700Mask;
|
| @@ -175,7 +175,7 @@ void CSSFontSelector::addFontFaceRule(const StyleRuleFontFace* fontFaceRule)
|
| return;
|
|
|
| for (unsigned i = 0; i < numVariants; ++i) {
|
| - switch (toCSSPrimitiveValue(variantList->itemWithoutBoundsCheck(i))->getIdent()) {
|
| + switch (toCSSPrimitiveValue(variantList->itemWithoutBoundsCheck(i))->getValueID()) {
|
| case CSSValueNormal:
|
| traitsMask |= FontVariantNormalMask;
|
| break;
|
| @@ -255,12 +255,12 @@ void CSSFontSelector::addFontFaceRule(const StyleRuleFontFace* fontFaceRule)
|
| for (int i = 0; i < familyLength; i++) {
|
| CSSPrimitiveValue* item = toCSSPrimitiveValue(familyList->itemWithoutBoundsCheck(i));
|
| String familyName;
|
| - if (item->isString())
|
| + if (item->isString()) {
|
| familyName = item->getStringValue();
|
| - else if (item->isIdent()) {
|
| + } else if (item->isValueID()) {
|
| // We need to use the raw text for all the generic family types, since @font-face is a way of actually
|
| // defining what font to use for those types.
|
| - switch (item->getIdent()) {
|
| + switch (item->getValueID()) {
|
| case CSSValueSerif:
|
| familyName = serifFamily;
|
| break;
|
|
|