Change Rect and Quad to be CSSValues

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> {
-    DECLARE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(RectBase);
+// TODO rename to CSSQuadValue.
+class CORE_EXPORT CSSQuadValue : public CSSValue {

[esprehn, 2015/08/21 09:57:15]

copy pasta error?

[sashab, 2015/08/24 01:56:59]

Oops, thanks :) This file should be removed.

 public:
+    static PassRefPtrWillBeRawPtr<CSSQuadValue> createQuad(PassRefPtrWillBeRawPtr<CSSPrimitiveValue> top, PassRefPtrWillBeRawPtr<CSSPrimitiveValue> right, PassRefPtrWillBeRawPtr<CSSPrimitiveValue> bottom, PassRefPtrWillBeRawPtr<CSSPrimitiveValue> left)
+    {
+        return adoptRefWillBeNoop(new CSSQuadValue(top, right, bottom, left, false));
+    }
+
+    static PassRefPtrWillBeRawPtr<CSSQuadValue> createRect(PassRefPtrWillBeRawPtr<CSSPrimitiveValue> top, PassRefPtrWillBeRawPtr<CSSPrimitiveValue> right, PassRefPtrWillBeRawPtr<CSSPrimitiveValue> bottom, PassRefPtrWillBeRawPtr<CSSPrimitiveValue> left)
+    {
+        return adoptRefWillBeNoop(new CSSQuadValue(top, right, bottom, left, true));
+    }
+
     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(); }
 
     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; }
 
-    bool equals(const RectBase& other) const
+    String customCSSText() const
+    {
+        if (m_serializeAsRect)
+            return "rect(" + top()->cssText() + ' ' + right()->cssText() + ' ' + bottom()->cssText() + ' ' + left()->cssText() + ')';
+
+        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());
+        if (right() != top() || bottom() != top() || left() != top()) {
+            result.append(' ');
+            result.append(right());
+            if (bottom() != top() || right() != left()) {
+                result.append(' ');
+                result.append(bottom());
+                if (left() != right()) {
+                    result.append(' ');
+                    result.append(left());
+                }
+            }
+        }
+        return result.toString();
+    }
+
+    bool equals(const CSSQuadValue& 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);
     }
 
     DECLARE_TRACE();
 
 protected:
-    RectBase() { }
+    CSSQuadValue(PassRefPtrWillBeRawPtr<CSSPrimitiveValue> top, PassRefPtrWillBeRawPtr<CSSPrimitiveValue> right, PassRefPtrWillBeRawPtr<CSSPrimitiveValue> bottom, PassRefPtrWillBeRawPtr<CSSPrimitiveValue> left, bool serializeAsRect)
+        : CSSValue(QuadClass)
+        , m_serializeAsRect(serializeAsRect)
+        , m_top(top)
+        , m_right(right)
+        , m_bottom(bottom)
+        , m_left(left) { }
 
 private:
+    bool m_serializeAsRect;
+
+    static String generateCSSString(const String& top, const String& right, const String& bottom, const String& left)
+    {
+
+    }
+
     RefPtrWillBeMember<CSSPrimitiveValue> m_top;
     RefPtrWillBeMember<CSSPrimitiveValue> m_right;
     RefPtrWillBeMember<CSSPrimitiveValue> m_bottom;
     RefPtrWillBeMember<CSSPrimitiveValue> m_left;
 };
 
 class Rect : public RectBase {
 public:
     static PassRefPtrWillBeRawPtr<Rect> create() { return adoptRefWillBeNoop(new Rect); }
 
@@ skipping 13 matching lines @@
     // 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());
+
     }
 
 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);
-        if (right != top || bottom != top || left != top) {
-            result.append(' ');
-            result.append(right);
-            if (bottom != top || right != left) {
-                result.append(' ');
-                result.append(bottom);
-                if (left != right) {
-                    result.append(' ');
-                    result.append(left);
-                }
-            }
-        }
-        return result.toString();
-    }
+
 
     // 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