CSSValue Immediates: Make CSSPrimitiveValue a container

Source/core/css/Rect.h

 /*
  * Copyright (C) 1999-2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 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.
  */
 
 #ifndef Rect_h
 #define Rect_h
 
 #include "core/CoreExport.h"
-#include "core/css/CSSPrimitiveValue.h"
+#include "core/css/CSSValue.h"
 #include "wtf/RefPtr.h"
 #include "wtf/text/StringBuilder.h"
 
 namespace blink {
 
-class CORE_EXPORT RectBase : public RefCountedWillBeGarbageCollected<RectBase> {
+class CORE_EXPORT RectBase : public RefCountedWillBeGarbageCollectedFinalized<RectBase> {
     DECLARE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(RectBase);
 public:
-    CSSPrimitiveValue* top() const { return m_top.get(); }
-    CSSPrimitiveValue* right() const { return m_right.get(); }
-    CSSPrimitiveValue* bottom() const { return m_bottom.get(); }
-    CSSPrimitiveValue* left() const { return m_left.get(); }
+    CSSPrimitiveValue top() const { return toCSSPrimitiveValue(*m_top); }
+    CSSPrimitiveValue right() const { return toCSSPrimitiveValue(*m_right); }
+    CSSPrimitiveValue bottom() const { return toCSSPrimitiveValue(*m_bottom); }
+    CSSPrimitiveValue left() const { return toCSSPrimitiveValue(*m_left); }
 
-    void setTop(PassRefPtrWillBeRawPtr<CSSPrimitiveValue> top) { m_top = top; }
-    void setRight(PassRefPtrWillBeRawPtr<CSSPrimitiveValue> right) { m_right = right; }
-    void setBottom(PassRefPtrWillBeRawPtr<CSSPrimitiveValue> bottom) { m_bottom = bottom; }
-    void setLeft(PassRefPtrWillBeRawPtr<CSSPrimitiveValue> left) { m_left = left; }
+    void setTop(CSSPrimitiveValue top) { m_top = top; }
+    void setRight(CSSPrimitiveValue right) { m_right = right; }
+    void setBottom(CSSPrimitiveValue bottom) { m_bottom = bottom; }
+    void setLeft(CSSPrimitiveValue left) { m_left = left; }
 
     bool equals(const RectBase& other) const
     {
-        return compareCSSValuePtr(m_top, other.m_top)
-            && compareCSSValuePtr(m_right, other.m_right)
-            && compareCSSValuePtr(m_left, other.m_left)
-            && compareCSSValuePtr(m_bottom, other.m_bottom);
+        return m_top == other.m_top
+            && m_right == other.m_right
+            && m_left == other.m_left
+            && m_bottom == other.m_bottom;
     }
 
     DECLARE_TRACE();
 
 protected:
     RectBase() { }
 
 private:
-    RefPtrWillBeMember<CSSPrimitiveValue> m_top;
-    RefPtrWillBeMember<CSSPrimitiveValue> m_right;
-    RefPtrWillBeMember<CSSPrimitiveValue> m_bottom;
-    RefPtrWillBeMember<CSSPrimitiveValue> m_left;
+    NullableCSSValue m_top;
+    NullableCSSValue m_right;
+    NullableCSSValue m_bottom;
+    NullableCSSValue m_left;
 };
 
 class Rect : public RectBase {
 public:
     static PassRefPtrWillBeRawPtr<Rect> create() { return adoptRefWillBeNoop(new Rect); }
 
     String cssText() const
     {
-        return generateCSSString(top()->cssText(), right()->cssText(), bottom()->cssText(), left()->cssText());
+        return generateCSSString(top().cssText(), right().cssText(), bottom().cssText(), left().cssText());
     }
 
 private:
     Rect() { }
     static String generateCSSString(const String& top, const String& right, const String& bottom, const String& left)
     {
         return "rect(" + top + ' ' + right + ' ' + bottom + ' ' + left + ')';
     }
 
     // NOTE: If adding fields to this class please make the RectBase trace
     // method virtual and add a trace method in this subclass tracing the new
     // fields.
 };
 
 class Quad : public RectBase {
 public:
     static PassRefPtrWillBeRawPtr<Quad> create() { return adoptRefWillBeNoop(new Quad); }
 
     String cssText() const
     {
-        return generateCSSString(top()->cssText(), right()->cssText(), bottom()->cssText(), left()->cssText());
+        return generateCSSString(top().cssText(), right().cssText(), bottom().cssText(), left().cssText());
     }
 
 private:
     Quad() { }
     static String generateCSSString(const String& top, const String& right, const String& bottom, const String& left)
     {
         StringBuilder result;
         // reserve space for the four strings, plus three space separator characters.
         result.reserveCapacity(top.length() + right.length() + bottom.length() + left.length() + 3);
         result.append(top);
@@ skipping 13 matching lines @@
     }
 
     // NOTE: If adding fields to this class please make the RectBase trace
     // method virtual and add a trace method in this subclass tracing the new
     // fields.
 };
 
 } // namespace blink
 
 #endif // Rect_h