Rename StyleLayoutData to StyleGeometryData

third_party/WebKit/Source/core/style/SVGComputedStyle.h

 /*
     Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org>
                   2004, 2005 Rob Buis <buis@kde.org>
     Copyright (C) 2005, 2006 Apple Computer, Inc.
     Copyright (C) Research In Motion Limited 2010. 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.
@@ skipping 101 matching lines @@
     void setColorInterpolationFilters(EColorInterpolation val) { svg_inherited_flags.colorInterpolationFilters = val; }
     void setColorRendering(EColorRendering val) { svg_inherited_flags.colorRendering = val; }
     void setFillRule(WindRule val) { svg_inherited_flags.fillRule = val; }
     void setJoinStyle(LineJoin val) { svg_inherited_flags.joinStyle = val; }
     void setShapeRendering(EShapeRendering val) { svg_inherited_flags.shapeRendering = val; }
     void setTextAnchor(ETextAnchor val) { svg_inherited_flags.textAnchor = val; }
     void setMaskType(EMaskType val) { svg_noninherited_flags.f.maskType = val; }
     void setPaintOrder(EPaintOrder val) { svg_inherited_flags.paintOrder = (int)val; }
     void setD(PassRefPtr<StylePath> d)
     {
-        if (!(layout->d == d))
-            layout.access()->d = d;
+        if (!(geometry->d == d))
+            geometry.access()->d = d;
     }
     void setCx(const Length& obj)
     {
-        if (!(layout->cx == obj))
-            layout.access()->cx = obj;
+        if (!(geometry->cx == obj))
+            geometry.access()->cx = obj;
     }
     void setCy(const Length& obj)
     {
-        if (!(layout->cy == obj))
-            layout.access()->cy = obj;
+        if (!(geometry->cy == obj))
+            geometry.access()->cy = obj;
     }
     void setX(const Length& obj)
     {
-        if (!(layout->x == obj))
-            layout.access()->x = obj;
+        if (!(geometry->x == obj))
+            geometry.access()->x = obj;
     }
     void setY(const Length& obj)
     {
-        if (!(layout->y == obj))
-            layout.access()->y = obj;
+        if (!(geometry->y == obj))
+            geometry.access()->y = obj;
     }
     void setR(const Length& obj)
     {
-        if (!(layout->r == obj))
-            layout.access()->r = obj;
+        if (!(geometry->r == obj))
+            geometry.access()->r = obj;
     }
     void setRx(const Length& obj)
     {
-        if (!(layout->rx == obj))
-            layout.access()->rx = obj;
+        if (!(geometry->rx == obj))
+            geometry.access()->rx = obj;
     }
     void setRy(const Length& obj)
     {
-        if (!(layout->ry == obj))
-            layout.access()->ry = obj;
+        if (!(geometry->ry == obj))
+            geometry.access()->ry = obj;
     }
     void setFillOpacity(float obj)
     {
         if (!(fill->opacity == obj))
             fill.access()->opacity = obj;
     }
 
     void setFillPaint(SVGPaintType type, const Color& color, const String& uri, bool applyToRegularStyle = true, bool applyToVisitedLinkStyle = false)
     {
         if (applyToRegularStyle) {
@@ skipping 164 matching lines @@
     SVGDashArray* strokeDashArray() const { return stroke->dashArray.get(); }
     float strokeMiterLimit() const { return stroke->miterLimit; }
     const UnzoomedLength& strokeWidth() const { return stroke->width; }
     const Length& strokeDashOffset() const { return stroke->dashOffset; }
     float stopOpacity() const { return stops->opacity; }
     const Color& stopColor() const { return stops->color; }
     float floodOpacity() const { return misc->floodOpacity; }
     const Color& floodColor() const { return misc->floodColor; }
     const Color& lightingColor() const { return misc->lightingColor; }
     const Length& baselineShiftValue() const { return misc->baselineShiftValue; }
-    StylePath* d() const { return layout->d.get(); }
-    const Length& cx() const { return layout->cx; }
-    const Length& cy() const { return layout->cy; }
-    const Length& x() const { return layout->x; }
-    const Length& y() const { return layout->y; }
-    const Length& r() const { return layout->r; }
-    const Length& rx() const { return layout->rx; }
-    const Length& ry() const { return layout->ry; }
+    StylePath* d() const { return geometry->d.get(); }
+    const Length& cx() const { return geometry->cx; }
+    const Length& cy() const { return geometry->cy; }
+    const Length& x() const { return geometry->x; }
+    const Length& y() const { return geometry->y; }
+    const Length& r() const { return geometry->r; }
+    const Length& rx() const { return geometry->rx; }
+    const Length& ry() const { return geometry->ry; }
     const AtomicString& clipperResource() const { return resources->clipper; }
     const AtomicString& filterResource() const { return resources->filter; }
     const AtomicString& maskerResource() const { return resources->masker; }
     const AtomicString& markerStartResource() const { return inheritedResources->markerStart; }
     const AtomicString& markerMidResource() const { return inheritedResources->markerMid; }
     const AtomicString& markerEndResource() const { return inheritedResources->markerEnd; }
     EMaskType maskType() const { return (EMaskType) svg_noninherited_flags.f.maskType; }
     EPaintOrder paintOrder() const { return (EPaintOrder) svg_inherited_flags.paintOrder; }
     EPaintOrderType paintOrderType(unsigned index) const;
 
@@ skipping 87 matching lines @@
     } svg_noninherited_flags;
 
     // inherited attributes
     DataRef<StyleFillData> fill;
     DataRef<StyleStrokeData> stroke;
     DataRef<StyleInheritedResourceData> inheritedResources;
 
     // non-inherited attributes
     DataRef<StyleStopData> stops;
     DataRef<StyleMiscData> misc;
-    DataRef<StyleLayoutData> layout;
+    DataRef<StyleGeometryData> geometry;
     DataRef<StyleResourceData> resources;
 
 private:
     enum CreateInitialType { CreateInitial };
 
     SVGComputedStyle();
     SVGComputedStyle(const SVGComputedStyle&);
     SVGComputedStyle(CreateInitialType); // Used to create the initial style singleton.
 
     bool diffNeedsLayoutAndPaintInvalidation(const SVGComputedStyle* other) const;
@@ skipping 18 matching lines @@
         svg_noninherited_flags.f.baselineShift = initialBaselineShift();
         svg_noninherited_flags.f.vectorEffect = initialVectorEffect();
         svg_noninherited_flags.f.bufferedRendering = initialBufferedRendering();
         svg_noninherited_flags.f.maskType = initialMaskType();
     }
 };
 
 } // namespace blink
 
 #endif // SVGComputedStyle_h