Oilpan: move SVG property hierarchy to the heap.

Source/core/svg/PatternAttributes.h

 /*
  * Copyright (C) 2006 Nikolas Zimmermann <zimmermann@kde.org>
  *
  * 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 PatternAttributes_h
 #define PatternAttributes_h
 
 #include "core/svg/SVGLength.h"
 #include "core/svg/SVGPreserveAspectRatio.h"
+#include "platform/heap/Handle.h"
 #include "platform/transforms/AffineTransform.h"
 
 namespace blink {
 
 class SVGPatternElement;
 
-struct PatternAttributes {
+struct PatternAttributes final {

[haraken, 2014/11/11 05:22:46]

struct => class

[sof, 2014/11/12 13:45:07]

Done.

+    DISALLOW_ALLOCATION();
+public:
     PatternAttributes()
         : m_x(SVGLength::create(LengthModeWidth))
         , m_y(SVGLength::create(LengthModeHeight))
         , m_width(SVGLength::create(LengthModeWidth))
         , m_height(SVGLength::create(LengthModeHeight))
         , m_viewBox()
         , m_preserveAspectRatio(SVGPreserveAspectRatio::create())
         , m_patternUnits(SVGUnitTypes::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX)
         , m_patternContentUnits(SVGUnitTypes::SVG_UNIT_TYPE_USERSPACEONUSE)
         , m_patternContentElement(0)
@@ skipping 14 matching lines @@
     SVGLength* y() const { return m_y.get(); }
     SVGLength* width() const { return m_width.get(); }
     SVGLength* height() const { return m_height.get(); }
     FloatRect viewBox() const { return m_viewBox; }
     SVGPreserveAspectRatio* preserveAspectRatio() const { return m_preserveAspectRatio.get(); }
     SVGUnitTypes::SVGUnitType patternUnits() const { return m_patternUnits; }
     SVGUnitTypes::SVGUnitType patternContentUnits() const { return m_patternContentUnits; }
     AffineTransform patternTransform() const { return m_patternTransform; }
     const SVGPatternElement* patternContentElement() const { return m_patternContentElement; }
 
-    void setX(PassRefPtr<SVGLength> value)
+    void setX(PassRefPtrWillBeRawPtr<SVGLength> value)
     {
         m_x = value;
         m_xSet = true;
     }
 
-    void setY(PassRefPtr<SVGLength> value)
+    void setY(PassRefPtrWillBeRawPtr<SVGLength> value)
     {
         m_y = value;
         m_ySet = true;
     }
 
-    void setWidth(PassRefPtr<SVGLength> value)
+    void setWidth(PassRefPtrWillBeRawPtr<SVGLength> value)
     {
         m_width = value;
         m_widthSet = true;
     }
 
-    void setHeight(PassRefPtr<SVGLength> value)
+    void setHeight(PassRefPtrWillBeRawPtr<SVGLength> value)
     {
         m_height = value;
         m_heightSet = true;
     }
 
     void setViewBox(const FloatRect& value)
     {
         m_viewBox = value;
         m_viewBoxSet = true;
     }
 
-    void setPreserveAspectRatio(PassRefPtr<SVGPreserveAspectRatio> value)
+    void setPreserveAspectRatio(PassRefPtrWillBeRawPtr<SVGPreserveAspectRatio> value)
     {
         m_preserveAspectRatio = value;
         m_preserveAspectRatioSet = true;
     }
 
     void setPatternUnits(SVGUnitTypes::SVGUnitType value)
     {
         m_patternUnits = value;
         m_patternUnitsSet = true;
     }
@@ skipping 20 matching lines @@
     bool hasY() const { return m_ySet; }
     bool hasWidth() const { return m_widthSet; }
     bool hasHeight() const { return m_heightSet; }
     bool hasViewBox() const { return m_viewBoxSet; }
     bool hasPreserveAspectRatio() const { return m_preserveAspectRatioSet; }
     bool hasPatternUnits() const { return m_patternUnitsSet; }
     bool hasPatternContentUnits() const { return m_patternContentUnitsSet; }
     bool hasPatternTransform() const { return m_patternTransformSet; }
     bool hasPatternContentElement() const { return m_patternContentElementSet; }
 
+    void trace(Visitor* visitor)
+    {
+        visitor->trace(m_x);
+        visitor->trace(m_y);
+        visitor->trace(m_width);
+        visitor->trace(m_height);
+        visitor->trace(m_preserveAspectRatio);
+    }
+
 private:
     // Properties
-    RefPtr<SVGLength> m_x;
-    RefPtr<SVGLength> m_y;
-    RefPtr<SVGLength> m_width;
-    RefPtr<SVGLength> m_height;
+    RefPtrWillBeMember<SVGLength> m_x;
+    RefPtrWillBeMember<SVGLength> m_y;
+    RefPtrWillBeMember<SVGLength> m_width;
+    RefPtrWillBeMember<SVGLength> m_height;
     FloatRect m_viewBox;
-    RefPtr<SVGPreserveAspectRatio> m_preserveAspectRatio;
+    RefPtrWillBeMember<SVGPreserveAspectRatio> m_preserveAspectRatio;
     SVGUnitTypes::SVGUnitType m_patternUnits;
     SVGUnitTypes::SVGUnitType m_patternContentUnits;
     AffineTransform m_patternTransform;
     const SVGPatternElement* m_patternContentElement;

[haraken, 2014/11/11 05:22:46]

This should be a Member.

[sof, 2014/11/12 13:45:07]

Done.

 
     // Property states
     bool m_xSet : 1;
     bool m_ySet : 1;
     bool m_widthSet : 1;
     bool m_heightSet : 1;
     bool m_viewBoxSet : 1;
     bool m_preserveAspectRatioSet : 1;
     bool m_patternUnitsSet : 1;
     bool m_patternContentUnitsSet : 1;
     bool m_patternTransformSet : 1;
     bool m_patternContentElementSet : 1;
 };
 
 } // namespace blink
 
-#endif
+#endif // PatternAttributes_h