[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[zimmermann at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 774f9a0122f08e00ce2d343c952d1beb85c3e26b
Author: zimmermann at webkit.org <zimmermann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 30 12:03:13 2010 +0000

    2010-09-30  Nikolas Zimmermann  <nzimmermann at rim.com>
    
            Reviewed by Dirk Schulze.
    
            RenderSVGTextPath lacks isSVGTextPath() method
            https://bugs.webkit.org/show_bug.cgi?id=46888
    
            Make RenderSVGTextPath objects easily detectable, using a isSVGTextPath() method, like all other SVG renderers have.
    
            * rendering/RenderObject.h:
            (WebCore::RenderObject::isSVGTextPath): Return false.
            * rendering/RenderSVGTextPath.h: Changed indentation of whole file.
            (WebCore::RenderSVGTextPath::isSVGTextPath): Return true.
            (WebCore::RenderSVGTextPath::renderName):
            (WebCore::toRenderSVGTextPath): Add helper casting methods.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68775 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ca4ad7f..7be5796 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,22 @@
 
         Reviewed by Dirk Schulze.
 
+        RenderSVGTextPath lacks isSVGTextPath() method
+        https://bugs.webkit.org/show_bug.cgi?id=46888
+
+        Make RenderSVGTextPath objects easily detectable, using a isSVGTextPath() method, like all other SVG renderers have.
+
+        * rendering/RenderObject.h:
+        (WebCore::RenderObject::isSVGTextPath): Return false.
+        * rendering/RenderSVGTextPath.h: Changed indentation of whole file.
+        (WebCore::RenderSVGTextPath::isSVGTextPath): Return true.
+        (WebCore::RenderSVGTextPath::renderName):
+        (WebCore::toRenderSVGTextPath): Add helper casting methods.
+
+2010-09-30  Nikolas Zimmermann  <nzimmermann at rim.com>
+
+        Reviewed by Dirk Schulze.
+
         AffineTransform should expose methods calculating the x/y scale factors
         https://bugs.webkit.org/show_bug.cgi?id=46887
 
diff --git a/WebCore/rendering/RenderObject.h b/WebCore/rendering/RenderObject.h
index 70b0da5..b2d2af1 100644
--- a/WebCore/rendering/RenderObject.h
+++ b/WebCore/rendering/RenderObject.h
@@ -316,6 +316,7 @@ public:
     virtual bool isSVGHiddenContainer() const { return false; }
     virtual bool isRenderPath() const { return false; }
     virtual bool isSVGText() const { return false; }
+    virtual bool isSVGTextPath() const { return false; }
     virtual bool isSVGInline() const { return false; }
     virtual bool isSVGInlineText() const { return false; }
     virtual bool isSVGImage() const { return false; }
diff --git a/WebCore/rendering/RenderSVGTextPath.h b/WebCore/rendering/RenderSVGTextPath.h
index 8e6ff42..a71edf5 100644
--- a/WebCore/rendering/RenderSVGTextPath.h
+++ b/WebCore/rendering/RenderSVGTextPath.h
@@ -29,34 +29,36 @@
 
 namespace WebCore {
 
-    class RenderSVGTextPath : public RenderSVGInline {
-    public:
-        RenderSVGTextPath(Node*);
+class RenderSVGTextPath : public RenderSVGInline {
+public:
+    RenderSVGTextPath(Node*);
 
-        Path layoutPath() const;
-        float startOffset() const;
-        bool exactAlignment() const;
-        bool stretchMethod() const;
+    Path layoutPath() const;
+    float startOffset() const;
+    bool exactAlignment() const;
+    bool stretchMethod() const;
 
-    private:
-        virtual const char* renderName() const { return "RenderSVGTextPath"; }
+    virtual bool isSVGTextPath() const { return true; }
 
-        float m_startOffset;
+private:
+    virtual const char* renderName() const { return "RenderSVGTextPath"; }
 
-        bool m_exactAlignment : 1;
-        bool m_stretchMethod : 1;
+    float m_startOffset;
 
-        Path m_layoutPath;
-    };
+    bool m_exactAlignment : 1;
+    bool m_stretchMethod : 1;
 
-    inline RenderSVGTextPath* toRenderSVGTextPath(RenderObject* object)
-    { 
-        ASSERT(!object || !strcmp(object->renderName(), "RenderSVGTextPath"));
-        return static_cast<RenderSVGTextPath*>(object);
-    }
+    Path m_layoutPath;
+};
 
-    // This will catch anyone doing an unnecessary cast.
-    void toRenderSVGTextPath(const RenderSVGTextPath*);
+inline RenderSVGTextPath* toRenderSVGTextPath(RenderObject* object)
+{ 
+    ASSERT(!object || !strcmp(object->renderName(), "RenderSVGTextPath"));
+    return static_cast<RenderSVGTextPath*>(object);
+}
+
+// This will catch anyone doing an unnecessary cast.
+void toRenderSVGTextPath(const RenderSVGTextPath*);
 
 }
 

-- 
WebKit Debian packaging