Changeset 20959 for trunk/WebCore/rendering/RenderBlock.h

Timestamp:

04/19/07 15:35:06 (21 months ago)

Author:

andrew

Message:

Reviewed by Darin.

• fix http://bugs.webkit.org/show_bug.cgi?id=13336 REGRESSION (r20646): editing/execCommand/hilitecolor.html crashes under guardMalloc

Avoid calling selectionRect() and selectionGapRects() on a renderer that needs
layout.

• rendering/RenderBlock.cpp: (WebCore::RenderBlock::selectionGapRects):
• rendering/RenderBlock.h: (WebCore::RenderBlock::BlockSelectionInfo::BlockSelectionInfo):
• rendering/RenderListMarker.cpp: (WebCore::RenderListMarker::selectionRect):
• rendering/RenderObject.h: (WebCore::RenderObject::SelectionInfo::SelectionInfo):
• rendering/RenderReplaced.cpp: (WebCore::RenderReplaced::selectionRect):
• rendering/RenderText.cpp: (WebCore::RenderText::selectionRect):

Files:

• trunk/WebCore/rendering/RenderBlock.h (modified) (1 diff)

trunk/WebCore/rendering/RenderBlock.h

@@ -241 +241 @@
         BlockSelectionInfo(RenderBlock* b)
             : m_block(b)
-            , m_rects(b->selectionGapRects())
+            , m_rects(b->needsLayout() ? GapRects() : b->selectionGapRects())
             , m_state(b->selectionState())
         {