Changed Pair 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/Pair.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"
 #include "wtf/text/StringBuffer.h"
 #include "wtf/text/StringBuilder.h"
@@ skipping 196 matching lines @@
 
 CSSPrimitiveValue::CSSPrimitiveValue(const String& str, UnitType type)
     : CSSValue(PrimitiveClass)
 {
     init(type);
     m_value.string = str.impl();
     if (m_value.string)
         m_value.string->ref();
 }
 
-CSSPrimitiveValue::CSSPrimitiveValue(const LengthSize& lengthSize, const ComputedStyle& style)
-    : CSSValue(PrimitiveClass)
-{
-    init(lengthSize, style);
-}
-
 CSSPrimitiveValue::CSSPrimitiveValue(RGBA32 color)
     : CSSValue(PrimitiveClass)
 {
     init(UnitType::RGBColor);
     m_value.rgbcolor = color;
 }
 
 CSSPrimitiveValue::CSSPrimitiveValue(const Length& length, float zoom)
     : CSSValue(PrimitiveClass)
 {
@@ skipping 64 matching lines @@
         ASSERT_NOT_REACHED();
         break;
     }
 }
 
 void CSSPrimitiveValue::init(UnitType type)
 {
     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<Pair> p)
-{
-    init(UnitType::Pair);
-    m_hasCachedCSSText = false;
-    m_value.pair = p.leakRef();
-}
-
 void CSSPrimitiveValue::init(PassRefPtrWillBeRawPtr<CSSCalcValue> c)
 {
     init(UnitType::Calc);
     m_hasCachedCSSText = false;
     m_value.calc = c.leakRef();
 }
 
 void CSSPrimitiveValue::init(PassRefPtrWillBeRawPtr<CSSBasicShape> shape)
 {
     init(UnitType::Shape);
     m_hasCachedCSSText = false;
     m_value.shape = shape.leakRef();
 }
 
 CSSPrimitiveValue::~CSSPrimitiveValue()
 {
     cleanup();
 }
 
 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::Pair:
-        // We must not call deref() when oilpan is enabled because m_value.pair is traced.
-#if !ENABLE(OILPAN)
-        m_value.pair->deref();
-#endif
-        break;
     case UnitType::Calc:
         // We must not call deref() when oilpan is enabled because m_value.calc is traced.
 #if !ENABLE(OILPAN)
         m_value.calc->deref();
 #endif
         break;
     case UnitType::CalcPercentageWithNumber:
     case UnitType::CalcPercentageWithLength:
         ASSERT_NOT_REACHED();
         break;
@@ skipping 476 matching lines @@
     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::RGBColor:
-    case UnitType::Pair:
     case UnitType::Calc:
     case UnitType::Shape:
     case UnitType::CalcPercentageWithNumber:
     case UnitType::CalcPercentageWithLength:
     case UnitType::QuirkyEms:
         break;
     };
     ASSERT_NOT_REACHED();
     return "";
 }
@@ skipping 66 matching lines @@
         result.append(m_value.string);
         result.append(')');
 
         text = result.toString();
         break;
     }
     case UnitType::RGBColor: {
         text = Color(m_value.rgbcolor).serializedAsCSSComponentValue();
         break;
     }
-    case UnitType::Pair:
-        text = getPairValue()->cssText();
-        break;
     case UnitType::Calc:
         text = m_value.calc->customCSSText();
         break;
     case UnitType::Shape:
         text = m_value.shape->cssText();
         break;
     case UnitType::CalcPercentageWithNumber:
     case UnitType::CalcPercentageWithLength:
     case UnitType::QuirkyEms:
         ASSERT_NOT_REACHED();
@@ skipping 46 matching lines @@
         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::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::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