Split CSSPrimitiveValue into CSSPrimitiveValue and CSSIdentifierValue

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

 /*
  * Copyright (C) 2004 Zack Rusin <zack@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
  * Copyright (C) 2011 Sencha, Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301  USA
  */
 
 #include "core/css/CSSComputedStyleDeclaration.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/CSSPropertyNames.h"
+#include "core/css/CSSIdentifierValue.h"
 #include "core/css/CSSPrimitiveValue.h"
 #include "core/css/CSSPrimitiveValueMappings.h"
 #include "core/css/CSSPropertyIDTemplates.h"
 #include "core/css/CSSPropertyMetadata.h"
 #include "core/css/CSSSelector.h"
 #include "core/css/CSSVariableData.h"
 #include "core/css/ComputedStyleCSSValueMapping.h"
 #include "core/css/parser/CSSParser.h"
 #include "core/css/resolver/StyleResolver.h"
 #include "core/dom/Document.h"
@@ skipping 195 matching lines @@
     return nullptr;
 
   m_node->document().updateStyleAndLayoutIgnorePendingStylesheets();
 
   const ComputedStyle* style =
       m_node->ensureComputedStyle(m_pseudoElementSpecifier);
   if (!style)
     return nullptr;
 
   if (int keywordSize = style->getFontDescription().keywordSize())
-    return CSSPrimitiveValue::createIdentifier(
+    return CSSIdentifierValue::create(
         cssIdentifierForFontSizeKeyword(keywordSize));
 
   return zoomAdjustedPixelValue(style->getFontDescription().computedPixelSize(),
                                 *style);
 }
 
 bool CSSComputedStyleDeclaration::isMonospaceFont() const {
   if (!m_node)
     return false;
 
@@ skipping 180 matching lines @@
 String CSSComputedStyleDeclaration::item(unsigned i) const {
   if (i >= length())
     return "";
 
   return getPropertyNameString(computableProperties()[i]);
 }
 
 bool CSSComputedStyleDeclaration::cssPropertyMatches(
     CSSPropertyID propertyID,
     const CSSValue* propertyValue) const {
-  if (propertyID == CSSPropertyFontSize && propertyValue->isPrimitiveValue() &&
+  if (propertyID == CSSPropertyFontSize &&
+      (propertyValue->isPrimitiveValue() ||
+       propertyValue->isIdentifierValue()) &&
       m_node) {
     m_node->document().updateStyleAndLayoutIgnorePendingStylesheets();
     const ComputedStyle* style =
         m_node->ensureComputedStyle(m_pseudoElementSpecifier);
     if (style && style->getFontDescription().keywordSize()) {
       CSSValueID sizeValue = cssIdentifierForFontSizeKeyword(
           style->getFontDescription().keywordSize());
-      const CSSPrimitiveValue* primitiveValue =
-          toCSSPrimitiveValue(propertyValue);
-      if (primitiveValue->isValueID() &&
-          primitiveValue->getValueID() == sizeValue)
+      if (propertyValue->isIdentifierValue() &&
+          toCSSIdentifierValue(propertyValue)->getValueID() == sizeValue)
         return true;
     }
   }
   const CSSValue* value = getPropertyCSSValue(propertyID);
   return value && propertyValue && value->equals(*propertyValue);
 }
 
 MutableStylePropertySet* CSSComputedStyleDeclaration::copyProperties() const {
   return copyPropertiesInSet(computableProperties());
 }
@@ skipping 89 matching lines @@
       "These styles are computed, and therefore the '" +
           getPropertyNameString(id) + "' property is read-only.");
 }
 
 DEFINE_TRACE(CSSComputedStyleDeclaration) {
   visitor->trace(m_node);
   CSSStyleDeclaration::trace(visitor);
 }
 
 }  // namespace blink