Change Counter to be a CSSValue

Source/core/css/CSSPrimitiveValue.cpp

 /*
  * (C) 1999-2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2012 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library 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
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
 #include "core/css/CSSPrimitiveValue.h"
 
 #include "core/css/CSSBasicShapes.h"
 #include "core/css/CSSCalculationValue.h"
 #include "core/css/CSSHelper.h"
 #include "core/css/CSSMarkup.h"
 #include "core/css/CSSToLengthConversionData.h"
-#include "core/css/Counter.h"
 #include "core/css/Pair.h"
 #include "core/css/Rect.h"
 #include "core/css/StyleSheetContents.h"
 #include "core/dom/Node.h"
 #include "core/style/ComputedStyle.h"
 #include "platform/LayoutUnit.h"
 #include "platform/fonts/FontMetrics.h"
 #include "wtf/StdLibExtras.h"
 #include "wtf/ThreadSpecific.h"
 #include "wtf/Threading.h"
@@ skipping 112 matching lines @@
     case CSSValueWebkitText:
     case CSSValueWebkitLink:
     case CSSValueWebkitActivelink:
     case CSSValueCurrentcolor:
         return true;
     default:
         return false;
     }
 }
 
-typedef HashMap<const CSSPrimitiveValue*, String> CSSTextCache;
-static CSSTextCache& cssTextCache()
-{
-    AtomicallyInitializedStaticReference(ThreadSpecific<CSSTextCache>, cache, new ThreadSpecific<CSSTextCache>());
-    return *cache;
-}
-
 CSSPrimitiveValue::UnitType CSSPrimitiveValue::typeWithCalcResolved() const
 {
     if (type() != UnitType::Calc)
         return type();
 
     switch (m_value.calc->category()) {
     case CalcAngle:
         return UnitType::Degrees;
     case CalcFrequency:
         return UnitType::Hertz;
@@ skipping 156 matching lines @@
     m_primitiveUnitType = static_cast<unsigned>(type);
 }
 
 void CSSPrimitiveValue::init(const LengthSize& lengthSize, const ComputedStyle& style)
 {
     init(UnitType::Pair);
     m_hasCachedCSSText = false;
     m_value.pair = Pair::create(create(lengthSize.width(), style.effectiveZoom()), create(lengthSize.height(), style.effectiveZoom()), Pair::KeepIdenticalValues).leakRef();
 }
 
-void CSSPrimitiveValue::init(PassRefPtrWillBeRawPtr<Counter> c)
-{
-    init(UnitType::Counter);
-    m_hasCachedCSSText = false;
-    m_value.counter = c.leakRef();
-}
-
 void CSSPrimitiveValue::init(PassRefPtrWillBeRawPtr<Rect> r)
 {
     init(UnitType::Rect);
     m_hasCachedCSSText = false;
     m_value.rect = r.leakRef();
 }
 
 void CSSPrimitiveValue::init(PassRefPtrWillBeRawPtr<Quad> quad)
 {
     init(UnitType::Quad);
@@ skipping 30 matching lines @@
 void CSSPrimitiveValue::cleanup()
 {
     switch (type()) {
     case UnitType::CustomIdentifier:
     case UnitType::String:
     case UnitType::URI:
     case UnitType::Attribute:
         if (m_value.string)
             m_value.string->deref();
         break;
-    case UnitType::Counter:
-        // We must not call deref() when oilpan is enabled because m_value.counter is traced.
-#if !ENABLE(OILPAN)
-        m_value.counter->deref();
-#endif
-        break;
     case UnitType::Rect:
         // We must not call deref() when oilpan is enabled because m_value.rect is traced.
 #if !ENABLE(OILPAN)
         m_value.rect->deref();
 #endif
         break;
     case UnitType::Quad:
         // We must not call deref() when oilpan is enabled because m_value.quad is traced.
 #if !ENABLE(OILPAN)
         m_value.quad->deref();
@@ skipping 50 matching lines @@
     case UnitType::DotsPerPixel:
     case UnitType::DotsPerInch:
     case UnitType::DotsPerCentimeter:
     case UnitType::Fraction:
     case UnitType::RGBColor:
     case UnitType::Unknown:
     case UnitType::PropertyID:
     case UnitType::ValueID:
         break;
     }
-    if (m_hasCachedCSSText) {
-        cssTextCache().remove(this);
-        m_hasCachedCSSText = false;
-    }
 }
 
 double CSSPrimitiveValue::computeSeconds()
 {
     ASSERT(isTime() || (isCalculated() && cssCalcValue()->category() == CalcTime));
     UnitType currentType = isCalculated() ? cssCalcValue()->expressionNode()->typeWithCalcResolved() : type();
     if (currentType == UnitType::Seconds)
         return getDoubleValue();
     if (currentType == UnitType::Milliseconds)
         return getDoubleValue() / 1000;
@@ skipping 419 matching lines @@
         return "vmin";
     case UnitType::ViewportMax:
         return "vmax";
     case UnitType::Unknown:
     case UnitType::CustomIdentifier:
     case UnitType::String:
     case UnitType::URI:
     case UnitType::ValueID:
     case UnitType::PropertyID:
     case UnitType::Attribute:
-    case UnitType::Counter:
     case UnitType::Rect:
     case UnitType::Quad:
     case UnitType::RGBColor:
     case UnitType::Pair:
     case UnitType::Calc:
     case UnitType::Shape:
     case UnitType::CalcPercentageWithNumber:
     case UnitType::CalcPercentageWithLength:
     case UnitType::QuirkyEms:
         break;
     };
     ASSERT_NOT_REACHED();
     return "";
 }
 
 String CSSPrimitiveValue::customCSSText() const
 {
-    if (m_hasCachedCSSText) {
-        ASSERT(cssTextCache().contains(this));
-        return cssTextCache().get(this);
-    }
-
-    String text;
     switch (type()) {
     case UnitType::Unknown:
         // FIXME
-        break;
+        return "";
     case UnitType::Integer:
-        text = String::format("%d", getIntValue());
-        break;
+        return String::format("%d", getIntValue());
     case UnitType::Number:
     case UnitType::Percentage:
     case UnitType::Ems:
     case UnitType::Exs:
     case UnitType::Rems:
     case UnitType::Chs:
     case UnitType::Pixels:
     case UnitType::Centimeters:
     case UnitType::DotsPerPixel:
     case UnitType::DotsPerInch:
     case UnitType::DotsPerCentimeter:
     case UnitType::Millimeters:
     case UnitType::Inches:
     case UnitType::Points:
     case UnitType::Picas:
     case UnitType::Degrees:
     case UnitType::Radians:
     case UnitType::Gradians:
     case UnitType::Milliseconds:
     case UnitType::Seconds:
     case UnitType::Hertz:
     case UnitType::Kilohertz:
     case UnitType::Turns:
     case UnitType::Fraction:
     case UnitType::ViewportWidth:
     case UnitType::ViewportHeight:
     case UnitType::ViewportMin:
     case UnitType::ViewportMax:
-        text = formatNumber(m_value.num, unitTypeToString(type()));
-        break;
+        return formatNumber(m_value.num, unitTypeToString(type()));
     case UnitType::CustomIdentifier:
-        text = quoteCSSStringIfNeeded(m_value.string);
-        break;
+        return quoteCSSStringIfNeeded(m_value.string);
     case UnitType::String: {
-        text = serializeString(m_value.string);
-        break;
+        return serializeString(m_value.string);
     }
     case UnitType::URI:
-        text = "url(" + quoteCSSURLIfNeeded(m_value.string) + ")";
-        break;
+        return "url(" + quoteCSSURLIfNeeded(m_value.string) + ")";
     case UnitType::ValueID:
-        text = valueName(m_value.valueID);
-        break;
+        return valueName(m_value.valueID);
     case UnitType::PropertyID:
-        text = propertyName(m_value.propertyID);
-        break;
+        return propertyName(m_value.propertyID);
     case UnitType::Attribute: {
         StringBuilder result;
         result.reserveCapacity(6 + m_value.string->length());
         result.appendLiteral("attr(");
         result.append(m_value.string);
         result.append(')');
 
-        text = result.toString();
-        break;
-    }
-    case UnitType::Counter: {
-        StringBuilder result;
-        String separator = m_value.counter->separator();
-        if (separator.isEmpty())
-            result.appendLiteral("counter(");
-        else
-            result.appendLiteral("counters(");
-
-        result.append(m_value.counter->identifier());
-        if (!separator.isEmpty()) {
-            result.appendLiteral(", ");
-            result.append(serializeString(separator));
-        }
-        String listStyle = m_value.counter->listStyle();
-        bool isDefaultListStyle = m_value.counter->listStyleIdent() == CSSValueDecimal;
-        if (!listStyle.isEmpty() && !isDefaultListStyle) {
-            result.appendLiteral(", ");
-            result.append(listStyle);
-        }
-        result.append(')');
-
-        text = result.toString();
-        break;
+        return result.toString();
     }
     case UnitType::Rect:
-        text = getRectValue()->cssText();
-        break;
+        return getRectValue()->cssText();
     case UnitType::Quad:
-        text = getQuadValue()->cssText();
-        break;
+        return getQuadValue()->cssText();
     case UnitType::RGBColor: {
-        text = Color(m_value.rgbcolor).serializedAsCSSComponentValue();
-        break;
+        return Color(m_value.rgbcolor).serializedAsCSSComponentValue();
     }
     case UnitType::Pair:
-        text = getPairValue()->cssText();
-        break;
+        return getPairValue()->cssText();
     case UnitType::Calc:
-        text = m_value.calc->customCSSText();
-        break;
+        return m_value.calc->customCSSText();
     case UnitType::Shape:
-        text = m_value.shape->cssText();
-        break;
+        return m_value.shape->cssText();
     case UnitType::CalcPercentageWithNumber:
     case UnitType::CalcPercentageWithLength:
     case UnitType::QuirkyEms:
         ASSERT_NOT_REACHED();
-        break;
+        return "";
     }
-
-    ASSERT(!cssTextCache().contains(this));
-    cssTextCache().set(this, text);
-    m_hasCachedCSSText = true;
-    return text;
 }
 
 bool CSSPrimitiveValue::equals(const CSSPrimitiveValue& other) const
 {
     if (type() != other.type())
         return false;
 
     switch (type()) {
     case UnitType::Unknown:
         return false;
@@ skipping 27 matching lines @@
         return m_value.num == other.m_value.num;
     case UnitType::PropertyID:
         return m_value.propertyID == other.m_value.propertyID;
     case UnitType::ValueID:
         return m_value.valueID == other.m_value.valueID;
     case UnitType::CustomIdentifier:
     case UnitType::String:
     case UnitType::URI:
     case UnitType::Attribute:
         return equal(m_value.string, other.m_value.string);
-    case UnitType::Counter:
-        return m_value.counter && other.m_value.counter && m_value.counter->equals(*other.m_value.counter);
     case UnitType::Rect:
         return m_value.rect && other.m_value.rect && m_value.rect->equals(*other.m_value.rect);
     case UnitType::Quad:
         return m_value.quad && other.m_value.quad && m_value.quad->equals(*other.m_value.quad);
     case UnitType::RGBColor:
         return m_value.rgbcolor == other.m_value.rgbcolor;
     case UnitType::Pair:
         return m_value.pair && other.m_value.pair && m_value.pair->equals(*other.m_value.pair);
     case UnitType::Calc:
         return m_value.calc && other.m_value.calc && m_value.calc->equals(*other.m_value.calc);
     case UnitType::Shape:
         return m_value.shape && other.m_value.shape && m_value.shape->equals(*other.m_value.shape);
     case UnitType::Integer:
     case UnitType::Chs:
     case UnitType::CalcPercentageWithNumber:
     case UnitType::CalcPercentageWithLength:
     case UnitType::QuirkyEms:
         return false;
     }
     return false;
 }
 
 DEFINE_TRACE_AFTER_DISPATCH(CSSPrimitiveValue)
 {
 #if ENABLE(OILPAN)
     switch (type()) {
-    case UnitType::Counter:
-        visitor->trace(m_value.counter);
-        break;
     case UnitType::Rect:
         visitor->trace(m_value.rect);
         break;
     case UnitType::Quad:
         visitor->trace(m_value.quad);
         break;
     case UnitType::Pair:
         visitor->trace(m_value.pair);
         break;
     case UnitType::Calc:
         visitor->trace(m_value.calc);
         break;
     case UnitType::Shape:
         visitor->trace(m_value.shape);
         break;
     default:
         break;
     }
 #endif
     CSSValue::traceAfterDispatch(visitor);
 }
 
 } // namespace blink