Changeset 156738 in webkit for trunk/Source/WebCore/rendering/RenderElement.h

Timestamp:

Oct 1, 2013, 3:29:34 PM (12 years ago)

Author:

Antti Koivisto

Message:

Make tests for renderer base types non-virtual
​https://bugs.webkit.org/show_bug.cgi?id=122185

Reviewed by Dave Hyatt.

Make isRenderFoo() functions for commonly tested base types use bit flags instead of virtual calls.
This is faster and we have space in RenderElement.

These bits are not mutully exclusive. For testing leaf types we can add an enum.

File:

• trunk/Source/WebCore/rendering/RenderElement.h (modified) (5 diffs)

trunk/Source/WebCore/rendering/RenderElement.h

@@ -51 +51 @@
     RenderObject* lastChild() const { return m_lastChild; }
 
+    // FIXME: Make these standalone and move to relevant files.
+    bool isRenderLayerModelObject() const;
+    bool isBoxModelObject() const;
+    bool isRenderBlock() const;
+    bool isRenderBlockFlow() const;
+    bool isRenderReplaced() const;
+    bool isRenderInline() const;
+
     virtual bool isChildAllowed(RenderObject*, RenderStyle*) const { return true; }
     virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0);
@@ -87 +95 @@
 
 protected:
-    explicit RenderElement(Element*);
+    enum BaseTypeFlags {
+        RenderLayerModelObjectFlag = 1 << 0,
+        RenderBoxModelObjectFlag = 1 << 1,
+        RenderInlineFlag = 1 << 2,
+        RenderReplacedFlag = 1 << 3,
+        RenderBlockFlag = 1 << 4,
+        RenderBlockFlowFlag = 1 << 5,
+    };
+
+    explicit RenderElement(Element*, unsigned baseTypeFlags);
 
     bool layerCreationAllowedForSubtree() const;
@@ -130 +147 @@
     RenderStyle* cachedFirstLineStyle() const;
 
+    unsigned m_baseTypeFlags : 6;
     bool m_ancestorLineBoxDirty : 1;
 
@@ -165 +183 @@
 }
 
+inline bool RenderElement::isRenderLayerModelObject() const
+{
+    return m_baseTypeFlags & RenderLayerModelObjectFlag;
+}
+
+inline bool RenderElement::isBoxModelObject() const
+{
+    return m_baseTypeFlags & RenderBoxModelObjectFlag;
+}
+
+inline bool RenderElement::isRenderBlock() const
+{
+    return m_baseTypeFlags & RenderBlockFlag;
+}
+
+inline bool RenderElement::isRenderBlockFlow() const
+{
+    return m_baseTypeFlags & RenderBlockFlowFlag;
+}
+
+inline bool RenderElement::isRenderReplaced() const
+{
+    return m_baseTypeFlags & RenderReplacedFlag;
+}
+
+inline bool RenderElement::isRenderInline() const
+{
+    return m_baseTypeFlags & RenderInlineFlag;
+}
+
 inline RenderElement& toRenderElement(RenderObject& object)
 {
@@ -192 +240 @@
 void toRenderElement(const RenderElement*);
 void toRenderElement(const RenderElement&);
+
+inline bool RenderObject::isRenderLayerModelObject() const
+{
+    return isRenderElement() && toRenderElement(this)->isRenderLayerModelObject();
+}
+
+inline bool RenderObject::isBoxModelObject() const
+{
+    return isRenderElement() && toRenderElement(this)->isBoxModelObject();
+}
+
+inline bool RenderObject::isRenderBlock() const
+{
+    return isRenderElement() && toRenderElement(this)->isRenderBlock();
+}
+
+inline bool RenderObject::isRenderBlockFlow() const
+{
+    return isRenderElement() && toRenderElement(this)->isRenderBlockFlow();
+}
+
+inline bool RenderObject::isRenderReplaced() const
+{
+    return isRenderElement() && toRenderElement(this)->isRenderReplaced();
+}
+
+inline bool RenderObject::isRenderInline() const
+{
+    return isRenderElement() && toRenderElement(this)->isRenderInline();
+}
 
 inline RenderStyle* RenderObject::style() const