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

[krit at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit b28ef579b79e42935b85cdf44e5419ccafe8e672
Author: krit at webkit.org <krit at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 22 19:00:36 2010 +0000

    2010-10-22  Cosmin Truta  <ctruta at chromium.org>
    
            Reviewed by Dirk Schulze.
    
            getBoundingClientRect does not work with SVG <text>
            https://bugs.webkit.org/show_bug.cgi?id=46775
    
            Added back to SVGStyledTransformableElement overloads of the following
            methods: nearestViewportElement, farthestViewportElement, getBBox.
            This was necessary to appease the Visual C++ compiler, which warned on
            inheritance via dominance.
    
            * svg/SVGStyledTransformableElement.cpp:
            * svg/SVGStyledTransformableElement.h:
            (SVGStyledTransformableElement::nearestViewportElement):
            (SVGStyledTransformableElement::farthestViewportElement):
            (SVGStyledTransformableElement::getBBox):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70323 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1b7a984..8f8496c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+2010-10-22  Cosmin Truta  <ctruta at chromium.org>
+
+        Reviewed by Dirk Schulze.
+
+        getBoundingClientRect does not work with SVG <text>
+        https://bugs.webkit.org/show_bug.cgi?id=46775
+
+        Added back to SVGStyledTransformableElement overloads of the following
+        methods: nearestViewportElement, farthestViewportElement, getBBox.
+        This was necessary to appease the Visual C++ compiler, which warned on
+        inheritance via dominance.
+
+        * svg/SVGStyledTransformableElement.cpp:
+        * svg/SVGStyledTransformableElement.h:
+        (SVGStyledTransformableElement::nearestViewportElement):
+        (SVGStyledTransformableElement::farthestViewportElement):
+        (SVGStyledTransformableElement::getBBox):
+
 2010-10-21  Chris Marrin  <cmarrin at apple.com>
 
         Reviewed by Adam Roben.
diff --git a/WebCore/svg/SVGStyledTransformableElement.cpp b/WebCore/svg/SVGStyledTransformableElement.cpp
index b1619ca..9b34203 100644
--- a/WebCore/svg/SVGStyledTransformableElement.cpp
+++ b/WebCore/svg/SVGStyledTransformableElement.cpp
@@ -90,6 +90,21 @@ bool SVGStyledTransformableElement::isKnownAttribute(const QualifiedName& attrNa
            SVGStyledLocatableElement::isKnownAttribute(attrName);
 }
 
+SVGElement* SVGStyledTransformableElement::nearestViewportElement() const
+{
+    return SVGTransformable::nearestViewportElement(this);
+}
+
+SVGElement* SVGStyledTransformableElement::farthestViewportElement() const
+{
+    return SVGTransformable::farthestViewportElement(this);
+}
+
+FloatRect SVGStyledTransformableElement::getBBox(StyleUpdateStrategy styleUpdateStrategy) const
+{
+    return SVGTransformable::getBBox(this, styleUpdateStrategy);
+}
+
 RenderObject* SVGStyledTransformableElement::createRenderer(RenderArena* arena, RenderStyle*)
 {
     // By default, any subclass is expected to do path-based drawing
diff --git a/WebCore/svg/SVGStyledTransformableElement.h b/WebCore/svg/SVGStyledTransformableElement.h
index cbb7da6..5349cfa 100644
--- a/WebCore/svg/SVGStyledTransformableElement.h
+++ b/WebCore/svg/SVGStyledTransformableElement.h
@@ -37,11 +37,15 @@ public:
 
     virtual AffineTransform getCTM(StyleUpdateStrategy = AllowStyleUpdate) const;
     virtual AffineTransform getScreenCTM(StyleUpdateStrategy = AllowStyleUpdate) const;
+    virtual SVGElement* nearestViewportElement() const;
+    virtual SVGElement* farthestViewportElement() const;
 
     virtual AffineTransform localCoordinateSpaceTransform(SVGLocatable::CTMScope mode) const { return SVGTransformable::localCoordinateSpaceTransform(mode); }
     virtual AffineTransform animatedLocalTransform() const;
     virtual AffineTransform* supplementalTransform();
 
+    virtual FloatRect getBBox(StyleUpdateStrategy = AllowStyleUpdate) const;
+
     bool isKnownAttribute(const QualifiedName&);
 
     // "base class" methods for all the elements which render as paths

-- 
WebKit Debian packaging