Split out String, URI and CustomIdent from CSSPrimitiveValue

Source/core/css/FontFace.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 22 matching lines @@
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "bindings/core/v8/UnionTypesCore.h"
 #include "core/CSSValueKeywords.h"
 #include "core/css/BinaryDataFontFaceSource.h"
 #include "core/css/CSSFontFace.h"
 #include "core/css/CSSFontFaceSrcValue.h"
 #include "core/css/CSSFontSelector.h"
 #include "core/css/CSSPrimitiveValue.h"
+#include "core/css/CSSStringValue.h"
 #include "core/css/CSSUnicodeRangeValue.h"
 #include "core/css/CSSValueList.h"
 #include "core/css/FontFaceDescriptors.h"
 #include "core/css/LocalFontFaceSource.h"
 #include "core/css/RemoteFontFaceSource.h"
 #include "core/css/StylePropertySet.h"
 #include "core/css/StyleRule.h"
 #include "core/css/parser/CSSParser.h"
 #include "core/dom/DOMArrayBuffer.h"
 #include "core/dom/DOMArrayBufferView.h"
@@ skipping 216 matching lines @@
     }
     return true;
 }
 
 bool FontFace::setFamilyValue(CSSValueList* familyList)
 {
     // The font-family descriptor has to have exactly one family name.
     if (familyList->length() != 1)
         return false;
 
-    CSSPrimitiveValue* familyValue = toCSSPrimitiveValue(familyList->item(0));
+    CSSValue* familyValue = familyList->item(0);
     AtomicString family;
-    if (familyValue->isCustomIdent()) {
-        family = AtomicString(familyValue->getStringValue());
-    } else if (familyValue->isValueID()) {
+    if (familyValue->isIdentValue()) {
+        family = AtomicString(toCSSIdentValue(familyValue)->getStringValue());
+    } else if (familyValue->isPrimitiveValue() && toCSSPrimitiveValue(familyValue)->isValueID()) {

[Timothy Loh, 2015/09/10 07:36:51]

This check probably isn't needed (and would be wrong if it were, since the fail
case is returning false).

[sashab, 2015/09/17 04:19:49]

Fair enough, now it will ASSERT fail if its not a primitive value, same as
before.

         // 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 (familyValue->getValueID()) {
+        switch (toCSSPrimitiveValue(familyValue)->getValueID()) {
         case CSSValueSerif:
             family =  FontFamilyNames::webkit_serif;
             break;
         case CSSValueSansSerif:
             family =  FontFamilyNames::webkit_sans_serif;
             break;
         case CSSValueCursive:
             family =  FontFamilyNames::webkit_cursive;
             break;
         case CSSValueFantasy:
@@ skipping 320 matching lines @@
 {
     return m_cssFontFace->hadBlankText();
 }
 
 bool FontFace::hasPendingActivity() const
 {
     return m_status == Loading && executionContext() && !executionContext()->activeDOMObjectsAreStopped();
 }
 
 } // namespace blink