Changeset 156639 in webkit for trunk/Source/WebCore/rendering/RenderObject.cpp

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.cpp (modified) (3 diffs)

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -102 +102 @@
 
 COMPILE_ASSERT(sizeof(RenderObject) == sizeof(SameSizeAsRenderObject), RenderObject_should_stay_small);
-
-RenderObjectAncestorLineboxDirtySet* RenderObject::s_ancestorLineboxDirtySet = 0;
 
 void* RenderObject::operator new(size_t sz, RenderArena& renderArena)
@@ -1499 +1497 @@
 }
 
-void RenderObject::dirtyLinesFromChangedChild(RenderObject*)
-{
-}
-
 #ifndef NDEBUG
 
@@ -2026 +2020 @@
         toRenderLayerModelObject(this)->destroyLayer();
     }
-
-    setAncestorLineBoxDirty(false);
 
     clearLayoutRootIfNeeded();