webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 13 insertions, 20 deletions

diff --git a/Source/WebCore/svg/LinearGradientAttributes.h b/Source/WebCore/svg/LinearGradientAttributes.h
index 6ff28f1fe..f52019fff 100644
--- a/Source/WebCore/svg/LinearGradientAttributes.h
+++ b/Source/WebCore/svg/LinearGradientAttributes.h
@@ -17,10 +17,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef LinearGradientAttributes_h
-#define LinearGradientAttributes_h
+#pragma once
 
-#if ENABLE(SVG)
 #include "GradientAttributes.h"
 
 namespace WebCore {
@@ -37,15 +35,15 @@ struct LinearGradientAttributes : GradientAttributes {
     {
     }
 
-    SVGLength x1() const { return m_x1; }
-    SVGLength y1() const { return m_y1; }
-    SVGLength x2() const { return m_x2; }
-    SVGLength y2() const { return m_y2; }
+    SVGLengthValue x1() const { return m_x1; }
+    SVGLengthValue y1() const { return m_y1; }
+    SVGLengthValue x2() const { return m_x2; }
+    SVGLengthValue y2() const { return m_y2; }
 
-    void setX1(const SVGLength& value) { m_x1 = value; m_x1Set = true; }
-    void setY1(const SVGLength& value) { m_y1 = value; m_y1Set = true; }
-    void setX2(const SVGLength& value) { m_x2 = value; m_x2Set = true; }
-    void setY2(const SVGLength& value) { m_y2 = value; m_y2Set = true; }
+    void setX1(SVGLengthValue value) { m_x1 = value; m_x1Set = true; }
+    void setY1(SVGLengthValue value) { m_y1 = value; m_y1Set = true; }
+    void setX2(SVGLengthValue value) { m_x2 = value; m_x2Set = true; }
+    void setY2(SVGLengthValue value) { m_y2 = value; m_y2Set = true; }
 
     bool hasX1() const { return m_x1Set; }
     bool hasY1() const { return m_y1Set; }
@@ -54,10 +52,10 @@ struct LinearGradientAttributes : GradientAttributes {
 
 private:
     // Properties
-    SVGLength m_x1;
-    SVGLength m_y1;
-    SVGLength m_x2;
-    SVGLength m_y2;
+    SVGLengthValue m_x1;
+    SVGLengthValue m_y1;
+    SVGLengthValue m_x2;
+    SVGLengthValue m_y2;
 
     // Property states
     bool m_x1Set : 1;
@@ -67,8 +65,3 @@ private:
 };
 
 } // namespace WebCore
-
-#endif // ENABLE(SVG)
-#endif
-
-// vim:ts=4:noet