Use a bitmask for SVG render object types

Source/core/rendering/RenderObject.h

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 409 matching lines @@
         NotInsideFlowThread = 0,
         InsideOutOfFlowThread = 1,
         InsideInFlowThread = 2,
     };
 
     void setFlowThreadStateIncludingDescendants(FlowThreadState);
 
     FlowThreadState flowThreadState() const { return m_bitfields.flowThreadState(); }
     void setFlowThreadState(FlowThreadState state) { m_bitfields.setFlowThreadState(state); }
 
-    // FIXME: Until all SVG renders can be subclasses of RenderSVGModelObject we have
-    // to add SVG renderer methods to RenderObject with an ASSERT_NOT_REACHED() default implementation.
-    virtual bool isSVGRoot() const { return false; }
-    virtual bool isSVGContainer() const { return false; }
-    virtual bool isSVGTransformableContainer() const { return false; }
-    virtual bool isSVGViewportContainer() const { return false; }
-    virtual bool isSVGGradientStop() const { return false; }
-    virtual bool isSVGHiddenContainer() const { return false; }
-    virtual bool isSVGPath() const { return false; }
-    virtual bool isSVGShape() 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; }
-    virtual bool isSVGForeignObject() const { return false; }
-    virtual bool isSVGResourceContainer() const { return false; }
-    virtual bool isSVGResourceFilter() const { return false; }
-    virtual bool isSVGResourceFilterPrimitive() const { return false; }
+    // FIXME: Until all SVG renderers are subclasses of RenderSVGModelObject, we have to
+    // maintain this parallel type system in RenderObject.
+    // Note: All updates to the SVG renderer hierarchy must update the enum below.
+    enum SVGType {
+        IsNotSVG = 0,
+        IsSVGRoot = 1,
+        IsSVGContainer = 1 << 1,
+        IsSVGTransformableContainer = 1 << 2 | IsSVGContainer,
+        IsSVGViewportContainer = 1 << 3 | IsSVGContainer,
+        IsSVGGradientStop = 1 << 4,
+        IsSVGHiddenContainer = 1 << 5 | IsSVGContainer,
+        IsSVGShape = 1 << 6,
+        IsSVGPath = 1 << 7 | IsSVGShape,
+        IsSVGText = 1 << 8,
+        IsSVGInline = 1 << 9,
+        IsSVGTextPath = 1 << 10 | IsSVGInline,
+        IsSVGInlineText = 1 << 11,
+        IsSVGImage = 1 << 12,
+        IsSVGForeignObject = 1 << 13,
+        IsSVGResourceContainer = 1 << 14 | IsSVGHiddenContainer,
+        IsSVGResourceFilter = 1 << 15 | IsSVGResourceContainer,
+        IsSVGResourceFilterPrimitive = 1 << 16 | IsSVGHiddenContainer
+    };
+    bool hasSVGType(SVGType mask) const { return mask == (mask & getSVGType()); }
+    bool isSVG() const { return getSVGType(); }
+    bool isSVGRoot() const { return hasSVGType(IsSVGRoot); }
+    bool isSVGContainer() const { return hasSVGType(IsSVGContainer); }
+    bool isSVGTransformableContainer() const { return hasSVGType(IsSVGTransformableContainer); }
+    bool isSVGViewportContainer() const { return hasSVGType(IsSVGViewportContainer); }
+    bool isSVGGradientStop() const { return hasSVGType(IsSVGGradientStop); }
+    bool isSVGHiddenContainer() const { return hasSVGType(IsSVGHiddenContainer); }
+    bool isSVGPath() const { return hasSVGType(IsSVGPath); }
+    bool isSVGShape() const { return hasSVGType(IsSVGShape); }
+    bool isSVGText() const { return hasSVGType(IsSVGText); }
+    bool isSVGTextPath() const { return hasSVGType(IsSVGTextPath); }
+    bool isSVGInline() const { return hasSVGType(IsSVGInline); }
+    bool isSVGInlineText() const { return hasSVGType(IsSVGInlineText); }
+    bool isSVGImage() const { return hasSVGType(IsSVGImage); }
+    bool isSVGForeignObject() const { return hasSVGType(IsSVGForeignObject); }
+    bool isSVGResourceContainer() const { return hasSVGType(IsSVGResourceContainer); }
+    bool isSVGResourceFilter() const { return hasSVGType(IsSVGResourceFilter); }
+    bool isSVGResourceFilterPrimitive() const { return hasSVGType(IsSVGResourceFilterPrimitive); }
 
     // FIXME: Those belong into a SVG specific base-class for all renderers (see above)
     // Unfortunately we don't have such a class yet, because it's not possible for all renderers
     // to inherit from RenderSVGObject -> RenderObject (some need RenderBlock inheritance for instance)
     virtual void setNeedsTransformUpdate() { }
     virtual void setNeedsBoundariesUpdate();
     virtual bool needsBoundariesUpdate() { return false; }
 
     // Per SVG 1.1 objectBoundingBox ignores clipping, masking, filter effects, opacity and stroke-width.
     // This is used for all computation of objectBoundingBox relative units and by SVGLocatable::getBBox().
@@ skipping 590 matching lines @@
     // container, so callers should provide only the offset of the container within it's layer.
     // containerRect is a rect that has already been added for the currentLayer which is likely to
     // be a container for child elements. Any rect wholly contained by containerRect can be
     // skipped.
     virtual void addLayerHitTestRects(LayerHitTestRects&, const RenderLayer* currentLayer, const LayoutPoint& layerOffset, const LayoutRect& containerRect) const;
 
     // Add hit-test rects for this renderer only to the provided list. layerOffset is the offset
     // of this renderer within the current layer that should be used for each result.
     virtual void computeSelfHitTestRects(Vector<LayoutRect>&, const LayoutPoint& layerOffset) const { };
 
+    virtual SVGType getSVGType() const { return IsNotSVG; }
+
 private:
     RenderBlock* containerForFixedPosition(const RenderLayerModelObject* repaintContainer = 0, bool* repaintContainerSkipped = 0) const;
 
     RenderFlowThread* locateFlowThreadContainingBlock() const;
     void removeFromRenderFlowThread();
     void removeFromRenderFlowThreadRecursive(RenderFlowThread*);
 
     bool shouldRepaintForStyleDifference(StyleDifference) const;
     bool hasImmediateNonWhitespaceTextChildOrPropertiesDependentOnColor() const;
 
@@ skipping 353 matching lines @@
 void showTree(const WebCore::RenderObject*);
 void showLineTree(const WebCore::RenderObject*);
 void showRenderTree(const WebCore::RenderObject* object1);
 // We don't make object2 an optional parameter so that showRenderTree
 // can be called from gdb easily.
 void showRenderTree(const WebCore::RenderObject* object1, const WebCore::RenderObject* object2);
 
 #endif
 
 #endif // RenderObject_h