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

Timestamp:

Sep 30, 2013, 1:21:34 AM (12 years ago)

Author:

Antti Koivisto

Message:

Get rid of static map for marking ancestor line boxes dirty
​https://bugs.webkit.org/show_bug.cgi?id=122080

Reviewed by Andreas Kling.

This is ugly and shows up in profiles too. Use a bit in RenderElement instead.

• rendering/RenderBlock.h:
• rendering/RenderBlockFlow.h:

Move dirtyLinesFromChangedChild down to RenderBlockFlow. It wouldn't do anything on other RenderBlocks.

• rendering/RenderElement.cpp:

(WebCore::RenderElement::RenderElement):

• rendering/RenderElement.h:

Add m_ancestorLineBoxDirty bit. We have 32 unused bits here on 64bit systems.

(WebCore::RenderElement::dirtyLinesFromChangedChild):
(WebCore::RenderElement::ancestorLineBoxDirty):
(WebCore::RenderElement::setAncestorLineBoxDirty):
(WebCore::RenderObject::setNeedsLayout):

• rendering/RenderInline.h:
• rendering/RenderLineBoxList.cpp:

(WebCore::RenderLineBoxList::dirtyLinesFromChangedChild):

Tighten the interface.

• rendering/RenderLineBoxList.h:
• rendering/RenderObject.cpp:

(WebCore::RenderObject::willBeDestroyed):

• rendering/RenderObject.h:

Remove the static map.

File:

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

trunk/Source/WebCore/rendering/RenderElement.h

@@ -70 +70 @@
     virtual RenderElement* hoverAncestor() const;
 
+    virtual void dirtyLinesFromChangedChild(RenderObject*) { }
+
+    bool ancestorLineBoxDirty() const { return m_ancestorLineBoxDirty; }
+    void setAncestorLineBoxDirty(bool f = true);
+
     // Return the renderer whose background style is used to paint the root background. Should only be called on the renderer for which isRoot() is true.
     RenderElement* rendererForRootBackground();
@@ -125 +130 @@
     RenderStyle* cachedFirstLineStyle() const;
 
+    bool m_ancestorLineBoxDirty : 1;
+
     RenderObject* m_firstChild;
     RenderObject* m_lastChild;
@@ -141 +148 @@
 }
 
+inline void RenderElement::setAncestorLineBoxDirty(bool f)
+{
+    m_ancestorLineBoxDirty = f;
+    if (m_ancestorLineBoxDirty)
+        setNeedsLayout(true);
+}
+
 inline LayoutUnit RenderElement::valueForLength(const Length& length, LayoutUnit maximumValue, bool roundPercentages) const
 {
@@ -193 +207 @@
 }
 
+inline void RenderObject::setNeedsLayout(bool needsLayout, MarkingBehavior markParents)
+{
+    bool alreadyNeededLayout = m_bitfields.needsLayout();
+    m_bitfields.setNeedsLayout(needsLayout);
+    if (needsLayout) {
+        ASSERT(!isSetNeedsLayoutForbidden());
+        if (!alreadyNeededLayout) {
+            if (markParents == MarkContainingBlockChain)
+                markContainingBlocksForLayout();
+            if (hasLayer())
+                setLayerNeedsFullRepaint();
+        }
+    } else {
+        setEverHadLayout(true);
+        setPosChildNeedsLayout(false);
+        setNeedsSimplifiedNormalFlowLayout(false);
+        setNormalChildNeedsLayout(false);
+        setNeedsPositionedMovementLayout(false);
+        if (isRenderElement())
+            toRenderElement(this)->setAncestorLineBoxDirty(false);
+#ifndef NDEBUG
+        checkBlockPositionedObjectsNeedLayout();
+#endif
+    }
+}
+
 inline RenderElement* ContainerNode::renderer() const
 {