Merge WebKit at r72805: Initial merge by Git

Note that this is a backwards merge from Chromium release 9.0.600.0
to 9.0.597.0, to align with the Chromium 9 stable release branch.

Change-Id: I5d2bb4e8cee9d39ae8485abf48bdb55ecf8b3790

1 files changed, 38 insertions, 40 deletions

diff --git a/WebCore/svg/SVGTextPathElement.h b/WebCore/svg/SVGTextPathElement.h
index a6efdb6..2375078 100644
--- a/WebCore/svg/SVGTextPathElement.h
+++ b/WebCore/svg/SVGTextPathElement.h
@@ -26,56 +26,54 @@
 #include "SVGURIReference.h"
 
 namespace WebCore {
-
     enum SVGTextPathMethodType {
-    SVG_TEXTPATH_METHODTYPE_UNKNOWN = 0,
-    SVG_TEXTPATH_METHODTYPE_ALIGN = 1,
-    SVG_TEXTPATH_METHODTYPE_STRETCH = 2
-};
-
-enum SVGTextPathSpacingType {
-    SVG_TEXTPATH_SPACINGTYPE_UNKNOWN = 0,
-    SVG_TEXTPATH_SPACINGTYPE_AUTO = 1,
-    SVG_TEXTPATH_SPACINGTYPE_EXACT = 2
-};
+        SVG_TEXTPATH_METHODTYPE_UNKNOWN = 0,
+        SVG_TEXTPATH_METHODTYPE_ALIGN = 1,
+        SVG_TEXTPATH_METHODTYPE_STRETCH = 2
+    };
 
-class SVGTextPathElement : public SVGTextContentElement,
-                           public SVGURIReference {
-public:
-    // Forward declare these enums in the w3c naming scheme, for IDL generation
-    enum {
-        TEXTPATH_METHODTYPE_UNKNOWN = SVG_TEXTPATH_METHODTYPE_UNKNOWN,
-        TEXTPATH_METHODTYPE_ALIGN = SVG_TEXTPATH_METHODTYPE_ALIGN,
-        TEXTPATH_METHODTYPE_STRETCH = SVG_TEXTPATH_METHODTYPE_STRETCH,
-        TEXTPATH_SPACINGTYPE_UNKNOWN = SVG_TEXTPATH_SPACINGTYPE_UNKNOWN,
-        TEXTPATH_SPACINGTYPE_AUTO = SVG_TEXTPATH_SPACINGTYPE_AUTO,
-        TEXTPATH_SPACINGTYPE_EXACT = SVG_TEXTPATH_SPACINGTYPE_EXACT
+    enum SVGTextPathSpacingType {
+        SVG_TEXTPATH_SPACINGTYPE_UNKNOWN = 0,
+        SVG_TEXTPATH_SPACINGTYPE_AUTO = 1,
+        SVG_TEXTPATH_SPACINGTYPE_EXACT = 2
     };
 
-    static PassRefPtr<SVGTextPathElement> create(const QualifiedName&, Document*);
+    class SVGTextPathElement : public SVGTextContentElement,
+                               public SVGURIReference {
+    public:
+        // Forward declare these enums in the w3c naming scheme, for IDL generation
+        enum {
+            TEXTPATH_METHODTYPE_UNKNOWN = SVG_TEXTPATH_METHODTYPE_UNKNOWN,
+            TEXTPATH_METHODTYPE_ALIGN = SVG_TEXTPATH_METHODTYPE_ALIGN,
+            TEXTPATH_METHODTYPE_STRETCH = SVG_TEXTPATH_METHODTYPE_STRETCH,
+            TEXTPATH_SPACINGTYPE_UNKNOWN = SVG_TEXTPATH_SPACINGTYPE_UNKNOWN,
+            TEXTPATH_SPACINGTYPE_AUTO = SVG_TEXTPATH_SPACINGTYPE_AUTO,
+            TEXTPATH_SPACINGTYPE_EXACT = SVG_TEXTPATH_SPACINGTYPE_EXACT
+        };
+
+        static PassRefPtr<SVGTextPathElement> create(const QualifiedName&, Document*);
  
-private:
-    SVGTextPathElement(const QualifiedName&, Document*);
+    private:
+        SVGTextPathElement(const QualifiedName&, Document*);
 
-    virtual void insertedIntoDocument();
+        virtual void insertedIntoDocument();
 
-    virtual void parseMappedAttribute(Attribute*);
-    virtual void svgAttributeChanged(const QualifiedName&);
-    virtual void synchronizeProperty(const QualifiedName&);
-    virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
+        virtual void parseMappedAttribute(Attribute*);
+        virtual void svgAttributeChanged(const QualifiedName&);
+        virtual void synchronizeProperty(const QualifiedName&);
+        virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
 
-    virtual bool childShouldCreateRenderer(Node*) const;
+        virtual bool childShouldCreateRenderer(Node*) const;
 
-    virtual bool selfHasRelativeLengths() const;
+        virtual bool selfHasRelativeLengths() const;
 
-    // Animated property declarations
-    DECLARE_ANIMATED_LENGTH(StartOffset, startOffset)
-    DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGTextPathElement, SVGNames::methodAttr, int, Method, method)
-    DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGTextPathElement, SVGNames::spacingAttr, int, Spacing, spacing)
-
-    // SVGURIReference
-    DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGTextPathElement, XLinkNames::hrefAttr, String, Href, href)
-};
+        DECLARE_ANIMATED_PROPERTY_NEW(SVGTextPathElement, SVGNames::startOffsetAttr, SVGLength, StartOffset, startOffset)
+        DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGTextPathElement, SVGNames::methodAttr, int, Method, method)
+        DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGTextPathElement, SVGNames::spacingAttr, int, Spacing, spacing)
+    
+        // SVGURIReference
+        DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGTextPathElement, XLinkNames::hrefAttr, String, Href, href)
+    };
 
 } // namespace WebCore