Remove SVGLocatable and SVGTransformable

Source/core/svg/SVGGraphicsElement.h

 /*
  * Copyright (C) 2004, 2005, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #ifndef SVGGraphicsElement_h
 #define SVGGraphicsElement_h
 
 #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();
 
     virtual SVGRect getBBox();
     SVGRect getStrokeBBox();
 
     // "base class" methods for all the elements which render as paths
     virtual void toClipPath(Path&);
     virtual RenderObject* createRenderer(RenderStyle*);
 
@@ skipping 23 matching lines @@
 inline SVGGraphicsElement* toSVGGraphicsElement(Node* node)
 {
     ASSERT_WITH_SECURITY_IMPLICATION(!node || node->isSVGElement());
     ASSERT_WITH_SECURITY_IMPLICATION(!node || toSVGElement(node)->isSVGGraphicsElement());
     return static_cast<SVGGraphicsElement*>(node);
 }
 
 } // namespace WebCore
 
 #endif // SVGGraphicsElement_h