Changeset 156639 in webkit for trunk/Source/WebCore/rendering/RenderObject.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/RenderObject.h (modified) (5 diffs)

trunk/Source/WebCore/rendering/RenderObject.h

@@ -137 +137 @@
 #endif
 
-typedef WTF::HashSet<const RenderObject*> RenderObjectAncestorLineboxDirtySet;
-
 #ifndef NDEBUG
 const int showTreeCharacterOffset = 39;
@@ -404 +402 @@
     bool hasColumns() const { return m_bitfields.hasColumns(); }
     void setHasColumns(bool b = true) { m_bitfields.setHasColumns(b); }
-
-    bool ancestorLineBoxDirty() const { return s_ancestorLineboxDirtySet && s_ancestorLineboxDirtySet->contains(this); }
-    void setAncestorLineBoxDirty(bool b = true)
-    {
-        if (b) {
-            if (!s_ancestorLineboxDirtySet)
-                s_ancestorLineboxDirtySet = new RenderObjectAncestorLineboxDirtySet;
-            s_ancestorLineboxDirtySet->add(this);
-            setNeedsLayout(true);
-        } else if (s_ancestorLineboxDirtySet) {
-            s_ancestorLineboxDirtySet->remove(this);
-            if (s_ancestorLineboxDirtySet->isEmpty()) {
-                delete s_ancestorLineboxDirtySet;
-                s_ancestorLineboxDirtySet = 0;
-            }
-        }
-    }
 
     enum FlowThreadState {
@@ -703 +684 @@
     VisiblePosition createVisiblePosition(const Position&);
 
-    virtual void dirtyLinesFromChangedChild(RenderObject*);
-
     // returns the containing block level element for this element.
     RenderBlock* containingBlock() const;
@@ -982 +961 @@
     RenderObject* m_previous;
     RenderObject* m_next;
-
-    static RenderObjectAncestorLineboxDirtySet* s_ancestorLineboxDirtySet;
 
 #ifndef NDEBUG
@@ -1138 +1115 @@
 }
 
-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);
-        setAncestorLineBoxDirty(false);
-#ifndef NDEBUG
-        checkBlockPositionedObjectsNeedLayout();
-#endif
-    }
-}
-
 inline void RenderObject::setChildNeedsLayout(bool childNeedsLayout, MarkingBehavior markParents)
 {