Remove SVGLocatable and SVGTransformable

Source/core/svg/SVGGraphicsElement.h

Index: Source/core/svg/SVGGraphicsElement.h
diff --git a/Source/core/svg/SVGGraphicsElement.h b/Source/core/svg/SVGGraphicsElement.h
index 1e208045d5db65f485818e26f15b16fcb11ebe15..aefee1e1fc1629140c007e7ba5eb4db21b72ff29 100644
--- a/Source/core/svg/SVGGraphicsElement.h
+++ b/Source/core/svg/SVGGraphicsElement.h
@@ -24,23 +24,27 @@
 #include "core/svg/SVGAnimatedTransformList.h"
 #include "core/svg/SVGElement.h"
 #include "core/svg/SVGTests.h"
-#include "core/svg/SVGTransformable.h"
 
 namespace WebCore {
 
 class AffineTransform;
 class Path;
 
-class SVGGraphicsElement : public SVGElement, public SVGTransformable, public SVGTests {
+class SVGGraphicsElement : public SVGElement, public SVGTests {
 public:
     virtual ~SVGGraphicsElement();
 
-    virtual AffineTransform getCTM(StyleUpdateStrategy = AllowStyleUpdate);
-    virtual AffineTransform getScreenCTM(StyleUpdateStrategy = AllowStyleUpdate);
-    virtual SVGElement* nearestViewportElement() const;
-    virtual SVGElement* farthestViewportElement() const;
+    enum StyleUpdateStrategy { AllowStyleUpdate, DisallowStyleUpdate };
 
-    virtual AffineTransform localCoordinateSpaceTransform(SVGLocatable::CTMScope mode) const { return SVGTransformable::localCoordinateSpaceTransform(mode); }
+    AffineTransform getCTM(StyleUpdateStrategy = AllowStyleUpdate);
+    AffineTransform getScreenCTM(StyleUpdateStrategy = AllowStyleUpdate);
+    AffineTransform getTransformToElement(SVGElement*, ExceptionState&, StyleUpdateStrategy = AllowStyleUpdate);

[pdr., 2013/11/08 23:50:48]

Is the StyleUpdateStrategy parameter needed?

[rwlbuis, 2013/11/10 20:35:45]

I think so.

[pdr., 2013/11/11 00:02:09]

No, it's not needed. Just remove the updateStrategy parameter and replace it
with AllowStyleUpdate in the function.

+    SVGElement* nearestViewportElement() const;
+    SVGElement* farthestViewportElement() const;
+    static SVGElement* nearestViewportElement(const SVGElement*);
+    static SVGElement* farthestViewportElement(const SVGElement*);

[pdr., 2013/11/08 23:50:48]

These static methods don't belong here.

The static static farthestViewportElement can be removed altogether.

The static nearestViewportElement can be refactored a bit, possibly moving to
SVGElement. One caller, RenderSVGModelObject::getElementCTM only gets called
with SVGGraphicsElement* so it can likely be refactored to just call
element->nearestViewportElement. There's also a caller in SVGSVGElement which
may be trickier to remove.

[rwlbuis, 2013/11/10 20:35:45]

Done.
I tried it but it is hard. I don't think it can be removed and it is hard to
move to SVGElement since it relies on isViewElement.

+
+    virtual AffineTransform localCoordinateSpaceTransform(SVGElement::CTMScope) const { return animatedLocalTransform(); }

[pdr., 2013/11/08 23:50:48]

Please add OVERRIDE

[rwlbuis, 2013/11/10 20:35:45]

Done.

     virtual AffineTransform animatedLocalTransform() const;
     virtual AffineTransform* supplementalTransform();